diff --git a/.htaccess b/.htaccess
index 6cb3a07494..a22c8c37ac 100644
--- a/.htaccess
+++ b/.htaccess
@@ -15,6 +15,16 @@ Deny from all
   # Also place auth information into REMOTE_USER for sites running
   # in CGI mode.
 
+  # If you have troubles or use VirtualDocumentRoot
+  # uncomment this and set it to the path where your friendica installation is
+  # i.e.:
+  # Friendica url: http://some.example.com
+  # RewriteBase /
+  # Friendica url: http://some.example.com/friendica
+  # RewriteBase /firendica/
+  #
+  #RewriteBase /
+
   RewriteCond %{REQUEST_FILENAME} !-f
   RewriteCond %{REQUEST_FILENAME} !-d
   RewriteRule ^(.*)$ index.php?q=$1 [E=REMOTE_USER:%{HTTP:Authorization},L,QSA]
diff --git a/boot.php b/boot.php
index 7a186ad664..d04a234aab 100644
--- a/boot.php
+++ b/boot.php
@@ -11,7 +11,7 @@ require_once('include/cache.php');
 require_once('library/Mobile_Detect/Mobile_Detect.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1449' );
+define ( 'FRIENDICA_VERSION',      '3.0.1455' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1154      );
 
@@ -1468,7 +1468,7 @@ if(! function_exists('proc_run')) {
 
 		$cmdline = implode($args," ");
 		if(get_config('system','proc_windows'))
-			proc_close(proc_open('start /b ' . $cmdline,array(),$foo));
+			proc_close(proc_open('cmd /c start /b ' . $cmdline,array(),$foo));
 		else
 			proc_close(proc_open($cmdline." &",array(),$foo));
 	}
diff --git a/include/dba.php b/include/dba.php
index 879d7e67e1..8d224b570f 100644
--- a/include/dba.php
+++ b/include/dba.php
@@ -78,7 +78,7 @@ class dba {
 
 		$this->error = '';
 
-		if ($a->config["system"]["db_log"] != "")
+		if(x($a->config,'system') && x($a->config['system'],'db_log'))
 			$stamp1 = microtime(true);
 
 		if($this->mysqli)
@@ -86,7 +86,7 @@ class dba {
 		else
 			$result = @mysql_query($sql,$this->db);
 
-		if ($a->config["system"]["db_log"] != "") {
+		if(x($a->config,'system') && x($a->config['system'],'db_log')) {
 			$stamp2 = microtime(true);
 			$duration = round($stamp2-$stamp1, 3);
 			if ($duration > $a->config["system"]["db_loglimit"]) {
diff --git a/include/text.php b/include/text.php
index 3783d2accd..c1e01343a8 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1005,7 +1005,7 @@ function prepare_body($item,$attach = false) {
 					}
 					$title = ((strlen(trim($mtch[4]))) ? escape_tags(trim($mtch[4])) : escape_tags($mtch[1]));
 					$title .= ' ' . $mtch[2] . ' ' . t('bytes');
-					if((local_user() == $item['uid']) && $item['contact-id'] != $a->contact['id'])
+					if((local_user() == $item['uid']) && ($item['contact-id'] != $a->contact['id']) && ($item['network'] == NETWORK_DFRN))
 						$the_url = $a->get_baseurl() . '/redir/' . $item['contact-id'] . '?f=1&url=' . $mtch[1];
 					else
 						$the_url = $mtch[1];
diff --git a/mod/install.php b/mod/install.php
index 4e4631b85f..65fa603ee1 100755
--- a/mod/install.php
+++ b/mod/install.php
@@ -466,7 +466,6 @@ function load_database_rem($v, $i){
 function load_database($db) {
 
 	$str = file_get_contents('database.sql');
-//	$str = array_reduce(explode("\n", $str),"load_database_rem","");
 	$arr = explode(';',$str);
 	$errors = false;
 	foreach($arr as $a) {
@@ -488,7 +487,7 @@ function what_next() {
 		."<p>".t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.')
 		.t('Please see the file "INSTALL.txt".')			
 		."</p><p>"
-		.t("Go to your new Firendica node <a href='$baseurl/register'>registration page</a> and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.")
+		.t("Go to your new Friendica node <a href='$baseurl/register'>registration page</a> and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.")
 		."</p>";
 }
 
diff --git a/util/messages.po b/util/messages.po
index f8594b3a37..060be752f0 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1449\n"
+"Project-Id-Version: 3.0.1455\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-28 10:00-0700\n"
+"POT-Creation-Date: 2012-09-03 10:00-0700\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"
@@ -88,7 +88,7 @@ msgid "Return to contact editor"
 msgstr ""
 
 #: ../../mod/crepair.php:148 ../../mod/settings.php:539
-#: ../../mod/settings.php:565 ../../mod/admin.php:679 ../../mod/admin.php:688
+#: ../../mod/settings.php:565 ../../mod/admin.php:688 ../../mod/admin.php:697
 msgid "Name"
 msgstr ""
 
@@ -133,9 +133,9 @@ msgstr ""
 #: ../../mod/contacts.php:341 ../../mod/settings.php:537
 #: ../../mod/settings.php:691 ../../mod/settings.php:752
 #: ../../mod/settings.php:958 ../../mod/group.php:85 ../../mod/mood.php:137
-#: ../../mod/message.php:294 ../../mod/message.php:478 ../../mod/admin.php:435
-#: ../../mod/admin.php:676 ../../mod/admin.php:812 ../../mod/admin.php:1011
-#: ../../mod/admin.php:1098 ../../mod/profiles.php:583
+#: ../../mod/message.php:294 ../../mod/message.php:480 ../../mod/admin.php:441
+#: ../../mod/admin.php:685 ../../mod/admin.php:821 ../../mod/admin.php:1020
+#: ../../mod/admin.php:1107 ../../mod/profiles.php:583
 #: ../../mod/invite.php:119 ../../addon/fromgplus/fromgplus.php:40
 #: ../../addon/facebook/facebook.php:619
 #: ../../addon/snautofollow/snautofollow.php:64 ../../addon/bg/bg.php:90
@@ -174,7 +174,7 @@ msgstr ""
 #: ../../view/theme/diabook/theme.php:757
 #: ../../view/theme/diabook/config.php:190
 #: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70
-#: ../../include/conversation.php:560
+#: ../../include/conversation.php:571
 msgid "Submit"
 msgstr ""
 
@@ -234,7 +234,7 @@ msgid "link to source"
 msgstr ""
 
 #: ../../mod/events.php:331 ../../view/theme/diabook/theme.php:131
-#: ../../include/nav.php:52 ../../boot.php:1659
+#: ../../include/nav.php:52 ../../boot.php:1650
 msgid "Events"
 msgstr ""
 
@@ -289,8 +289,8 @@ msgid "Description:"
 msgstr ""
 
 #: ../../mod/events.php:432 ../../mod/directory.php:132
-#: ../../include/event.php:40 ../../include/bb2diaspora.php:455
-#: ../../boot.php:1208
+#: ../../include/event.php:40 ../../include/bb2diaspora.php:412
+#: ../../boot.php:1199
 msgid "Location:"
 msgstr ""
 
@@ -372,7 +372,7 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: ../../mod/photos.php:46 ../../boot.php:1652
+#: ../../mod/photos.php:46 ../../boot.php:1643
 msgid "Photo Albums"
 msgstr ""
 
@@ -402,8 +402,8 @@ msgstr ""
 #: ../../mod/profile_photo.php:177 ../../mod/profile_photo.php:261
 #: ../../mod/profile_photo.php:270
 #: ../../addon/communityhome/communityhome.php:111
-#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:304
-#: ../../include/user.php:311 ../../include/user.php:318
+#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:318
+#: ../../include/user.php:325 ../../include/user.php:332
 msgid "Profile Photos"
 msgstr ""
 
@@ -426,8 +426,8 @@ msgstr ""
 #: ../../mod/photos.php:572 ../../mod/like.php:145 ../../mod/tagger.php:70
 #: ../../addon/communityhome/communityhome.php:163
 #: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1399
-#: ../../include/diaspora.php:1824 ../../include/conversation.php:114
-#: ../../include/conversation.php:244
+#: ../../include/diaspora.php:1824 ../../include/conversation.php:125
+#: ../../include/conversation.php:255
 msgid "photo"
 msgstr ""
 
@@ -526,7 +526,7 @@ msgid "Use as profile photo"
 msgstr ""
 
 #: ../../mod/photos.php:1171 ../../mod/content.php:601
-#: ../../include/conversation.php:395
+#: ../../include/conversation.php:406
 msgid "Private Message"
 msgstr ""
 
@@ -567,49 +567,49 @@ msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
 #: ../../mod/photos.php:1303 ../../mod/content.php:665
-#: ../../include/conversation.php:534
+#: ../../include/conversation.php:545
 msgid "I like this (toggle)"
 msgstr ""
 
 #: ../../mod/photos.php:1304 ../../mod/content.php:666
-#: ../../include/conversation.php:535
+#: ../../include/conversation.php:546
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1305 ../../include/conversation.php:1164
+#: ../../mod/photos.php:1305 ../../include/conversation.php:1175
 msgid "Share"
 msgstr ""
 
 #: ../../mod/photos.php:1306 ../../mod/editpost.php:112
 #: ../../mod/content.php:482 ../../mod/content.php:843
 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293
-#: ../../mod/message.php:479 ../../include/conversation.php:628
-#: ../../include/conversation.php:860 ../../include/conversation.php:1183
+#: ../../mod/message.php:481 ../../include/conversation.php:639
+#: ../../include/conversation.php:871 ../../include/conversation.php:1194
 msgid "Please wait"
 msgstr ""
 
 #: ../../mod/photos.php:1322 ../../mod/photos.php:1363
 #: ../../mod/photos.php:1395 ../../mod/content.php:688
-#: ../../include/conversation.php:557
+#: ../../include/conversation.php:568
 msgid "This is you"
 msgstr ""
 
 #: ../../mod/photos.php:1324 ../../mod/photos.php:1365
 #: ../../mod/photos.php:1397 ../../mod/content.php:690
-#: ../../include/conversation.php:559 ../../boot.php:583
+#: ../../include/conversation.php:570 ../../boot.php:574
 msgid "Comment"
 msgstr ""
 
 #: ../../mod/photos.php:1326 ../../mod/editpost.php:133
-#: ../../mod/content.php:700 ../../include/conversation.php:569
-#: ../../include/conversation.php:1201
+#: ../../mod/content.php:700 ../../include/conversation.php:580
+#: ../../include/conversation.php:1212
 msgid "Preview"
 msgstr ""
 
 #: ../../mod/photos.php:1426 ../../mod/content.php:439
 #: ../../mod/content.php:721 ../../mod/settings.php:600
-#: ../../mod/settings.php:689 ../../mod/group.php:168 ../../mod/admin.php:683
-#: ../../include/conversation.php:409 ../../include/conversation.php:816
+#: ../../mod/settings.php:689 ../../mod/group.php:168 ../../mod/admin.php:692
+#: ../../include/conversation.php:420 ../../include/conversation.php:827
 msgid "Delete"
 msgstr ""
 
@@ -675,28 +675,28 @@ msgstr ""
 msgid "Edit post"
 msgstr ""
 
-#: ../../mod/editpost.php:88 ../../include/conversation.php:1150
+#: ../../mod/editpost.php:88 ../../include/conversation.php:1161
 msgid "Post to Email"
 msgstr ""
 
 #: ../../mod/editpost.php:103 ../../mod/content.php:708
-#: ../../mod/settings.php:599 ../../include/conversation.php:400
+#: ../../mod/settings.php:599 ../../include/conversation.php:411
 msgid "Edit"
 msgstr ""
 
 #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
-#: ../../mod/message.php:291 ../../mod/message.php:476
-#: ../../include/conversation.php:1165
+#: ../../mod/message.php:291 ../../mod/message.php:478
+#: ../../include/conversation.php:1176
 msgid "Upload photo"
 msgstr ""
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:1167
+#: ../../mod/editpost.php:105 ../../include/conversation.php:1178
 msgid "Attach file"
 msgstr ""
 
 #: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151
-#: ../../mod/message.php:292 ../../mod/message.php:477
-#: ../../include/conversation.php:1169
+#: ../../mod/message.php:292 ../../mod/message.php:479
+#: ../../include/conversation.php:1180
 msgid "Insert web link"
 msgstr ""
 
@@ -712,35 +712,35 @@ msgstr ""
 msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../mod/editpost.php:110 ../../include/conversation.php:1175
+#: ../../mod/editpost.php:110 ../../include/conversation.php:1186
 msgid "Set your location"
 msgstr ""
 
-#: ../../mod/editpost.php:111 ../../include/conversation.php:1177
+#: ../../mod/editpost.php:111 ../../include/conversation.php:1188
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:1184
+#: ../../mod/editpost.php:113 ../../include/conversation.php:1195
 msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/editpost.php:121 ../../include/conversation.php:1193
+#: ../../mod/editpost.php:121 ../../include/conversation.php:1204
 msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/editpost.php:122 ../../include/conversation.php:1194
+#: ../../mod/editpost.php:122 ../../include/conversation.php:1205
 msgid "Public post"
 msgstr ""
 
-#: ../../mod/editpost.php:125 ../../include/conversation.php:1180
+#: ../../mod/editpost.php:125 ../../include/conversation.php:1191
 msgid "Set title"
 msgstr ""
 
-#: ../../mod/editpost.php:127 ../../include/conversation.php:1182
+#: ../../mod/editpost.php:127 ../../include/conversation.php:1193
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../mod/editpost.php:128 ../../include/conversation.php:1196
+#: ../../mod/editpost.php:128 ../../include/conversation.php:1207
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
@@ -956,7 +956,7 @@ msgid ""
 msgstr ""
 
 #: ../../mod/install.php:139 ../../mod/install.php:204
-#: ../../mod/install.php:489
+#: ../../mod/install.php:488
 msgid "Please see the file \"INSTALL.txt\"."
 msgstr ""
 
@@ -1173,21 +1173,21 @@ msgid ""
 "server root."
 msgstr ""
 
-#: ../../mod/install.php:476
+#: ../../mod/install.php:475
 msgid "Errors encountered creating database tables."
 msgstr ""
 
-#: ../../mod/install.php:487
+#: ../../mod/install.php:486
 msgid "<h1>What next</h1>"
 msgstr ""
 
-#: ../../mod/install.php:488
+#: ../../mod/install.php:487
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
 #: ../../mod/localtime.php:12 ../../include/event.php:11
-#: ../../include/bb2diaspora.php:433
+#: ../../include/bb2diaspora.php:390
 msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
@@ -1253,7 +1253,7 @@ msgid "is interested in:"
 msgstr ""
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1152
+#: ../../include/contact_widgets.php:9 ../../boot.php:1143
 msgid "Connect"
 msgstr ""
 
@@ -1282,28 +1282,28 @@ msgid "Group: "
 msgstr ""
 
 #: ../../mod/content.php:438 ../../mod/content.php:720
-#: ../../include/conversation.php:408 ../../include/conversation.php:815
+#: ../../include/conversation.php:419 ../../include/conversation.php:826
 msgid "Select"
 msgstr ""
 
 #: ../../mod/content.php:455 ../../mod/content.php:813
-#: ../../mod/content.php:814 ../../include/conversation.php:596
-#: ../../include/conversation.php:597 ../../include/conversation.php:832
+#: ../../mod/content.php:814 ../../include/conversation.php:607
+#: ../../include/conversation.php:608 ../../include/conversation.php:843
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 
 #: ../../mod/content.php:465 ../../mod/content.php:825
-#: ../../include/conversation.php:610 ../../include/conversation.php:843
+#: ../../include/conversation.php:621 ../../include/conversation.php:854
 #, php-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../../mod/content.php:480 ../../include/conversation.php:858
+#: ../../mod/content.php:480 ../../include/conversation.php:869
 msgid "View in context"
 msgstr ""
 
-#: ../../mod/content.php:586 ../../include/conversation.php:637
+#: ../../mod/content.php:586 ../../include/conversation.php:648
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
@@ -1312,92 +1312,92 @@ msgstr[1] ""
 
 #: ../../mod/content.php:587 ../../addon/page/page.php:76
 #: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119
-#: ../../include/contact_widgets.php:188 ../../include/conversation.php:638
-#: ../../boot.php:584
+#: ../../include/contact_widgets.php:188 ../../include/conversation.php:649
+#: ../../boot.php:575
 msgid "show more"
 msgstr ""
 
-#: ../../mod/content.php:665 ../../include/conversation.php:534
+#: ../../mod/content.php:665 ../../include/conversation.php:545
 msgid "like"
 msgstr ""
 
-#: ../../mod/content.php:666 ../../include/conversation.php:535
+#: ../../mod/content.php:666 ../../include/conversation.php:546
 msgid "dislike"
 msgstr ""
 
-#: ../../mod/content.php:668 ../../include/conversation.php:537
+#: ../../mod/content.php:668 ../../include/conversation.php:548
 msgid "Share this"
 msgstr ""
 
-#: ../../mod/content.php:668 ../../include/conversation.php:537
+#: ../../mod/content.php:668 ../../include/conversation.php:548
 msgid "share"
 msgstr ""
 
-#: ../../mod/content.php:692 ../../include/conversation.php:561
+#: ../../mod/content.php:692 ../../include/conversation.php:572
 msgid "Bold"
 msgstr ""
 
-#: ../../mod/content.php:693 ../../include/conversation.php:562
+#: ../../mod/content.php:693 ../../include/conversation.php:573
 msgid "Italic"
 msgstr ""
 
-#: ../../mod/content.php:694 ../../include/conversation.php:563
+#: ../../mod/content.php:694 ../../include/conversation.php:574
 msgid "Underline"
 msgstr ""
 
-#: ../../mod/content.php:695 ../../include/conversation.php:564
+#: ../../mod/content.php:695 ../../include/conversation.php:575
 msgid "Quote"
 msgstr ""
 
-#: ../../mod/content.php:696 ../../include/conversation.php:565
+#: ../../mod/content.php:696 ../../include/conversation.php:576
 msgid "Code"
 msgstr ""
 
-#: ../../mod/content.php:697 ../../include/conversation.php:566
+#: ../../mod/content.php:697 ../../include/conversation.php:577
 msgid "Image"
 msgstr ""
 
-#: ../../mod/content.php:698 ../../include/conversation.php:567
+#: ../../mod/content.php:698 ../../include/conversation.php:578
 msgid "Link"
 msgstr ""
 
-#: ../../mod/content.php:699 ../../include/conversation.php:568
+#: ../../mod/content.php:699 ../../include/conversation.php:579
 msgid "Video"
 msgstr ""
 
-#: ../../mod/content.php:733 ../../include/conversation.php:498
+#: ../../mod/content.php:733 ../../include/conversation.php:509
 msgid "add star"
 msgstr ""
 
-#: ../../mod/content.php:734 ../../include/conversation.php:499
+#: ../../mod/content.php:734 ../../include/conversation.php:510
 msgid "remove star"
 msgstr ""
 
-#: ../../mod/content.php:735 ../../include/conversation.php:500
+#: ../../mod/content.php:735 ../../include/conversation.php:511
 msgid "toggle star status"
 msgstr ""
 
-#: ../../mod/content.php:738 ../../include/conversation.php:503
+#: ../../mod/content.php:738 ../../include/conversation.php:514
 msgid "starred"
 msgstr ""
 
-#: ../../mod/content.php:739 ../../include/conversation.php:504
+#: ../../mod/content.php:739 ../../include/conversation.php:515
 msgid "add tag"
 msgstr ""
 
-#: ../../mod/content.php:743 ../../include/conversation.php:412
+#: ../../mod/content.php:743 ../../include/conversation.php:423
 msgid "save to folder"
 msgstr ""
 
-#: ../../mod/content.php:815 ../../include/conversation.php:598
+#: ../../mod/content.php:815 ../../include/conversation.php:609
 msgid "to"
 msgstr ""
 
-#: ../../mod/content.php:816 ../../include/conversation.php:599
+#: ../../mod/content.php:816 ../../include/conversation.php:610
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../mod/content.php:817 ../../include/conversation.php:600
+#: ../../mod/content.php:817 ../../include/conversation.php:611
 msgid "via Wall-To-Wall:"
 msgstr ""
 
@@ -1482,7 +1482,7 @@ msgid "if applicable"
 msgstr ""
 
 #: ../../mod/notifications.php:157 ../../mod/notifications.php:204
-#: ../../mod/admin.php:681
+#: ../../mod/admin.php:690
 msgid "Approve"
 msgstr ""
 
@@ -1683,12 +1683,12 @@ msgid "View all contacts"
 msgstr ""
 
 #: ../../mod/contacts.php:308 ../../mod/contacts.php:367
-#: ../../mod/admin.php:685
+#: ../../mod/admin.php:694
 msgid "Unblock"
 msgstr ""
 
 #: ../../mod/contacts.php:308 ../../mod/contacts.php:367
-#: ../../mod/admin.php:684
+#: ../../mod/admin.php:693
 msgid "Block"
 msgstr ""
 
@@ -1785,7 +1785,7 @@ msgstr ""
 msgid "Update public posts"
 msgstr ""
 
-#: ../../mod/contacts.php:364 ../../mod/admin.php:1156
+#: ../../mod/contacts.php:364 ../../mod/admin.php:1165
 msgid "Update now"
 msgstr ""
 
@@ -1916,7 +1916,7 @@ msgstr ""
 #: ../../addon/facebook/facebook.php:1200
 #: ../../addon/public_server/public_server.php:62
 #: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3219
-#: ../../boot.php:797
+#: ../../boot.php:788
 msgid "Administrator"
 msgstr ""
 
@@ -1926,7 +1926,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:83 ../../boot.php:934
+#: ../../mod/lostpass.php:83 ../../boot.php:925
 msgid "Password Reset"
 msgstr ""
 
@@ -1998,7 +1998,8 @@ msgstr ""
 msgid "Remove account"
 msgstr ""
 
-#: ../../mod/settings.php:69 ../../mod/admin.php:771 ../../mod/admin.php:976
+#: ../../mod/settings.php:69 ../../mod/newmember.php:22
+#: ../../mod/admin.php:780 ../../mod/admin.php:985
 #: ../../addon/dav/friendica/layout.fnk.php:225
 #: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:643
 #: ../../view/theme/diabook/theme.php:773 ../../include/nav.php:137
@@ -2225,7 +2226,7 @@ msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
 #: ../../mod/settings.php:758
-msgid "Number of items to display on the network page:"
+msgid "Number of items to display per page:"
 msgstr ""
 
 #: ../../mod/settings.php:758
@@ -2594,7 +2595,7 @@ msgstr ""
 msgid "Invalid contact."
 msgstr ""
 
-#: ../../mod/notes.php:44 ../../boot.php:1666
+#: ../../mod/notes.php:44 ../../boot.php:1657
 msgid "Personal Notes"
 msgstr ""
 
@@ -2637,7 +2638,7 @@ msgstr ""
 
 #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
 #: ../../mod/message.php:242 ../../mod/message.php:250
-#: ../../include/conversation.php:1101 ../../include/conversation.php:1118
+#: ../../include/conversation.php:1112 ../../include/conversation.php:1129
 msgid "Please enter a link URL:"
 msgstr ""
 
@@ -2653,17 +2654,17 @@ msgid ""
 msgstr ""
 
 #: ../../mod/wallmessage.php:140 ../../mod/message.php:279
-#: ../../mod/message.php:467
+#: ../../mod/message.php:469
 msgid "To:"
 msgstr ""
 
 #: ../../mod/wallmessage.php:141 ../../mod/message.php:284
-#: ../../mod/message.php:469
+#: ../../mod/message.php:471
 msgid "Subject:"
 msgstr ""
 
 #: ../../mod/wallmessage.php:147 ../../mod/message.php:288
-#: ../../mod/message.php:472 ../../mod/invite.php:113
+#: ../../mod/message.php:474 ../../mod/invite.php:113
 msgid "Your message:"
 msgstr ""
 
@@ -2683,21 +2684,33 @@ msgid ""
 "registration and then will quietly disappear."
 msgstr ""
 
-#: ../../mod/newmember.php:16
+#: ../../mod/newmember.php:14
+msgid "Getting Started"
+msgstr ""
+
+#: ../../mod/newmember.php:18
+msgid "Friendica Walk-Through"
+msgstr ""
+
+#: ../../mod/newmember.php:18
 msgid ""
 "On your <em>Quick Start</em> page - find a brief introduction to your "
 "profile and network tabs, make some new connections, and find some groups to "
 "join."
 msgstr ""
 
-#: ../../mod/newmember.php:18
+#: ../../mod/newmember.php:26
+msgid "Go to Your Settings"
+msgstr ""
+
+#: ../../mod/newmember.php:26
 msgid ""
 "On your <em>Settings</em> page -  change your initial password. Also make a "
 "note of your Identity Address. This looks just like an email address - and "
 "will be useful in making friends on the free social web."
 msgstr ""
 
-#: ../../mod/newmember.php:20
+#: ../../mod/newmember.php:28
 msgid ""
 "Review the other settings, particularly the privacy settings. An unpublished "
 "directory listing is like having an unlisted phone number. In general, you "
@@ -2705,61 +2718,106 @@ msgid ""
 "potential friends know exactly how to find you."
 msgstr ""
 
-#: ../../mod/newmember.php:22
+#: ../../mod/newmember.php:32 ../../mod/profperm.php:103
+#: ../../view/theme/diabook/theme.php:128 ../../include/profile_advanced.php:7
+#: ../../include/profile_advanced.php:84 ../../include/nav.php:50
+#: ../../boot.php:1633
+msgid "Profile"
+msgstr ""
+
+#: ../../mod/newmember.php:36 ../../mod/profile_photo.php:211
+msgid "Upload Profile Photo"
+msgstr ""
+
+#: ../../mod/newmember.php:36
 msgid ""
 "Upload a profile photo if you have not done so already. Studies have shown "
 "that people with real photos of themselves are ten times more likely to make "
 "friends than people who do not."
 msgstr ""
 
-#: ../../mod/newmember.php:25
-msgid ""
-"Authorise the Facebook Connector if you currently have a Facebook account "
-"and we will (optionally) import all your Facebook friends and conversations."
+#: ../../mod/newmember.php:38
+msgid "Edit Your Profile"
 msgstr ""
 
-#: ../../mod/newmember.php:27
-msgid ""
-"<em>If</em> this is your own personal server, installing the Facebook addon "
-"may ease your transition to the free social web."
-msgstr ""
-
-#: ../../mod/newmember.php:32
-msgid ""
-"Enter your email access information on your Connector Settings page if you "
-"wish to import and interact with friends or mailing lists from your email "
-"INBOX"
-msgstr ""
-
-#: ../../mod/newmember.php:34
+#: ../../mod/newmember.php:38
 msgid ""
 "Edit your <strong>default</strong> profile to your liking. Review the "
 "settings for hiding your list of friends and hiding the profile from unknown "
 "visitors."
 msgstr ""
 
-#: ../../mod/newmember.php:36
+#: ../../mod/newmember.php:40
+msgid "Profile Keywords"
+msgstr ""
+
+#: ../../mod/newmember.php:40
 msgid ""
 "Set some public keywords for your default profile which describe your "
 "interests. We may be able to find other people with similar interests and "
 "suggest friendships."
 msgstr ""
 
-#: ../../mod/newmember.php:38
+#: ../../mod/newmember.php:44
+msgid "Connecting"
+msgstr ""
+
+#: ../../mod/newmember.php:49 ../../mod/newmember.php:51
+#: ../../addon/facebook/facebook.php:728
+#: ../../include/contact_selectors.php:81
+msgid "Facebook"
+msgstr ""
+
+#: ../../mod/newmember.php:49
+msgid ""
+"Authorise the Facebook Connector if you currently have a Facebook account "
+"and we will (optionally) import all your Facebook friends and conversations."
+msgstr ""
+
+#: ../../mod/newmember.php:51
+msgid ""
+"<em>If</em> this is your own personal server, installing the Facebook addon "
+"may ease your transition to the free social web."
+msgstr ""
+
+#: ../../mod/newmember.php:56
+msgid "Importing Emails"
+msgstr ""
+
+#: ../../mod/newmember.php:56
+msgid ""
+"Enter your email access information on your Connector Settings page if you "
+"wish to import and interact with friends or mailing lists from your email "
+"INBOX"
+msgstr ""
+
+#: ../../mod/newmember.php:58
+msgid "Go to Your Contacts Page"
+msgstr ""
+
+#: ../../mod/newmember.php:58
 msgid ""
 "Your Contacts page is your gateway to managing friendships and connecting "
 "with friends on other networks. Typically you enter their address or site "
 "URL in the <em>Add New Contact</em> dialog."
 msgstr ""
 
-#: ../../mod/newmember.php:40
+#: ../../mod/newmember.php:60
+msgid "Go to Your Site's Directory"
+msgstr ""
+
+#: ../../mod/newmember.php:60
 msgid ""
 "The Directory page lets you find other people in this network or other "
 "federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on "
 "their profile page. Provide your own Identity Address if requested."
 msgstr ""
 
-#: ../../mod/newmember.php:42
+#: ../../mod/newmember.php:62
+msgid "Finding New People"
+msgstr ""
+
+#: ../../mod/newmember.php:62
 msgid ""
 "On the side panel of the Contacts page are several tools to find new "
 "friends. We can match people by interest, look up people by name or "
@@ -2768,14 +2826,41 @@ msgid ""
 "hours."
 msgstr ""
 
-#: ../../mod/newmember.php:44
+#: ../../mod/newmember.php:66 ../../include/group.php:239
+msgid "Groups"
+msgstr ""
+
+#: ../../mod/newmember.php:70
+msgid "Group Your Contacts"
+msgstr ""
+
+#: ../../mod/newmember.php:70
 msgid ""
 "Once you have made some friends, organize them into private conversation "
 "groups from the sidebar of your Contacts page and then you can interact with "
 "each group privately on your Network page."
 msgstr ""
 
-#: ../../mod/newmember.php:46
+#: ../../mod/newmember.php:73
+msgid "Why Aren't My Posts Public?"
+msgstr ""
+
+#: ../../mod/newmember.php:73
+msgid ""
+"Friendica respects your privacy. By default, your posts will only show up to "
+"people you've added as friends. For more information, see the help section "
+"from the link above."
+msgstr ""
+
+#: ../../mod/newmember.php:78
+msgid "Getting Help"
+msgstr ""
+
+#: ../../mod/newmember.php:82
+msgid "Go to the Help Section"
+msgstr ""
+
+#: ../../mod/newmember.php:82
 msgid ""
 "Our <strong>help</strong> pages may be consulted for detail on other program "
 "features and resources."
@@ -2845,12 +2930,6 @@ msgstr ""
 msgid "Profile Visibility Editor"
 msgstr ""
 
-#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:128
-#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84
-#: ../../include/nav.php:50 ../../boot.php:1642
-msgid "Profile"
-msgstr ""
-
 #: ../../mod/profperm.php:114
 msgid "Visible To"
 msgstr ""
@@ -2928,7 +3007,7 @@ msgstr ""
 msgid "Your invitation ID: "
 msgstr ""
 
-#: ../../mod/register.php:255 ../../mod/admin.php:436
+#: ../../mod/register.php:255 ../../mod/admin.php:442
 msgid "Registration"
 msgstr ""
 
@@ -2951,7 +3030,7 @@ msgstr ""
 msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:896
+#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:887
 msgid "Register"
 msgstr ""
 
@@ -2965,26 +3044,26 @@ msgstr ""
 #: ../../addon/communityhome/communityhome.php:167
 #: ../../view/theme/diabook/theme.php:565
 #: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1824
-#: ../../include/conversation.php:109 ../../include/conversation.php:118
-#: ../../include/conversation.php:239 ../../include/conversation.php:248
+#: ../../include/conversation.php:120 ../../include/conversation.php:129
+#: ../../include/conversation.php:250 ../../include/conversation.php:259
 msgid "status"
 msgstr ""
 
 #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1598
 #: ../../addon/communityhome/communityhome.php:172
 #: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1840
-#: ../../include/conversation.php:126
+#: ../../include/conversation.php:137
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/like.php:164 ../../include/conversation.php:129
+#: ../../mod/like.php:164 ../../include/conversation.php:140
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
-#: ../../mod/admin.php:720 ../../mod/admin.php:919 ../../mod/display.php:29
+#: ../../mod/admin.php:729 ../../mod/admin.php:928 ../../mod/display.php:29
 #: ../../mod/display.php:135 ../../include/items.php:3697
 msgid "Item not found."
 msgstr ""
@@ -2994,7 +3073,7 @@ msgid "Access denied."
 msgstr ""
 
 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130
-#: ../../include/nav.php:51 ../../boot.php:1649
+#: ../../include/nav.php:51 ../../boot.php:1640
 msgid "Photos"
 msgstr ""
 
@@ -3055,7 +3134,7 @@ msgstr ""
 msgid "%s posted an update."
 msgstr ""
 
-#: ../../mod/mood.php:62 ../../include/conversation.php:217
+#: ../../mod/mood.php:62 ../../include/conversation.php:228
 #, php-format
 msgid "%1$s is currently %2$s"
 msgstr ""
@@ -3097,10 +3176,6 @@ msgstr ""
 msgid "Upload File:"
 msgstr ""
 
-#: ../../mod/profile_photo.php:211
-msgid "Upload Profile Photo"
-msgstr ""
-
 #: ../../mod/profile_photo.php:212
 #: ../../addon/dav/friendica/layout.fnk.php:152
 msgid "Upload"
@@ -3183,7 +3258,7 @@ msgstr ""
 msgid "%s and You"
 msgstr ""
 
-#: ../../mod/message.php:350 ../../mod/message.php:460
+#: ../../mod/message.php:350 ../../mod/message.php:462
 msgid "Delete conversation"
 msgstr ""
 
@@ -3191,28 +3266,28 @@ msgstr ""
 msgid "D, d M Y - g:i A"
 msgstr ""
 
-#: ../../mod/message.php:355
+#: ../../mod/message.php:356
 #, php-format
 msgid "%d message"
 msgid_plural "%d messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/message.php:390
+#: ../../mod/message.php:391
 msgid "Message not available."
 msgstr ""
 
-#: ../../mod/message.php:443
+#: ../../mod/message.php:444
 msgid "Delete message"
 msgstr ""
 
-#: ../../mod/message.php:462
+#: ../../mod/message.php:464
 msgid ""
 "No secure communications available. You <strong>may</strong> be able to "
 "respond from the sender's profile page."
 msgstr ""
 
-#: ../../mod/message.php:466
+#: ../../mod/message.php:468
 msgid "Send Reply"
 msgstr ""
 
@@ -3229,19 +3304,19 @@ msgstr ""
 msgid "Theme settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:96 ../../mod/admin.php:434
+#: ../../mod/admin.php:96 ../../mod/admin.php:440
 msgid "Site"
 msgstr ""
 
-#: ../../mod/admin.php:97 ../../mod/admin.php:675 ../../mod/admin.php:687
+#: ../../mod/admin.php:97 ../../mod/admin.php:684 ../../mod/admin.php:696
 msgid "Users"
 msgstr ""
 
-#: ../../mod/admin.php:98 ../../mod/admin.php:769 ../../mod/admin.php:811
+#: ../../mod/admin.php:98 ../../mod/admin.php:778 ../../mod/admin.php:820
 msgid "Plugins"
 msgstr ""
 
-#: ../../mod/admin.php:99 ../../mod/admin.php:974 ../../mod/admin.php:1010
+#: ../../mod/admin.php:99 ../../mod/admin.php:983 ../../mod/admin.php:1019
 msgid "Themes"
 msgstr ""
 
@@ -3249,7 +3324,7 @@ msgstr ""
 msgid "DB updates"
 msgstr ""
 
-#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1097
+#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1106
 msgid "Logs"
 msgstr ""
 
@@ -3265,19 +3340,19 @@ msgstr ""
 msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: ../../mod/admin.php:183 ../../mod/admin.php:657
+#: ../../mod/admin.php:183 ../../mod/admin.php:666
 msgid "Normal Account"
 msgstr ""
 
-#: ../../mod/admin.php:184 ../../mod/admin.php:658
+#: ../../mod/admin.php:184 ../../mod/admin.php:667
 msgid "Soapbox Account"
 msgstr ""
 
-#: ../../mod/admin.php:185 ../../mod/admin.php:659
+#: ../../mod/admin.php:185 ../../mod/admin.php:668
 msgid "Community/Celebrity Account"
 msgstr ""
 
-#: ../../mod/admin.php:186 ../../mod/admin.php:660
+#: ../../mod/admin.php:186 ../../mod/admin.php:669
 msgid "Automatic Friend Account"
 msgstr ""
 
@@ -3293,9 +3368,9 @@ msgstr ""
 msgid "Message queues"
 msgstr ""
 
-#: ../../mod/admin.php:212 ../../mod/admin.php:433 ../../mod/admin.php:674
-#: ../../mod/admin.php:768 ../../mod/admin.php:810 ../../mod/admin.php:973
-#: ../../mod/admin.php:1009 ../../mod/admin.php:1096
+#: ../../mod/admin.php:212 ../../mod/admin.php:439 ../../mod/admin.php:683
+#: ../../mod/admin.php:777 ../../mod/admin.php:819 ../../mod/admin.php:982
+#: ../../mod/admin.php:1018 ../../mod/admin.php:1105
 msgid "Administration"
 msgstr ""
 
@@ -3319,527 +3394,557 @@ msgstr ""
 msgid "Active plugins"
 msgstr ""
 
-#: ../../mod/admin.php:367
+#: ../../mod/admin.php:373
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:396
+#: ../../mod/admin.php:402
 msgid "Don't apply a special theme for mobile devices."
 msgstr ""
 
-#: ../../mod/admin.php:420
+#: ../../mod/admin.php:426
 msgid "Closed"
 msgstr ""
 
-#: ../../mod/admin.php:421
+#: ../../mod/admin.php:427
 msgid "Requires approval"
 msgstr ""
 
-#: ../../mod/admin.php:422
+#: ../../mod/admin.php:428
 msgid "Open"
 msgstr ""
 
-#: ../../mod/admin.php:426
+#: ../../mod/admin.php:432
 msgid "No SSL policy, links will track page SSL state"
 msgstr ""
 
-#: ../../mod/admin.php:427
+#: ../../mod/admin.php:433
 msgid "Force all links to use SSL"
 msgstr ""
 
-#: ../../mod/admin.php:428
+#: ../../mod/admin.php:434
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr ""
 
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:443
 msgid "File upload"
 msgstr ""
 
-#: ../../mod/admin.php:438
+#: ../../mod/admin.php:444
 msgid "Policies"
 msgstr ""
 
-#: ../../mod/admin.php:439
+#: ../../mod/admin.php:445
 msgid "Advanced"
 msgstr ""
 
-#: ../../mod/admin.php:443 ../../addon/statusnet/statusnet.php:567
+#: ../../mod/admin.php:449 ../../addon/statusnet/statusnet.php:567
 msgid "Site name"
 msgstr ""
 
-#: ../../mod/admin.php:444
+#: ../../mod/admin.php:450
 msgid "Banner/Logo"
 msgstr ""
 
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:451
 msgid "System language"
 msgstr ""
 
-#: ../../mod/admin.php:446
+#: ../../mod/admin.php:452
 msgid "System theme"
 msgstr ""
 
-#: ../../mod/admin.php:446
+#: ../../mod/admin.php:452
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr ""
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:453
 msgid "Mobile system theme"
 msgstr ""
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:453
 msgid "Theme for mobile devices"
 msgstr ""
 
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:454
 msgid "SSL link policy"
 msgstr ""
 
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:454
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr ""
 
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:455
 msgid "Maximum image size"
 msgstr ""
 
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:455
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
-#: ../../mod/admin.php:451
+#: ../../mod/admin.php:456
+msgid "Maximum image length"
+msgstr ""
+
+#: ../../mod/admin.php:456
+msgid ""
+"Maximum length in pixels of the longest side of uploaded images. Default is -"
+"1, which means no limits."
+msgstr ""
+
+#: ../../mod/admin.php:457
+msgid "JPEG image quality"
+msgstr ""
+
+#: ../../mod/admin.php:457
+msgid ""
+"Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
+"100, which is full quality."
+msgstr ""
+
+#: ../../mod/admin.php:459
 msgid "Register policy"
 msgstr ""
 
-#: ../../mod/admin.php:452
+#: ../../mod/admin.php:460
 msgid "Register text"
 msgstr ""
 
-#: ../../mod/admin.php:452
+#: ../../mod/admin.php:460
 msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: ../../mod/admin.php:453
+#: ../../mod/admin.php:461
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: ../../mod/admin.php:453
+#: ../../mod/admin.php:461
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:462
 msgid "Allowed friend domains"
 msgstr ""
 
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:462
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr ""
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:463
 msgid "Allowed email domains"
 msgstr ""
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:463
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr ""
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:464
 msgid "Block public"
 msgstr ""
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:464
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr ""
 
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:465
 msgid "Force publish"
 msgstr ""
 
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:465
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:466
 msgid "Global directory update URL"
 msgstr ""
 
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:466
 msgid ""
 "URL to update the global directory. If this is not set, the global directory "
 "is completely unavailable to the application."
 msgstr ""
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:467
 msgid "Allow threaded items"
 msgstr ""
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:467
 msgid "Allow infinite level threading for items on this site."
 msgstr ""
 
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:468
+msgid "No default permissions for new users"
+msgstr ""
+
+#: ../../mod/admin.php:468
+msgid ""
+"New users will have no private permissions set for their posts by default, "
+"making their posts public until they change it."
+msgstr ""
+
+#: ../../mod/admin.php:470
 msgid "Block multiple registrations"
 msgstr ""
 
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:470
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr ""
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:471
 msgid "OpenID support"
 msgstr ""
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:471
 msgid "OpenID support for registration and logins."
 msgstr ""
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:472
 msgid "Fullname check"
 msgstr ""
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:472
 msgid ""
 "Force users to register with a space between firstname and lastname in Full "
 "name, as an antispam measure"
 msgstr ""
 
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:473
 msgid "UTF-8 Regular expressions"
 msgstr ""
 
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:473
 msgid "Use PHP UTF8 regular expressions"
 msgstr ""
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:474
 msgid "Show Community Page"
 msgstr ""
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:474
 msgid ""
 "Display a Community page showing all recent public postings on this site."
 msgstr ""
 
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:475
 msgid "Enable OStatus support"
 msgstr ""
 
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:475
 msgid ""
 "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All "
 "communications in OStatus are public, so privacy warnings will be "
 "occasionally displayed."
 msgstr ""
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:476
 msgid "Enable Diaspora support"
 msgstr ""
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:476
 msgid "Provide built-in Diaspora network compatibility."
 msgstr ""
 
-#: ../../mod/admin.php:468
+#: ../../mod/admin.php:477
 msgid "Only allow Friendica contacts"
 msgstr ""
 
-#: ../../mod/admin.php:468
+#: ../../mod/admin.php:477
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr ""
 
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:478
 msgid "Verify SSL"
 msgstr ""
 
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:478
 msgid ""
 "If you wish, you can turn on strict certificate checking. This will mean you "
 "cannot connect (at all) to self-signed SSL sites."
 msgstr ""
 
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:479
 msgid "Proxy user"
 msgstr ""
 
-#: ../../mod/admin.php:471
+#: ../../mod/admin.php:480
 msgid "Proxy URL"
 msgstr ""
 
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:481
 msgid "Network timeout"
 msgstr ""
 
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:481
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:482
 msgid "Delivery interval"
 msgstr ""
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:482
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr ""
 
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:483
 msgid "Poll interval"
 msgstr ""
 
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:483
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr ""
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:484
 msgid "Maximum Load Average"
 msgstr ""
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:484
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr ""
 
-#: ../../mod/admin.php:492
+#: ../../mod/admin.php:501
 msgid "Update has been marked successful"
 msgstr ""
 
-#: ../../mod/admin.php:502
+#: ../../mod/admin.php:511
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr ""
 
-#: ../../mod/admin.php:505
+#: ../../mod/admin.php:514
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr ""
 
-#: ../../mod/admin.php:509
+#: ../../mod/admin.php:518
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: ../../mod/admin.php:512
+#: ../../mod/admin.php:521
 #, php-format
 msgid "Update function %s could not be found."
 msgstr ""
 
-#: ../../mod/admin.php:527
+#: ../../mod/admin.php:536
 msgid "No failed updates."
 msgstr ""
 
-#: ../../mod/admin.php:531
+#: ../../mod/admin.php:540
 msgid "Failed Updates"
 msgstr ""
 
-#: ../../mod/admin.php:532
+#: ../../mod/admin.php:541
 msgid ""
 "This does not include updates prior to 1139, which did not return a status."
 msgstr ""
 
-#: ../../mod/admin.php:533
+#: ../../mod/admin.php:542
 msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: ../../mod/admin.php:534
+#: ../../mod/admin.php:543
 msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: ../../mod/admin.php:559
+#: ../../mod/admin.php:568
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:566
+#: ../../mod/admin.php:575
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:605
+#: ../../mod/admin.php:614
 #, php-format
 msgid "User '%s' deleted"
 msgstr ""
 
-#: ../../mod/admin.php:613
+#: ../../mod/admin.php:622
 #, php-format
 msgid "User '%s' unblocked"
 msgstr ""
 
-#: ../../mod/admin.php:613
+#: ../../mod/admin.php:622
 #, php-format
 msgid "User '%s' blocked"
 msgstr ""
 
-#: ../../mod/admin.php:677
+#: ../../mod/admin.php:686
 msgid "select all"
 msgstr ""
 
-#: ../../mod/admin.php:678
+#: ../../mod/admin.php:687
 msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../mod/admin.php:679
+#: ../../mod/admin.php:688
 msgid "Request date"
 msgstr ""
 
-#: ../../mod/admin.php:679 ../../mod/admin.php:688
+#: ../../mod/admin.php:688 ../../mod/admin.php:697
 #: ../../include/contact_selectors.php:79
 msgid "Email"
 msgstr ""
 
-#: ../../mod/admin.php:680
+#: ../../mod/admin.php:689
 msgid "No registrations."
 msgstr ""
 
-#: ../../mod/admin.php:682
+#: ../../mod/admin.php:691
 msgid "Deny"
 msgstr ""
 
-#: ../../mod/admin.php:688
+#: ../../mod/admin.php:697
 msgid "Register date"
 msgstr ""
 
-#: ../../mod/admin.php:688
+#: ../../mod/admin.php:697
 msgid "Last login"
 msgstr ""
 
-#: ../../mod/admin.php:688
+#: ../../mod/admin.php:697
 msgid "Last item"
 msgstr ""
 
-#: ../../mod/admin.php:688
+#: ../../mod/admin.php:697
 msgid "Account"
 msgstr ""
 
-#: ../../mod/admin.php:690
+#: ../../mod/admin.php:699
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:691
+#: ../../mod/admin.php:700
 msgid ""
 "The user {0} will be deleted!\\n\\nEverything this user has posted on this "
 "site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:732
+#: ../../mod/admin.php:741
 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../mod/admin.php:736
+#: ../../mod/admin.php:745
 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../mod/admin.php:746 ../../mod/admin.php:944
+#: ../../mod/admin.php:755 ../../mod/admin.php:953
 msgid "Disable"
 msgstr ""
 
-#: ../../mod/admin.php:748 ../../mod/admin.php:946
+#: ../../mod/admin.php:757 ../../mod/admin.php:955
 msgid "Enable"
 msgstr ""
 
-#: ../../mod/admin.php:770 ../../mod/admin.php:975
+#: ../../mod/admin.php:779 ../../mod/admin.php:984
 msgid "Toggle"
 msgstr ""
 
-#: ../../mod/admin.php:778 ../../mod/admin.php:985
+#: ../../mod/admin.php:787 ../../mod/admin.php:994
 msgid "Author: "
 msgstr ""
 
-#: ../../mod/admin.php:779 ../../mod/admin.php:986
+#: ../../mod/admin.php:788 ../../mod/admin.php:995
 msgid "Maintainer: "
 msgstr ""
 
-#: ../../mod/admin.php:908
+#: ../../mod/admin.php:917
 msgid "No themes found."
 msgstr ""
 
-#: ../../mod/admin.php:967
+#: ../../mod/admin.php:976
 msgid "Screenshot"
 msgstr ""
 
-#: ../../mod/admin.php:1015
+#: ../../mod/admin.php:1024
 msgid "[Experimental]"
 msgstr ""
 
-#: ../../mod/admin.php:1016
+#: ../../mod/admin.php:1025
 msgid "[Unsupported]"
 msgstr ""
 
-#: ../../mod/admin.php:1043
+#: ../../mod/admin.php:1052
 msgid "Log settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:1099
+#: ../../mod/admin.php:1108
 msgid "Clear"
 msgstr ""
 
-#: ../../mod/admin.php:1105
+#: ../../mod/admin.php:1114
 msgid "Debugging"
 msgstr ""
 
-#: ../../mod/admin.php:1106
+#: ../../mod/admin.php:1115
 msgid "Log file"
 msgstr ""
 
-#: ../../mod/admin.php:1106
+#: ../../mod/admin.php:1115
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr ""
 
-#: ../../mod/admin.php:1107
+#: ../../mod/admin.php:1116
 msgid "Log level"
 msgstr ""
 
-#: ../../mod/admin.php:1157
+#: ../../mod/admin.php:1166
 msgid "Close"
 msgstr ""
 
-#: ../../mod/admin.php:1163
+#: ../../mod/admin.php:1172
 msgid "FTP Host"
 msgstr ""
 
-#: ../../mod/admin.php:1164
+#: ../../mod/admin.php:1173
 msgid "FTP Path"
 msgstr ""
 
-#: ../../mod/admin.php:1165
+#: ../../mod/admin.php:1174
 msgid "FTP User"
 msgstr ""
 
-#: ../../mod/admin.php:1166
+#: ../../mod/admin.php:1175
 msgid "FTP Password"
 msgstr ""
 
-#: ../../mod/profile.php:22 ../../boot.php:1065
+#: ../../mod/profile.php:22 ../../boot.php:1056
 msgid "Requested profile is not available."
 msgstr ""
 
@@ -4234,28 +4339,28 @@ msgstr ""
 msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/profiles.php:678 ../../boot.php:1174
+#: ../../mod/profiles.php:678 ../../boot.php:1165
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/profiles.php:679 ../../boot.php:1175
+#: ../../mod/profiles.php:679 ../../boot.php:1166
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/profiles.php:690 ../../boot.php:1185
+#: ../../mod/profiles.php:690 ../../boot.php:1176
 msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/profiles.php:692 ../../boot.php:1188
+#: ../../mod/profiles.php:692 ../../boot.php:1179
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../mod/profiles.php:693 ../../boot.php:1189
+#: ../../mod/profiles.php:693 ../../boot.php:1180
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../mod/filer.php:29 ../../include/conversation.php:1105
-#: ../../include/conversation.php:1122
+#: ../../mod/filer.php:29 ../../include/conversation.php:1116
+#: ../../include/conversation.php:1133
 msgid "Save to Folder:"
 msgstr ""
 
@@ -4263,7 +4368,7 @@ msgstr ""
 msgid "- select -"
 msgstr ""
 
-#: ../../mod/tagger.php:103 ../../include/conversation.php:256
+#: ../../mod/tagger.php:103 ../../include/conversation.php:267
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
@@ -4379,17 +4484,17 @@ msgid "Gender: "
 msgstr ""
 
 #: ../../mod/directory.php:134 ../../include/profile_advanced.php:17
-#: ../../boot.php:1210
+#: ../../boot.php:1201
 msgid "Gender:"
 msgstr ""
 
 #: ../../mod/directory.php:136 ../../include/profile_advanced.php:37
-#: ../../boot.php:1213
+#: ../../boot.php:1204
 msgid "Status:"
 msgstr ""
 
 #: ../../mod/directory.php:138 ../../include/profile_advanced.php:48
-#: ../../boot.php:1215
+#: ../../boot.php:1206
 msgid "Homepage:"
 msgstr ""
 
@@ -4521,7 +4626,7 @@ msgid "Unable to set contact photo."
 msgstr ""
 
 #: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:608
-#: ../../include/conversation.php:162
+#: ../../include/conversation.php:173
 #, php-format
 msgid "%1$s is now friends with %2$s"
 msgstr ""
@@ -4680,11 +4785,6 @@ msgstr ""
 msgid "Problems with Facebook Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:728
-#: ../../include/contact_selectors.php:81
-msgid "Facebook"
-msgstr ""
-
 #: ../../addon/facebook/facebook.php:729
 msgid "Facebook Connector Settings"
 msgstr ""
@@ -5148,7 +5248,7 @@ msgstr ""
 #: ../../addon/communityhome/communityhome.php:34
 #: ../../addon/communityhome/twillingham/communityhome.php:28
 #: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:921
+#: ../../include/nav.php:64 ../../boot.php:912
 msgid "Login"
 msgstr ""
 
@@ -5177,7 +5277,7 @@ msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:155
 #: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1397
-#: ../../include/conversation.php:106 ../../include/conversation.php:236
+#: ../../include/conversation.php:117 ../../include/conversation.php:247
 msgid "event"
 msgstr ""
 
@@ -7264,6 +7364,7 @@ msgid "Sex Addict"
 msgstr ""
 
 #: ../../include/profile_selectors.php:42 ../../include/user.php:278
+#: ../../include/user.php:283
 msgid "Friends"
 msgstr ""
 
@@ -7351,11 +7452,11 @@ msgstr ""
 msgid "Ask me"
 msgstr ""
 
-#: ../../include/event.php:20 ../../include/bb2diaspora.php:439
+#: ../../include/event.php:20 ../../include/bb2diaspora.php:396
 msgid "Starts:"
 msgstr ""
 
-#: ../../include/event.php:30 ../../include/bb2diaspora.php:447
+#: ../../include/event.php:30 ../../include/bb2diaspora.php:404
 msgid "Finishes:"
 msgstr ""
 
@@ -7406,7 +7507,7 @@ msgstr[1] ""
 msgid "poke"
 msgstr ""
 
-#: ../../include/text.php:719 ../../include/conversation.php:201
+#: ../../include/text.php:719 ../../include/conversation.php:212
 msgid "poked"
 msgstr ""
 
@@ -7665,10 +7766,6 @@ msgstr ""
 msgid "edit"
 msgstr ""
 
-#: ../../include/group.php:239
-msgid "Groups"
-msgstr ""
-
 #: ../../include/group.php:240
 msgid "Edit group"
 msgstr ""
@@ -7681,7 +7778,7 @@ msgstr ""
 msgid "Contacts not in any group"
 msgstr ""
 
-#: ../../include/nav.php:46 ../../boot.php:920
+#: ../../include/nav.php:46 ../../boot.php:911
 msgid "Logout"
 msgstr ""
 
@@ -7689,7 +7786,7 @@ msgstr ""
 msgid "End this session"
 msgstr ""
 
-#: ../../include/nav.php:49 ../../boot.php:1635
+#: ../../include/nav.php:49 ../../boot.php:1626
 msgid "Status"
 msgstr ""
 
@@ -7769,11 +7866,11 @@ msgstr ""
 msgid "Manage other pages"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../boot.php:1168
+#: ../../include/nav.php:138 ../../boot.php:1159
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../boot.php:1168
+#: ../../include/nav.php:138 ../../boot.php:1159
 msgid "Manage/edit profiles"
 msgstr ""
 
@@ -7933,15 +8030,15 @@ msgstr ""
 msgid "From: "
 msgstr ""
 
-#: ../../include/bbcode.php:102 ../../include/bbcode.php:323
+#: ../../include/bbcode.php:185 ../../include/bbcode.php:406
 msgid "Image/photo"
 msgstr ""
 
-#: ../../include/bbcode.php:288 ../../include/bbcode.php:308
+#: ../../include/bbcode.php:371 ../../include/bbcode.php:391
 msgid "$1 wrote:"
 msgstr ""
 
-#: ../../include/bbcode.php:327 ../../include/bbcode.php:328
+#: ../../include/bbcode.php:410 ../../include/bbcode.php:411
 msgid "Encrypted content"
 msgstr ""
 
@@ -8300,256 +8397,256 @@ msgstr ""
 msgid "stopped following"
 msgstr ""
 
-#: ../../include/Contact.php:220 ../../include/conversation.php:1002
+#: ../../include/Contact.php:220 ../../include/conversation.php:1013
 msgid "Poke"
 msgstr ""
 
-#: ../../include/Contact.php:221 ../../include/conversation.php:996
+#: ../../include/Contact.php:221 ../../include/conversation.php:1007
 msgid "View Status"
 msgstr ""
 
-#: ../../include/Contact.php:222 ../../include/conversation.php:997
+#: ../../include/Contact.php:222 ../../include/conversation.php:1008
 msgid "View Profile"
 msgstr ""
 
-#: ../../include/Contact.php:223 ../../include/conversation.php:998
+#: ../../include/Contact.php:223 ../../include/conversation.php:1009
 msgid "View Photos"
 msgstr ""
 
 #: ../../include/Contact.php:224 ../../include/Contact.php:237
-#: ../../include/conversation.php:999
+#: ../../include/conversation.php:1010
 msgid "Network Posts"
 msgstr ""
 
 #: ../../include/Contact.php:225 ../../include/Contact.php:237
-#: ../../include/conversation.php:1000
+#: ../../include/conversation.php:1011
 msgid "Edit Contact"
 msgstr ""
 
 #: ../../include/Contact.php:226 ../../include/Contact.php:237
-#: ../../include/conversation.php:1001
+#: ../../include/conversation.php:1012
 msgid "Send PM"
 msgstr ""
 
-#: ../../include/conversation.php:197
+#: ../../include/conversation.php:208
 #, php-format
 msgid "%1$s poked %2$s"
 msgstr ""
 
-#: ../../include/conversation.php:281
+#: ../../include/conversation.php:292
 msgid "post/item"
 msgstr ""
 
-#: ../../include/conversation.php:282
+#: ../../include/conversation.php:293
 #, php-format
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 
-#: ../../include/conversation.php:902
+#: ../../include/conversation.php:913
 msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/conversation.php:1060
+#: ../../include/conversation.php:1071
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: ../../include/conversation.php:1060
+#: ../../include/conversation.php:1071
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/conversation.php:1064
+#: ../../include/conversation.php:1075
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""
 
-#: ../../include/conversation.php:1066
+#: ../../include/conversation.php:1077
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:1072
+#: ../../include/conversation.php:1083
 msgid "and"
 msgstr ""
 
-#: ../../include/conversation.php:1075
+#: ../../include/conversation.php:1086
 #, php-format
 msgid ", and %d other people"
 msgstr ""
 
-#: ../../include/conversation.php:1076
+#: ../../include/conversation.php:1087
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../include/conversation.php:1076
+#: ../../include/conversation.php:1087
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:1100 ../../include/conversation.php:1117
+#: ../../include/conversation.php:1111 ../../include/conversation.php:1128
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: ../../include/conversation.php:1102 ../../include/conversation.php:1119
+#: ../../include/conversation.php:1113 ../../include/conversation.php:1130
 msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:1103 ../../include/conversation.php:1120
+#: ../../include/conversation.php:1114 ../../include/conversation.php:1131
 msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:1104 ../../include/conversation.php:1121
+#: ../../include/conversation.php:1115 ../../include/conversation.php:1132
 msgid "Tag term:"
 msgstr ""
 
-#: ../../include/conversation.php:1106 ../../include/conversation.php:1123
+#: ../../include/conversation.php:1117 ../../include/conversation.php:1134
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/conversation.php:1166
+#: ../../include/conversation.php:1177
 msgid "upload photo"
 msgstr ""
 
-#: ../../include/conversation.php:1168
+#: ../../include/conversation.php:1179
 msgid "attach file"
 msgstr ""
 
-#: ../../include/conversation.php:1170
+#: ../../include/conversation.php:1181
 msgid "web link"
 msgstr ""
 
-#: ../../include/conversation.php:1171
+#: ../../include/conversation.php:1182
 msgid "Insert video link"
 msgstr ""
 
-#: ../../include/conversation.php:1172
+#: ../../include/conversation.php:1183
 msgid "video link"
 msgstr ""
 
-#: ../../include/conversation.php:1173
+#: ../../include/conversation.php:1184
 msgid "Insert audio link"
 msgstr ""
 
-#: ../../include/conversation.php:1174
+#: ../../include/conversation.php:1185
 msgid "audio link"
 msgstr ""
 
-#: ../../include/conversation.php:1176
+#: ../../include/conversation.php:1187
 msgid "set location"
 msgstr ""
 
-#: ../../include/conversation.php:1178
+#: ../../include/conversation.php:1189
 msgid "clear location"
 msgstr ""
 
-#: ../../include/conversation.php:1185
+#: ../../include/conversation.php:1196
 msgid "permissions"
 msgstr ""
 
-#: ../../include/plugin.php:390 ../../include/plugin.php:392
+#: ../../include/plugin.php:400 ../../include/plugin.php:402
 msgid "Click here to upgrade."
 msgstr ""
 
-#: ../../include/plugin.php:398
+#: ../../include/plugin.php:408
 msgid "This action exceeds the limits set by your subscription plan."
 msgstr ""
 
-#: ../../include/plugin.php:403
+#: ../../include/plugin.php:413
 msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: ../../boot.php:582
+#: ../../boot.php:573
 msgid "Delete this item?"
 msgstr ""
 
-#: ../../boot.php:585
+#: ../../boot.php:576
 msgid "show fewer"
 msgstr ""
 
-#: ../../boot.php:792
+#: ../../boot.php:783
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:794
+#: ../../boot.php:785
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:895
+#: ../../boot.php:886
 msgid "Create a New Account"
 msgstr ""
 
-#: ../../boot.php:923
+#: ../../boot.php:914
 msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../boot.php:924
+#: ../../boot.php:915
 msgid "Password: "
 msgstr ""
 
-#: ../../boot.php:927
+#: ../../boot.php:918
 msgid "Or login using OpenID: "
 msgstr ""
 
-#: ../../boot.php:933
+#: ../../boot.php:924
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:1100
+#: ../../boot.php:1091
 msgid "Edit profile"
 msgstr ""
 
-#: ../../boot.php:1160
+#: ../../boot.php:1151
 msgid "Message"
 msgstr ""
 
-#: ../../boot.php:1282 ../../boot.php:1368
+#: ../../boot.php:1273 ../../boot.php:1359
 msgid "g A l F d"
 msgstr ""
 
-#: ../../boot.php:1283 ../../boot.php:1369
+#: ../../boot.php:1274 ../../boot.php:1360
 msgid "F d"
 msgstr ""
 
-#: ../../boot.php:1328 ../../boot.php:1409
+#: ../../boot.php:1319 ../../boot.php:1400
 msgid "[today]"
 msgstr ""
 
-#: ../../boot.php:1340
+#: ../../boot.php:1331
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../boot.php:1341
+#: ../../boot.php:1332
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../boot.php:1402
+#: ../../boot.php:1393
 msgid "[No description]"
 msgstr ""
 
-#: ../../boot.php:1420
+#: ../../boot.php:1411
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../boot.php:1421
+#: ../../boot.php:1412
 msgid "Events this week:"
 msgstr ""
 
-#: ../../boot.php:1638
+#: ../../boot.php:1629
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../boot.php:1645
+#: ../../boot.php:1636
 msgid "Profile Details"
 msgstr ""
 
-#: ../../boot.php:1662
+#: ../../boot.php:1653
 msgid "Events and Calendar"
 msgstr ""
 
-#: ../../boot.php:1669
+#: ../../boot.php:1660
 msgid "Only You Can See This"
 msgstr ""