Merge https://github.com/friendica/red into pending_merge

doc/technical_faq.bb

@@ -0,0 +1,38 @@
+These are common questions with answers which are almost always correct.  Note these aren't the [i]only[/i] possible
+answers, they're merely the most probable answers.  90% of the time, these solutions should work.  The other 10% of 
+the time is when you should use a support forum.
+
+[b]I can log in, but there are no posts or webpages[/b]
+
+Your item table has crashed.  Run the MySQL command repair table item;
+
+[b]Login doesn't work, immediately after login, the page reloads and I'm logged out[/b]
+
+Your session table has crashed.  Run the MySQL command repair table session;
+
+[b]When I switch theme, I sometimes get elements of one theme superimposed on top of the other[/b]
+
+a) view/tpl/smarty3 isn't writeable by the webserver.
+
+b) You're using Midori.
+
+[b]My network tab won't load, it appears to be caused by a photo or video[/b]
+
+Your PHP memory limit is too low.  Increase the size of the memory_limit directive in your php.ini
+
+[b]I have no communication with anybody[/b]
+
+You're listening on port 443, but do not have a valid SSL certificate.  Note this applies even if your baseurl is http.
+Don't listen on port 443 if you cannot use it.
+
+[b]I can't see private resources[/b]
+
+You have disabled third party cookies.
+
+[b]What do I need to do when moving my hub to a different server[/b]
+
+1) Git clone on the new server.  Repeat the process for any custom themes, and addons.
+2) Copy .htconfig.php
+3) Rsync everything in store/
+4) Rsync everything in custom/ (this will only exist if you have custom modules)
+5) Dump and restore DB.

doc/troubleshooting.bb

@@ -1,5 +1,6 @@
 [b]Troubleshooting[/b]
 
+[li][zrl=[baseurl]/help/technical_faq]Technical FAQ[/zrl][/li]
 [li][zrl=[baseurl]/help/problems-following-an-update]Problems following an update[/zrl][/li]
 
 Return to the [url=[baseurl]/help/main]Main documentation page[/url]

include/ItemObject.php

@@ -313,7 +313,7 @@ class Item extends BaseObject {
 			if(($nb_children > 2) || ($thread_level > 1)) {
 				$result['children'][0]['comment_firstcollapsed'] = true;
 				$result['children'][0]['num_comments'] = sprintf( tt('%d comment','%d comments',$total_children),$total_children );
-				$result['children'][0]['hide_text'] = t('[+] show more comments');
+				$result['children'][0]['hide_text'] = t('[+] show all');
 				if($thread_level > 1) {
 					$result['children'][$nb_children - 1]['comment_lastcollapsed'] = true;
 				}

include/js_strings.php

@@ -4,10 +4,10 @@ function js_strings() {
 	return replace_macros(get_markup_template('js_strings.tpl'), array(
 		'$delitem'     => t('Delete this item?'),
 		'$comment'     => t('Comment'),
-		'$showmore'    => t('[+] show more comments'),
+		'$showmore'    => t('[+] show all'),
-		'$showfewer'   => t('[-] show fewer comments'),
+		'$showfewer'   => t('[-] show less'),
-		'$divgrowmore' => t('[+] show more'),
+		'$divgrowmore' => t('[+] expand post'),
-		'$divgrowless' => t('[-] show less'),
+		'$divgrowless' => t('[-] collapse post'),
 		'$pwshort'     => t("Password too short"),
 		'$pwnomatch'   => t("Passwords do not match"),
 		'$everybody'   => t('everybody'),

util/messages.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2014-06-02.694\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-03 05:06+0000\n"
+"POT-Creation-Date: 2014-06-03 11:59+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -923,19 +923,19 @@ msgid "Comment"
 msgstr ""
 
 #: ../../include/js_strings.php:7 ../../include/ItemObject.php:316
-msgid "[+] show more comments"
+msgid "[+] show all"
 msgstr ""
 
 #: ../../include/js_strings.php:8
-msgid "[-] show fewer comments"
+msgid "[-] show less"
 msgstr ""
 
 #: ../../include/js_strings.php:9
-msgid "[+] show more"
+msgid "[+] expand post"
 msgstr ""
 
 #: ../../include/js_strings.php:10
-msgid "[-] show less"
+msgid "[-] collapse post"
 msgstr ""
 
 #: ../../include/js_strings.php:11