Merge remote branch 'upstream/master'

1 files changed, 570 insertions, 531 deletions

diff --git a/util/messages.po b/util/messages.po
index cf2f02d4e..7aefd8f67 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1346\n"
+"Project-Id-Version: 3.0.1353\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-18 10:00-0700\n"
+"POT-Creation-Date: 2012-05-24 16:51-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"
@@ -36,8 +36,8 @@ msgstr ""
 
 #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44
 #: ../../mod/fsuggest.php:78 ../../mod/events.php:138 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:865
-#: ../../mod/editpost.php:10 ../../mod/install.php:171
+#: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:920
+#: ../../mod/editpost.php:10 ../../mod/install.php:151
 #: ../../mod/notifications.php:66 ../../mod/contacts.php:125
 #: ../../mod/settings.php:104 ../../mod/settings.php:535
 #: ../../mod/settings.php:540 ../../mod/manage.php:86 ../../mod/network.php:6
@@ -85,7 +85,7 @@ msgid "Return to contact editor"
 msgstr ""
 
 #: ../../mod/crepair.php:148 ../../mod/settings.php:555
-#: ../../mod/settings.php:581 ../../mod/admin.php:643 ../../mod/admin.php:652
+#: ../../mod/settings.php:581 ../../mod/admin.php:656 ../../mod/admin.php:665
 msgid "Name"
 msgstr ""
 
@@ -122,24 +122,25 @@ msgid "New photo from this URL"
 msgstr ""
 
 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
-#: ../../mod/events.php:428 ../../mod/photos.php:900 ../../mod/photos.php:958
-#: ../../mod/photos.php:1193 ../../mod/photos.php:1233
-#: ../../mod/photos.php:1273 ../../mod/photos.php:1304
-#: ../../mod/install.php:251 ../../mod/install.php:289
+#: ../../mod/events.php:428 ../../mod/photos.php:955 ../../mod/photos.php:1013
+#: ../../mod/photos.php:1256 ../../mod/photos.php:1296
+#: ../../mod/photos.php:1336 ../../mod/photos.php:1367
+#: ../../mod/install.php:245 ../../mod/install.php:283
 #: ../../mod/localtime.php:45 ../../mod/contacts.php:322
 #: ../../mod/settings.php:553 ../../mod/settings.php:699
 #: ../../mod/settings.php:760 ../../mod/settings.php:964
-#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:404
-#: ../../mod/admin.php:640 ../../mod/admin.php:776 ../../mod/admin.php:975
-#: ../../mod/admin.php:1062 ../../mod/profiles.php:534
+#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:417
+#: ../../mod/admin.php:653 ../../mod/admin.php:789 ../../mod/admin.php:988
+#: ../../mod/admin.php:1075 ../../mod/profiles.php:534
 #: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:605
 #: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93
 #: ../../addon/nsfw/nsfw.php:57 ../../addon/planets/planets.php:158
 #: ../../addon/uhremotestorage/uhremotestorage.php:89
 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
-#: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187
-#: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:82
-#: ../../addon/blockem/blockem.php:57 ../../addon/qcomment/qcomment.php:61
+#: ../../addon/drpost/drpost.php:110 ../../addon/startpage/startpage.php:92
+#: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41
+#: ../../addon/impressum/impressum.php:82 ../../addon/blockem/blockem.php:57
+#: ../../addon/qcomment/qcomment.php:61
 #: ../../addon/openstreetmap/openstreetmap.php:70
 #: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84
 #: ../../addon/blackout/blackout.php:98 ../../addon/gravatar/gravatar.php:86
@@ -161,7 +162,7 @@ msgstr ""
 #: ../../view/theme/diabook/theme.php:752
 #: ../../view/theme/diabook/config.php:190
 #: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70
-#: ../../include/conversation.php:558
+#: ../../include/conversation.php:559
 msgid "Submit"
 msgstr ""
 
@@ -215,12 +216,12 @@ msgstr ""
 msgid "Edit event"
 msgstr ""
 
-#: ../../mod/events.php:300 ../../include/text.php:1054
+#: ../../mod/events.php:300 ../../include/text.php:1060
 msgid "link to source"
 msgstr ""
 
 #: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:126
-#: ../../include/nav.php:52 ../../boot.php:1503
+#: ../../include/nav.php:52 ../../boot.php:1523
 msgid "Events"
 msgstr ""
 
@@ -232,7 +233,7 @@ msgstr ""
 msgid "Previous"
 msgstr ""
 
-#: ../../mod/events.php:327 ../../mod/install.php:210
+#: ../../mod/events.php:327 ../../mod/install.php:204
 msgid "Next"
 msgstr ""
 
@@ -270,7 +271,7 @@ msgid "Description:"
 msgstr ""
 
 #: ../../mod/events.php:423 ../../include/event.php:37
-#: ../../include/bb2diaspora.php:260 ../../boot.php:1102
+#: ../../include/bb2diaspora.php:260 ../../boot.php:1103
 msgid "Location:"
 msgstr ""
 
@@ -330,7 +331,7 @@ msgstr ""
 #: ../../mod/settings.php:910 ../../mod/settings.php:916
 #: ../../mod/settings.php:952 ../../mod/settings.php:953
 #: ../../mod/settings.php:954 ../../mod/settings.php:955
-#: ../../mod/register.php:532 ../../mod/profiles.php:511
+#: ../../mod/register.php:511 ../../mod/profiles.php:511
 msgid "Yes"
 msgstr ""
 
@@ -341,22 +342,23 @@ msgstr ""
 #: ../../mod/settings.php:910 ../../mod/settings.php:916
 #: ../../mod/settings.php:952 ../../mod/settings.php:953
 #: ../../mod/settings.php:954 ../../mod/settings.php:955
-#: ../../mod/register.php:533 ../../mod/profiles.php:512
+#: ../../mod/register.php:512 ../../mod/profiles.php:512
 msgid "No"
 msgstr ""
 
-#: ../../mod/photos.php:43 ../../boot.php:1497
+#: ../../mod/photos.php:43 ../../boot.php:1517
 msgid "Photo Albums"
 msgstr ""
 
-#: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:879
-#: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1382
-#: ../../mod/photos.php:1394 ../../addon/communityhome/communityhome.php:110
+#: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:934
+#: ../../mod/photos.php:1005 ../../mod/photos.php:1020
+#: ../../mod/photos.php:1445 ../../mod/photos.php:1457
+#: ../../addon/communityhome/communityhome.php:110
 #: ../../view/theme/diabook/theme.php:593
 msgid "Contact Photos"
 msgstr ""
 
-#: ../../mod/photos.php:58 ../../mod/photos.php:975 ../../mod/photos.php:1424
+#: ../../mod/photos.php:58 ../../mod/photos.php:1030 ../../mod/photos.php:1494
 msgid "Upload New Photos"
 msgstr ""
 
@@ -368,9 +370,9 @@ msgstr ""
 msgid "Contact information unavailable"
 msgstr ""
 
-#: ../../mod/photos.php:151 ../../mod/photos.php:597 ../../mod/photos.php:950
-#: ../../mod/photos.php:965 ../../mod/register.php:335
-#: ../../mod/register.php:342 ../../mod/register.php:349
+#: ../../mod/photos.php:151 ../../mod/photos.php:652 ../../mod/photos.php:1005
+#: ../../mod/photos.php:1020 ../../mod/register.php:314
+#: ../../mod/register.php:321 ../../mod/register.php:328
 #: ../../mod/profile_photo.php:60 ../../mod/profile_photo.php:67
 #: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174
 #: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261
@@ -383,188 +385,192 @@ msgstr ""
 msgid "Album not found."
 msgstr ""
 
-#: ../../mod/photos.php:179 ../../mod/photos.php:959
+#: ../../mod/photos.php:179 ../../mod/photos.php:1014
 msgid "Delete Album"
 msgstr ""
 
-#: ../../mod/photos.php:242 ../../mod/photos.php:1194
+#: ../../mod/photos.php:242 ../../mod/photos.php:1257
 msgid "Delete Photo"
 msgstr ""
 
-#: ../../mod/photos.php:528
+#: ../../mod/photos.php:583
 msgid "was tagged in a"
 msgstr ""
 
-#: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70
+#: ../../mod/photos.php:583 ../../mod/like.php:127 ../../mod/tagger.php:70
 #: ../../addon/communityhome/communityhome.php:163
-#: ../../view/theme/diabook/theme.php:565 ../../include/text.php:1305
+#: ../../view/theme/diabook/theme.php:565 ../../include/text.php:1311
 #: ../../include/diaspora.php:1662 ../../include/conversation.php:53
 #: ../../include/conversation.php:126
 msgid "photo"
 msgstr ""
 
-#: ../../mod/photos.php:528
+#: ../../mod/photos.php:583
 msgid "by"
 msgstr ""
 
-#: ../../mod/photos.php:631 ../../addon/js_upload/js_upload.php:315
+#: ../../mod/photos.php:686 ../../addon/js_upload/js_upload.php:315
 msgid "Image exceeds size limit of "
 msgstr ""
 
-#: ../../mod/photos.php:639
+#: ../../mod/photos.php:694
 msgid "Image file is empty."
 msgstr ""
 
-#: ../../mod/photos.php:653 ../../mod/profile_photo.php:124
+#: ../../mod/photos.php:708 ../../mod/profile_photo.php:124
 #: ../../mod/wall_upload.php:83
 msgid "Unable to process image."
 msgstr ""
 
-#: ../../mod/photos.php:673 ../../mod/profile_photo.php:257
+#: ../../mod/photos.php:728 ../../mod/profile_photo.php:257
 #: ../../mod/wall_upload.php:102
 msgid "Image upload failed."
 msgstr ""
 
-#: ../../mod/photos.php:759 ../../mod/community.php:16
+#: ../../mod/photos.php:814 ../../mod/community.php:16
 #: ../../mod/dfrn_request.php:740 ../../mod/viewcontacts.php:17
 #: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29
 msgid "Public access denied."
 msgstr ""
 
-#: ../../mod/photos.php:769
+#: ../../mod/photos.php:824
 msgid "No photos selected"
 msgstr ""
 
-#: ../../mod/photos.php:846
+#: ../../mod/photos.php:901
 msgid "Access to this item is restricted."
 msgstr ""
 
-#: ../../mod/photos.php:907
+#: ../../mod/photos.php:962
 msgid "Upload Photos"
 msgstr ""
 
-#: ../../mod/photos.php:910 ../../mod/photos.php:954
+#: ../../mod/photos.php:965 ../../mod/photos.php:1009
 msgid "New album name: "
 msgstr ""
 
-#: ../../mod/photos.php:911
+#: ../../mod/photos.php:966
 msgid "or existing album name: "
 msgstr ""
 
-#: ../../mod/photos.php:912
+#: ../../mod/photos.php:967
 msgid "Do not show a status post for this upload"
 msgstr ""
 
-#: ../../mod/photos.php:914 ../../mod/photos.php:1189
+#: ../../mod/photos.php:969 ../../mod/photos.php:1252
 msgid "Permissions"
 msgstr ""
 
-#: ../../mod/photos.php:969
+#: ../../mod/photos.php:1024
 msgid "Edit Album"
 msgstr ""
 
-#: ../../mod/photos.php:984 ../../mod/photos.php:1407
+#: ../../mod/photos.php:1046 ../../mod/photos.php:1477
 msgid "View Photo"
 msgstr ""
 
-#: ../../mod/photos.php:1019
+#: ../../mod/photos.php:1081
 msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: ../../mod/photos.php:1021
+#: ../../mod/photos.php:1083
 msgid "Photo not available"
 msgstr ""
 
-#: ../../mod/photos.php:1071
+#: ../../mod/photos.php:1133
 msgid "View photo"
 msgstr ""
 
-#: ../../mod/photos.php:1071
+#: ../../mod/photos.php:1133
 msgid "Edit photo"
 msgstr ""
 
-#: ../../mod/photos.php:1072
+#: ../../mod/photos.php:1134
 msgid "Use as profile photo"
 msgstr ""
 
-#: ../../mod/photos.php:1078 ../../include/conversation.php:483
+#: ../../mod/photos.php:1140 ../../include/conversation.php:484
 msgid "Private Message"
 msgstr ""
 
-#: ../../mod/photos.php:1100
+#: ../../mod/photos.php:1162
 msgid "View Full Size"
 msgstr ""
 
-#: ../../mod/photos.php:1168
+#: ../../mod/photos.php:1230
 msgid "Tags: "
 msgstr ""
 
-#: ../../mod/photos.php:1171
+#: ../../mod/photos.php:1233
 msgid "[Remove any tag]"
 msgstr ""
 
-#: ../../mod/photos.php:1182
+#: ../../mod/photos.php:1243
+msgid "Rotate CW"
+msgstr ""
+
+#: ../../mod/photos.php:1245
 msgid "New album name"
 msgstr ""
 
-#: ../../mod/photos.php:1185
+#: ../../mod/photos.php:1248
 msgid "Caption"
 msgstr ""
 
-#: ../../mod/photos.php:1187
+#: ../../mod/photos.php:1250
 msgid "Add a Tag"
 msgstr ""
 
-#: ../../mod/photos.php:1191
+#: ../../mod/photos.php:1254
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: ../../mod/photos.php:1211 ../../include/conversation.php:532
+#: ../../mod/photos.php:1274 ../../include/conversation.php:533
 msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1212 ../../include/conversation.php:533
+#: ../../mod/photos.php:1275 ../../include/conversation.php:534
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1213 ../../include/conversation.php:967
+#: ../../mod/photos.php:1276 ../../include/conversation.php:968
 msgid "Share"
 msgstr ""
 
-#: ../../mod/photos.php:1214 ../../mod/editpost.php:104
+#: ../../mod/photos.php:1277 ../../mod/editpost.php:104
 #: ../../mod/wallmessage.php:145 ../../mod/message.php:214
-#: ../../mod/message.php:408 ../../include/conversation.php:364
-#: ../../include/conversation.php:709 ../../include/conversation.php:986
+#: ../../mod/message.php:408 ../../include/conversation.php:365
+#: ../../include/conversation.php:710 ../../include/conversation.php:987
 msgid "Please wait"
 msgstr ""
 
-#: ../../mod/photos.php:1230 ../../mod/photos.php:1270
-#: ../../mod/photos.php:1301 ../../include/conversation.php:555
+#: ../../mod/photos.php:1293 ../../mod/photos.php:1333
+#: ../../mod/photos.php:1364 ../../include/conversation.php:556
 msgid "This is you"
 msgstr ""
 
-#: ../../mod/photos.php:1232 ../../mod/photos.php:1272
-#: ../../mod/photos.php:1303 ../../include/conversation.php:557
-#: ../../boot.php:516
+#: ../../mod/photos.php:1295 ../../mod/photos.php:1335
+#: ../../mod/photos.php:1366 ../../include/conversation.php:558
+#: ../../boot.php:517
 msgid "Comment"
 msgstr ""
 
-#: ../../mod/photos.php:1234 ../../mod/editpost.php:125
-#: ../../include/conversation.php:567 ../../include/conversation.php:1004
+#: ../../mod/photos.php:1297 ../../mod/editpost.php:125
+#: ../../include/conversation.php:568 ../../include/conversation.php:1005
 msgid "Preview"
 msgstr ""
 
-#: ../../mod/photos.php:1331 ../../mod/settings.php:616
-#: ../../mod/settings.php:697 ../../mod/group.php:168 ../../mod/admin.php:647
-#: ../../include/conversation.php:321 ../../include/conversation.php:587
+#: ../../mod/photos.php:1394 ../../mod/settings.php:616
+#: ../../mod/settings.php:697 ../../mod/group.php:168 ../../mod/admin.php:660
+#: ../../include/conversation.php:322 ../../include/conversation.php:588
 msgid "Delete"
 msgstr ""
 
-#: ../../mod/photos.php:1413
+#: ../../mod/photos.php:1483
 msgid "View Album"
 msgstr ""
 
-#: ../../mod/photos.php:1422
+#: ../../mod/photos.php:1492
 msgid "Recent Photos"
 msgstr ""
 
@@ -577,7 +583,7 @@ msgstr ""
 msgid "Community"
 msgstr ""
 
-#: ../../mod/community.php:61 ../../mod/search.php:128
+#: ../../mod/community.php:61 ../../mod/search.php:138
 msgid "No results."
 msgstr ""
 
@@ -621,28 +627,28 @@ msgstr ""
 msgid "Edit post"
 msgstr ""
 
-#: ../../mod/editpost.php:80 ../../include/conversation.php:953
+#: ../../mod/editpost.php:80 ../../include/conversation.php:954
 msgid "Post to Email"
 msgstr ""
 
 #: ../../mod/editpost.php:95 ../../mod/settings.php:615
-#: ../../include/conversation.php:574
+#: ../../include/conversation.php:575
 msgid "Edit"
 msgstr ""
 
 #: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143
 #: ../../mod/message.php:212 ../../mod/message.php:406
-#: ../../include/conversation.php:968
+#: ../../include/conversation.php:969
 msgid "Upload photo"
 msgstr ""
 
-#: ../../mod/editpost.php:97 ../../include/conversation.php:970
+#: ../../mod/editpost.php:97 ../../include/conversation.php:971
 msgid "Attach file"
 msgstr ""
 
 #: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144
 #: ../../mod/message.php:213 ../../mod/message.php:407
-#: ../../include/conversation.php:972
+#: ../../include/conversation.php:973
 msgid "Insert web link"
 msgstr ""
 
@@ -658,35 +664,35 @@ msgstr ""
 msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../mod/editpost.php:102 ../../include/conversation.php:978
+#: ../../mod/editpost.php:102 ../../include/conversation.php:979
 msgid "Set your location"
 msgstr ""
 
-#: ../../mod/editpost.php:103 ../../include/conversation.php:980
+#: ../../mod/editpost.php:103 ../../include/conversation.php:981
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:987
+#: ../../mod/editpost.php:105 ../../include/conversation.php:988
 msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:996
+#: ../../mod/editpost.php:113 ../../include/conversation.php:997
 msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/editpost.php:114 ../../include/conversation.php:997
+#: ../../mod/editpost.php:114 ../../include/conversation.php:998
 msgid "Public post"
 msgstr ""
 
-#: ../../mod/editpost.php:117 ../../include/conversation.php:983
+#: ../../mod/editpost.php:117 ../../include/conversation.php:984
 msgid "Set title"
 msgstr ""
 
-#: ../../mod/editpost.php:119 ../../include/conversation.php:985
+#: ../../mod/editpost.php:119 ../../include/conversation.php:986
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../mod/editpost.php:120 ../../include/conversation.php:999
+#: ../../mod/editpost.php:120 ../../include/conversation.php:1000
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
@@ -875,20 +881,15 @@ msgstr ""
 msgid "Submit Request"
 msgstr ""
 
-#: ../../mod/install.php:111
+#: ../../mod/install.php:117
 msgid "Friendica Social Communications Server - Setup"
 msgstr ""
 
-#: ../../mod/install.php:117 ../../mod/install.php:157
-#: ../../mod/install.php:230
-msgid "Database connection"
-msgstr ""
-
-#: ../../mod/install.php:124
+#: ../../mod/install.php:123
 msgid "Could not connect to database."
 msgstr ""
 
-#: ../../mod/install.php:128
+#: ../../mod/install.php:127
 msgid "Could not create table."
 msgstr ""
 
@@ -896,229 +897,234 @@ msgstr ""
 msgid "Your Friendica site database has been installed."
 msgstr ""
 
-#: ../../mod/install.php:134
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
-msgstr ""
-
-#: ../../mod/install.php:135 ../../mod/install.php:151
-#: ../../mod/install.php:209
-msgid "Please see the file \"INSTALL.txt\"."
-msgstr ""
-
-#: ../../mod/install.php:137
-msgid "Proceed to registration"
-msgstr ""
-
-#: ../../mod/install.php:143
-msgid "Proceed with Installation"
-msgstr ""
-
-#: ../../mod/install.php:150
+#: ../../mod/install.php:138
 msgid ""
 "You may need to import the file \"database.sql\" manually using phpmyadmin "
 "or mysql."
 msgstr ""
 
-#: ../../mod/install.php:158
-msgid "Database import failed."
+#: ../../mod/install.php:139 ../../mod/install.php:203
+#: ../../mod/install.php:480
+msgid "Please see the file \"INSTALL.txt\"."
 msgstr ""
 
-#: ../../mod/install.php:206
+#: ../../mod/install.php:200
 msgid "System check"
 msgstr ""
 
-#: ../../mod/install.php:211
+#: ../../mod/install.php:205
 msgid "Check again"
 msgstr ""
 
-#: ../../mod/install.php:231
+#: ../../mod/install.php:224
+msgid "Database connection"
+msgstr ""
+
+#: ../../mod/install.php:225
 msgid ""
 "In order to install Friendica we need to know how to connect to your "
 "database."
 msgstr ""
 
-#: ../../mod/install.php:232
+#: ../../mod/install.php:226
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
 msgstr ""
 
-#: ../../mod/install.php:233
+#: ../../mod/install.php:227
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
 msgstr ""
 
-#: ../../mod/install.php:237
+#: ../../mod/install.php:231
 msgid "Database Server Name"
 msgstr ""
 
-#: ../../mod/install.php:238
+#: ../../mod/install.php:232
 msgid "Database Login Name"
 msgstr ""
 
-#: ../../mod/install.php:239
+#: ../../mod/install.php:233
 msgid "Database Login Password"
 msgstr ""
 
-#: ../../mod/install.php:240
+#: ../../mod/install.php:234
 msgid "Database Name"
 msgstr ""
 
-#: ../../mod/install.php:241 ../../mod/install.php:280
+#: ../../mod/install.php:235 ../../mod/install.php:274
 msgid "Site administrator email address"
 msgstr ""
 
-#: ../../mod/install.php:241 ../../mod/install.php:280
+#: ../../mod/install.php:235 ../../mod/install.php:274
 msgid ""
 "Your account email address must match this in order to use the web admin "
 "panel."
 msgstr ""
 
-#: ../../mod/install.php:245 ../../mod/install.php:283
+#: ../../mod/install.php:239 ../../mod/install.php:277
 msgid "Please select a default timezone for your website"
 msgstr ""
 
-#: ../../mod/install.php:270
+#: ../../mod/install.php:264
 msgid "Site settings"
 msgstr ""
 
-#: ../../mod/install.php:323
+#: ../../mod/install.php:317
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 
-#: ../../mod/install.php:326
+#: ../../mod/install.php:320
 msgid "PHP executable path"
 msgstr ""
 
-#: ../../mod/install.php:326
+#: ../../mod/install.php:320
 msgid "Enter full path to php executable"
 msgstr ""
 
-#: ../../mod/install.php:331
+#: ../../mod/install.php:325
 msgid "Command line PHP"
 msgstr ""
 
-#: ../../mod/install.php:340
+#: ../../mod/install.php:334
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr ""
 
-#: ../../mod/install.php:341
+#: ../../mod/install.php:335
 msgid "This is required for message delivery to work."
 msgstr ""
 
-#: ../../mod/install.php:343
+#: ../../mod/install.php:337
 msgid "PHP register_argc_argv"
 msgstr ""
 
-#: ../../mod/install.php:364
+#: ../../mod/install.php:358
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr ""
 
-#: ../../mod/install.php:365
+#: ../../mod/install.php:359
 msgid ""
 "If running under Windows, please see \"http://www.php.net/manual/en/openssl."
 "installation.php\"."
 msgstr ""
 
-#: ../../mod/install.php:367
+#: ../../mod/install.php:361
 msgid "Generate encryption keys"
 msgstr ""
 
-#: ../../mod/install.php:374
+#: ../../mod/install.php:368
 msgid "libCurl PHP module"
 msgstr ""
 
-#: ../../mod/install.php:375
+#: ../../mod/install.php:369
 msgid "GD graphics PHP module"
 msgstr ""
 
-#: ../../mod/install.php:376
+#: ../../mod/install.php:370
 msgid "OpenSSL PHP module"
 msgstr ""
 
-#: ../../mod/install.php:377
+#: ../../mod/install.php:371
 msgid "mysqli PHP module"
 msgstr ""
 
-#: ../../mod/install.php:378
+#: ../../mod/install.php:372
 msgid "mb_string PHP module"
 msgstr ""
 
-#: ../../mod/install.php:383 ../../mod/install.php:385
+#: ../../mod/install.php:377 ../../mod/install.php:379
 msgid "Apache mod_rewrite module"
 msgstr ""
 
-#: ../../mod/install.php:383
+#: ../../mod/install.php:377
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: ../../mod/install.php:390
+#: ../../mod/install.php:384
 msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/install.php:394
+#: ../../mod/install.php:388
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: ../../mod/install.php:398
+#: ../../mod/install.php:392
 msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/install.php:402
+#: ../../mod/install.php:396
 msgid "Error: mysqli PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/install.php:406
+#: ../../mod/install.php:400
 msgid "Error: mb_string PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/install.php:423
+#: ../../mod/install.php:417
 msgid ""
 "The web installer needs to be able to create a file called \".htconfig.php\" "
 "in the top folder of your web server and it is unable to do so."
 msgstr ""
 
-#: ../../mod/install.php:424
+#: ../../mod/install.php:418
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
 msgstr ""
 
-#: ../../mod/install.php:425
+#: ../../mod/install.php:419
 msgid ""
-"Please check with your site documentation or support people to see if this "
-"situation can be corrected."
+"At the end of this procedure, we will give you a text to save in a file "
+"named .htconfig.php in your Friendica top folder."
 msgstr ""
 
-#: ../../mod/install.php:426
+#: ../../mod/install.php:420
 msgid ""
-"If not, you may be required to perform a manual installation. Please see the "
-"file \"INSTALL.txt\" for instructions."
+"You can alternatively skip this procedure and perform a manual installation. "
+"Please see the file \"INSTALL.txt\" for instructions."
 msgstr ""
 
-#: ../../mod/install.php:429
+#: ../../mod/install.php:423
 msgid ".htconfig.php is writable"
 msgstr ""
 
+#: ../../mod/install.php:434
+msgid ""
+"Url rewrite in .htconfig is not working. Check your server configuration."
+msgstr ""
+
 #: ../../mod/install.php:436
+msgid "Url rewrite is working"
+msgstr ""
+
+#: ../../mod/install.php:442
 msgid ""
 "The database configuration file \".htconfig.php\" could not be written. "
 "Please use the enclosed text to create a configuration file in your web "
 "server root."
 msgstr ""
 
-#: ../../mod/install.php:461
+#: ../../mod/install.php:467
 msgid "Errors encountered creating database tables."
 msgstr ""
 
+#: ../../mod/install.php:478
+msgid "<h1>What next</h1>"
+msgstr ""
+
+#: ../../mod/install.php:479
+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:238
 msgid "l F d, Y \\@ g:i A"
@@ -1166,11 +1172,11 @@ msgid "is interested in:"
 msgstr ""
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1046
+#: ../../include/contact_widgets.php:9 ../../boot.php:1047
 msgid "Connect"
 msgstr ""
 
-#: ../../mod/match.php:65 ../../mod/dirfind.php:57
+#: ../../mod/match.php:65 ../../mod/dirfind.php:60
 msgid "No matches"
 msgstr ""
 
@@ -1210,7 +1216,7 @@ msgstr ""
 msgid "Network"
 msgstr ""
 
-#: ../../mod/notifications.php:85 ../../mod/network.php:184
+#: ../../mod/notifications.php:85 ../../mod/network.php:188
 msgid "Personal"
 msgstr ""
 
@@ -1263,7 +1269,7 @@ msgid "if applicable"
 msgstr ""
 
 #: ../../mod/notifications.php:157 ../../mod/notifications.php:204
-#: ../../mod/admin.php:645
+#: ../../mod/admin.php:658
 msgid "Approve"
 msgstr ""
 
@@ -1464,12 +1470,12 @@ msgid "View all contacts"
 msgstr ""
 
 #: ../../mod/contacts.php:290 ../../mod/contacts.php:347
-#: ../../mod/admin.php:649
+#: ../../mod/admin.php:662
 msgid "Unblock"
 msgstr ""
 
 #: ../../mod/contacts.php:290 ../../mod/contacts.php:347
-#: ../../mod/admin.php:648
+#: ../../mod/admin.php:661
 msgid "Block"
 msgstr ""
 
@@ -1562,7 +1568,7 @@ msgstr ""
 msgid "Update public posts"
 msgstr ""
 
-#: ../../mod/contacts.php:344 ../../mod/admin.php:1120
+#: ../../mod/contacts.php:344 ../../mod/admin.php:1133
 msgid "Update now"
 msgstr ""
 
@@ -1687,12 +1693,13 @@ msgid "Password reset requested at %s"
 msgstr ""
 
 #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
-#: ../../mod/register.php:388 ../../mod/register.php:442
-#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752
+#: ../../mod/register.php:367 ../../mod/register.php:421
+#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:745
 #: ../../addon/facebook/facebook.php:688
 #: ../../addon/facebook/facebook.php:1178
-#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2738
-#: ../../boot.php:696
+#: ../../addon/public_server/public_server.php:62
+#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2738
+#: ../../boot.php:697
 msgid "Administrator"
 msgstr ""
 
@@ -1702,7 +1709,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:83 ../../boot.php:828
+#: ../../mod/lostpass.php:83 ../../boot.php:829
 msgid "Password Reset"
 msgstr ""
 
@@ -1774,7 +1781,7 @@ msgstr ""
 msgid "Remove account"
 msgstr ""
 
-#: ../../mod/settings.php:88 ../../mod/admin.php:735 ../../mod/admin.php:940
+#: ../../mod/settings.php:88 ../../mod/admin.php:748 ../../mod/admin.php:953
 #: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:638
 #: ../../view/theme/diabook/theme.php:768 ../../include/nav.php:137
 msgid "Settings"
@@ -2010,7 +2017,7 @@ msgstr ""
 msgid "Don't show emoticons"
 msgstr ""
 
-#: ../../mod/settings.php:835 ../../mod/admin.php:180 ../../mod/admin.php:621
+#: ../../mod/settings.php:835 ../../mod/admin.php:180 ../../mod/admin.php:634
 msgid "Normal Account"
 msgstr ""
 
@@ -2018,7 +2025,7 @@ msgstr ""
 msgid "This account is a normal personal profile"
 msgstr ""
 
-#: ../../mod/settings.php:839 ../../mod/admin.php:181 ../../mod/admin.php:622
+#: ../../mod/settings.php:839 ../../mod/admin.php:181 ../../mod/admin.php:635
 msgid "Soapbox Account"
 msgstr ""
 
@@ -2026,7 +2033,7 @@ msgstr ""
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr ""
 
-#: ../../mod/settings.php:843 ../../mod/admin.php:182 ../../mod/admin.php:623
+#: ../../mod/settings.php:843 ../../mod/admin.php:182 ../../mod/admin.php:636
 msgid "Community/Celebrity Account"
 msgstr ""
 
@@ -2034,7 +2041,7 @@ msgstr ""
 msgid "Automatically approve all connection/friend requests as read-write fans"
 msgstr ""
 
-#: ../../mod/settings.php:847 ../../mod/admin.php:183 ../../mod/admin.php:624
+#: ../../mod/settings.php:847 ../../mod/admin.php:183 ../../mod/admin.php:637
 msgid "Automatic Friend Account"
 msgstr ""
 
@@ -2288,51 +2295,51 @@ msgstr ""
 msgid "add"
 msgstr ""
 
-#: ../../mod/network.php:171
+#: ../../mod/network.php:175
 msgid "Commented Order"
 msgstr ""
 
-#: ../../mod/network.php:174
+#: ../../mod/network.php:178
 msgid "Sort by Comment Date"
 msgstr ""
 
-#: ../../mod/network.php:177
+#: ../../mod/network.php:181
 msgid "Posted Order"
 msgstr ""
 
-#: ../../mod/network.php:180
+#: ../../mod/network.php:184
 msgid "Sort by Post Date"
 msgstr ""
 
-#: ../../mod/network.php:187
+#: ../../mod/network.php:191
 msgid "Posts that mention or involve you"
 msgstr ""
 
-#: ../../mod/network.php:190
+#: ../../mod/network.php:194
 msgid "New"
 msgstr ""
 
-#: ../../mod/network.php:193
+#: ../../mod/network.php:197
 msgid "Activity Stream - by date"
 msgstr ""
 
-#: ../../mod/network.php:196
+#: ../../mod/network.php:200
 msgid "Starred"
 msgstr ""
 
-#: ../../mod/network.php:199
+#: ../../mod/network.php:203
 msgid "Favourite Posts"
 msgstr ""
 
-#: ../../mod/network.php:202
+#: ../../mod/network.php:206
 msgid "Shared Links"
 msgstr ""
 
-#: ../../mod/network.php:205
+#: ../../mod/network.php:209
 msgid "Interesting Links"
 msgstr ""
 
-#: ../../mod/network.php:281
+#: ../../mod/network.php:285
 #, php-format
 msgid "Warning: This group contains %s member from an insecure network."
 msgid_plural ""
@@ -2340,41 +2347,41 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/network.php:284
+#: ../../mod/network.php:288
 msgid "Private messages to this group are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/network.php:329
+#: ../../mod/network.php:333
 msgid "No such group"
 msgstr ""
 
-#: ../../mod/network.php:340
+#: ../../mod/network.php:344
 msgid "Group is empty"
 msgstr ""
 
-#: ../../mod/network.php:344
+#: ../../mod/network.php:348
 msgid "Group: "
 msgstr ""
 
-#: ../../mod/network.php:354
+#: ../../mod/network.php:358
 msgid "Contact: "
 msgstr ""
 
-#: ../../mod/network.php:356
+#: ../../mod/network.php:360
 msgid "Private messages to this person are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/network.php:361
+#: ../../mod/network.php:365
 msgid "Invalid contact."
 msgstr ""
 
-#: ../../mod/notes.php:44 ../../boot.php:1509
+#: ../../mod/notes.php:44 ../../boot.php:1529
 msgid "Personal Notes"
 msgstr ""
 
 #: ../../mod/notes.php:63 ../../mod/filer.php:30
 #: ../../addon/facebook/facebook.php:756
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:147
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:150
 #: ../../include/text.php:652
 msgid "Save"
 msgstr ""
@@ -2409,7 +2416,7 @@ msgid "No recipient."
 msgstr ""
 
 #: ../../mod/wallmessage.php:124 ../../mod/message.php:171
-#: ../../include/conversation.php:921
+#: ../../include/conversation.php:922
 msgid "Please enter a link URL:"
 msgstr ""
 
@@ -2619,7 +2626,7 @@ msgstr ""
 
 #: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:123
 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74
-#: ../../include/nav.php:50 ../../boot.php:1488
+#: ../../include/nav.php:50 ../../boot.php:1508
 msgid "Profile"
 msgstr ""
 
@@ -2685,7 +2692,7 @@ msgid ""
 "must also begin with a letter."
 msgstr ""
 
-#: ../../mod/register.php:153 ../../mod/register.php:264
+#: ../../mod/register.php:153 ../../mod/register.php:243
 msgid "Nickname is already registered. Please choose another."
 msgstr ""
 
@@ -2695,107 +2702,107 @@ msgid ""
 "another."
 msgstr ""
 
-#: ../../mod/register.php:182
+#: ../../mod/register.php:179
 msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr ""
 
-#: ../../mod/register.php:250
+#: ../../mod/register.php:229
 msgid "An error occurred during registration. Please try again."
 msgstr ""
 
-#: ../../mod/register.php:286
+#: ../../mod/register.php:265
 msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
 
-#: ../../mod/register.php:386 ../../mod/regmod.php:52
+#: ../../mod/register.php:365 ../../mod/regmod.php:52
 #, php-format
 msgid "Registration details for %s"
 msgstr ""
 
-#: ../../mod/register.php:394
+#: ../../mod/register.php:373
 msgid ""
 "Registration successful. Please check your email for further instructions."
 msgstr ""
 
-#: ../../mod/register.php:398
+#: ../../mod/register.php:377
 msgid "Failed to send email message. Here is the message that failed."
 msgstr ""
 
-#: ../../mod/register.php:403
+#: ../../mod/register.php:382
 msgid "Your registration can not be processed."
 msgstr ""
 
-#: ../../mod/register.php:440
+#: ../../mod/register.php:419
 #, php-format
 msgid "Registration request at %s"
 msgstr ""
 
-#: ../../mod/register.php:449
+#: ../../mod/register.php:428
 msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: ../../mod/register.php:487
+#: ../../mod/register.php:466
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr ""
 
-#: ../../mod/register.php:513
+#: ../../mod/register.php:492
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
 msgstr ""
 
-#: ../../mod/register.php:514
+#: ../../mod/register.php:493
 msgid ""
 "If you are not familiar with OpenID, please leave that field blank and fill "
 "in the rest of the items."
 msgstr ""
 
-#: ../../mod/register.php:515
+#: ../../mod/register.php:494
 msgid "Your OpenID (optional): "
 msgstr ""
 
-#: ../../mod/register.php:529
+#: ../../mod/register.php:508
 msgid "Include your profile in member directory?"
 msgstr ""
 
-#: ../../mod/register.php:549
+#: ../../mod/register.php:528
 msgid "Membership on this site is by invitation only."
 msgstr ""
 
-#: ../../mod/register.php:550
+#: ../../mod/register.php:529
 msgid "Your invitation ID: "
 msgstr ""
 
-#: ../../mod/register.php:553 ../../mod/admin.php:405
+#: ../../mod/register.php:532 ../../mod/admin.php:418
 msgid "Registration"
 msgstr ""
 
-#: ../../mod/register.php:561
+#: ../../mod/register.php:540
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr ""
 
-#: ../../mod/register.php:562
+#: ../../mod/register.php:541
 msgid "Your Email Address: "
 msgstr ""
 
-#: ../../mod/register.php:563
+#: ../../mod/register.php:542
 msgid ""
 "Choose a profile nickname. This must begin with a text character. Your "
 "profile address on this site will then be '<strong>nickname@$sitename</"
 "strong>'."
 msgstr ""
 
-#: ../../mod/register.php:564
+#: ../../mod/register.php:543
 msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/register.php:567 ../../include/nav.php:81 ../../boot.php:794
+#: ../../mod/register.php:546 ../../include/nav.php:81 ../../boot.php:795
 msgid "Register"
 msgstr ""
 
-#: ../../mod/dirfind.php:23
+#: ../../mod/dirfind.php:26
 msgid "People Search"
 msgstr ""
 
@@ -2824,7 +2831,7 @@ msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:156
-#: ../../mod/admin.php:684 ../../mod/admin.php:883 ../../mod/display.php:37
+#: ../../mod/admin.php:697 ../../mod/admin.php:896 ../../mod/display.php:37
 #: ../../mod/display.php:142 ../../include/items.php:3096
 msgid "Item not found."
 msgstr ""
@@ -2834,7 +2841,7 @@ msgid "Access denied."
 msgstr ""
 
 #: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:125
-#: ../../include/nav.php:51 ../../boot.php:1494
+#: ../../include/nav.php:51 ../../boot.php:1514
 msgid "Photos"
 msgstr ""
 
@@ -2859,38 +2866,38 @@ msgstr ""
 msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../mod/item.php:249
+#: ../../mod/item.php:258
 msgid "Empty post discarded."
 msgstr ""
 
-#: ../../mod/item.php:372 ../../mod/wall_upload.php:99
+#: ../../mod/item.php:377 ../../mod/wall_upload.php:99
 #: ../../mod/wall_upload.php:108 ../../mod/wall_upload.php:115
 #: ../../include/message.php:144
 msgid "Wall Photos"
 msgstr ""
 
-#: ../../mod/item.php:781
+#: ../../mod/item.php:786
 msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/item.php:806
+#: ../../mod/item.php:811
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social network."
 msgstr ""
 
-#: ../../mod/item.php:808
+#: ../../mod/item.php:813
 #, php-format
 msgid "You may visit them online at %s"
 msgstr ""
 
-#: ../../mod/item.php:809
+#: ../../mod/item.php:814
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr ""
 
-#: ../../mod/item.php:811
+#: ../../mod/item.php:816
 #, php-format
 msgid "%s posted an update."
 msgstr ""
@@ -3055,19 +3062,19 @@ msgstr ""
 msgid "Theme settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:96 ../../mod/admin.php:403
+#: ../../mod/admin.php:96 ../../mod/admin.php:416
 msgid "Site"
 msgstr ""
 
-#: ../../mod/admin.php:97 ../../mod/admin.php:639 ../../mod/admin.php:651
+#: ../../mod/admin.php:97 ../../mod/admin.php:652 ../../mod/admin.php:664
 msgid "Users"
 msgstr ""
 
-#: ../../mod/admin.php:98 ../../mod/admin.php:733 ../../mod/admin.php:775
+#: ../../mod/admin.php:98 ../../mod/admin.php:746 ../../mod/admin.php:788
 msgid "Plugins"
 msgstr ""
 
-#: ../../mod/admin.php:99 ../../mod/admin.php:938 ../../mod/admin.php:974
+#: ../../mod/admin.php:99 ../../mod/admin.php:951 ../../mod/admin.php:987
 msgid "Themes"
 msgstr ""
 
@@ -3079,7 +3086,7 @@ msgstr ""
 msgid "Software Update"
 msgstr ""
 
-#: ../../mod/admin.php:115 ../../mod/admin.php:1061
+#: ../../mod/admin.php:115 ../../mod/admin.php:1074
 msgid "Logs"
 msgstr ""
 
@@ -3087,533 +3094,537 @@ msgstr ""
 msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: ../../mod/admin.php:195 ../../mod/admin.php:402 ../../mod/admin.php:638
-#: ../../mod/admin.php:732 ../../mod/admin.php:774 ../../mod/admin.php:937
-#: ../../mod/admin.php:973 ../../mod/admin.php:1060
+#: ../../mod/admin.php:202
+msgid "Message queues"
+msgstr ""
+
+#: ../../mod/admin.php:207 ../../mod/admin.php:415 ../../mod/admin.php:651
+#: ../../mod/admin.php:745 ../../mod/admin.php:787 ../../mod/admin.php:950
+#: ../../mod/admin.php:986 ../../mod/admin.php:1073
 msgid "Administration"
 msgstr ""
 
-#: ../../mod/admin.php:196
+#: ../../mod/admin.php:208
 msgid "Summary"
 msgstr ""
 
-#: ../../mod/admin.php:197
+#: ../../mod/admin.php:210
 msgid "Registered users"
 msgstr ""
 
-#: ../../mod/admin.php:199
+#: ../../mod/admin.php:212
 msgid "Pending registrations"
 msgstr ""
 
-#: ../../mod/admin.php:200
+#: ../../mod/admin.php:213
 msgid "Version"
 msgstr ""
 
-#: ../../mod/admin.php:202
+#: ../../mod/admin.php:215
 msgid "Active plugins"
 msgstr ""
 
-#: ../../mod/admin.php:341
+#: ../../mod/admin.php:354
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:389
+#: ../../mod/admin.php:402
 msgid "Closed"
 msgstr ""
 
-#: ../../mod/admin.php:390
+#: ../../mod/admin.php:403
 msgid "Requires approval"
 msgstr ""
 
-#: ../../mod/admin.php:391
+#: ../../mod/admin.php:404
 msgid "Open"
 msgstr ""
 
-#: ../../mod/admin.php:395
+#: ../../mod/admin.php:408
 msgid "No SSL policy, links will track page SSL state"
 msgstr ""
 
-#: ../../mod/admin.php:396
+#: ../../mod/admin.php:409
 msgid "Force all links to use SSL"
 msgstr ""
 
-#: ../../mod/admin.php:397
+#: ../../mod/admin.php:410
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr ""
 
-#: ../../mod/admin.php:406
+#: ../../mod/admin.php:419
 msgid "File upload"
 msgstr ""
 
-#: ../../mod/admin.php:407
+#: ../../mod/admin.php:420
 msgid "Policies"
 msgstr ""
 
-#: ../../mod/admin.php:408
+#: ../../mod/admin.php:421
 msgid "Advanced"
 msgstr ""
 
-#: ../../mod/admin.php:412 ../../addon/statusnet/statusnet.php:552
+#: ../../mod/admin.php:425 ../../addon/statusnet/statusnet.php:552
 msgid "Site name"
 msgstr ""
 
-#: ../../mod/admin.php:413
+#: ../../mod/admin.php:426
 msgid "Banner/Logo"
 msgstr ""
 
-#: ../../mod/admin.php:414
+#: ../../mod/admin.php:427
 msgid "System language"
 msgstr ""
 
-#: ../../mod/admin.php:415
+#: ../../mod/admin.php:428
 msgid "System theme"
 msgstr ""
 
-#: ../../mod/admin.php:415
+#: ../../mod/admin.php:428
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr ""
 
-#: ../../mod/admin.php:416
+#: ../../mod/admin.php:429
 msgid "SSL link policy"
 msgstr ""
 
-#: ../../mod/admin.php:416
+#: ../../mod/admin.php:429
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr ""
 
-#: ../../mod/admin.php:417
+#: ../../mod/admin.php:430
 msgid "Maximum image size"
 msgstr ""
 
-#: ../../mod/admin.php:417
+#: ../../mod/admin.php:430
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
-#: ../../mod/admin.php:419
+#: ../../mod/admin.php:432
 msgid "Register policy"
 msgstr ""
 
-#: ../../mod/admin.php:420
+#: ../../mod/admin.php:433
 msgid "Register text"
 msgstr ""
 
-#: ../../mod/admin.php:420
+#: ../../mod/admin.php:433
 msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: ../../mod/admin.php:421
+#: ../../mod/admin.php:434
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: ../../mod/admin.php:421
+#: ../../mod/admin.php:434
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: ../../mod/admin.php:422
+#: ../../mod/admin.php:435
 msgid "Allowed friend domains"
 msgstr ""
 
-#: ../../mod/admin.php:422
+#: ../../mod/admin.php:435
 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:423
+#: ../../mod/admin.php:436
 msgid "Allowed email domains"
 msgstr ""
 
-#: ../../mod/admin.php:423
+#: ../../mod/admin.php:436
 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:424
+#: ../../mod/admin.php:437
 msgid "Block public"
 msgstr ""
 
-#: ../../mod/admin.php:424
+#: ../../mod/admin.php:437
 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:425
+#: ../../mod/admin.php:438
 msgid "Force publish"
 msgstr ""
 
-#: ../../mod/admin.php:425
+#: ../../mod/admin.php:438
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: ../../mod/admin.php:426
+#: ../../mod/admin.php:439
 msgid "Global directory update URL"
 msgstr ""
 
-#: ../../mod/admin.php:426
+#: ../../mod/admin.php:439
 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:428
+#: ../../mod/admin.php:441
 msgid "Block multiple registrations"
 msgstr ""
 
-#: ../../mod/admin.php:428
+#: ../../mod/admin.php:441
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr ""
 
-#: ../../mod/admin.php:429
+#: ../../mod/admin.php:442
 msgid "OpenID support"
 msgstr ""
 
-#: ../../mod/admin.php:429
+#: ../../mod/admin.php:442
 msgid "OpenID support for registration and logins."
 msgstr ""
 
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:443
 msgid "Fullname check"
 msgstr ""
 
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:443
 msgid ""
 "Force users to register with a space between firstname and lastname in Full "
 "name, as an antispam measure"
 msgstr ""
 
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:444
 msgid "UTF-8 Regular expressions"
 msgstr ""
 
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:444
 msgid "Use PHP UTF8 regular expressions"
 msgstr ""
 
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:445
 msgid "Show Community Page"
 msgstr ""
 
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:445
 msgid ""
 "Display a Community page showing all recent public postings on this site."
 msgstr ""
 
-#: ../../mod/admin.php:433
+#: ../../mod/admin.php:446
 msgid "Enable OStatus support"
 msgstr ""
 
-#: ../../mod/admin.php:433
+#: ../../mod/admin.php:446
 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:434
+#: ../../mod/admin.php:447
 msgid "Enable Diaspora support"
 msgstr ""
 
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:447
 msgid "Provide built-in Diaspora network compatibility."
 msgstr ""
 
-#: ../../mod/admin.php:435
+#: ../../mod/admin.php:448
 msgid "Only allow Friendica contacts"
 msgstr ""
 
-#: ../../mod/admin.php:435
+#: ../../mod/admin.php:448
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr ""
 
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:449
 msgid "Verify SSL"
 msgstr ""
 
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:449
 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:437
+#: ../../mod/admin.php:450
 msgid "Proxy user"
 msgstr ""
 
-#: ../../mod/admin.php:438
+#: ../../mod/admin.php:451
 msgid "Proxy URL"
 msgstr ""
 
-#: ../../mod/admin.php:439
+#: ../../mod/admin.php:452
 msgid "Network timeout"
 msgstr ""
 
-#: ../../mod/admin.php:439
+#: ../../mod/admin.php:452
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: ../../mod/admin.php:440
+#: ../../mod/admin.php:453
 msgid "Delivery interval"
 msgstr ""
 
-#: ../../mod/admin.php:440
+#: ../../mod/admin.php:453
 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:441
+#: ../../mod/admin.php:454
 msgid "Poll interval"
 msgstr ""
 
-#: ../../mod/admin.php:441
+#: ../../mod/admin.php:454
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr ""
 
-#: ../../mod/admin.php:442
+#: ../../mod/admin.php:455
 msgid "Maximum Load Average"
 msgstr ""
 
-#: ../../mod/admin.php:442
+#: ../../mod/admin.php:455
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr ""
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:469
 msgid "Update has been marked successful"
 msgstr ""
 
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:479
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr ""
 
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:482
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr ""
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:486
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:489
 #, php-format
 msgid "Update function %s could not be found."
 msgstr ""
 
-#: ../../mod/admin.php:491
+#: ../../mod/admin.php:504
 msgid "No failed updates."
 msgstr ""
 
-#: ../../mod/admin.php:495
+#: ../../mod/admin.php:508
 msgid "Failed Updates"
 msgstr ""
 
-#: ../../mod/admin.php:496
+#: ../../mod/admin.php:509
 msgid ""
 "This does not include updates prior to 1139, which did not return a status."
 msgstr ""
 
-#: ../../mod/admin.php:497
+#: ../../mod/admin.php:510
 msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: ../../mod/admin.php:498
+#: ../../mod/admin.php:511
 msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: ../../mod/admin.php:523
+#: ../../mod/admin.php:536
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:530
+#: ../../mod/admin.php:543
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:569
+#: ../../mod/admin.php:582
 #, php-format
 msgid "User '%s' deleted"
 msgstr ""
 
-#: ../../mod/admin.php:577
+#: ../../mod/admin.php:590
 #, php-format
 msgid "User '%s' unblocked"
 msgstr ""
 
-#: ../../mod/admin.php:577
+#: ../../mod/admin.php:590
 #, php-format
 msgid "User '%s' blocked"
 msgstr ""
 
-#: ../../mod/admin.php:641
+#: ../../mod/admin.php:654
 msgid "select all"
 msgstr ""
 
-#: ../../mod/admin.php:642
+#: ../../mod/admin.php:655
 msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../mod/admin.php:643
+#: ../../mod/admin.php:656
 msgid "Request date"
 msgstr ""
 
-#: ../../mod/admin.php:643 ../../mod/admin.php:652
+#: ../../mod/admin.php:656 ../../mod/admin.php:665
 #: ../../include/contact_selectors.php:79
 msgid "Email"
 msgstr ""
 
-#: ../../mod/admin.php:644
+#: ../../mod/admin.php:657
 msgid "No registrations."
 msgstr ""
 
-#: ../../mod/admin.php:646
+#: ../../mod/admin.php:659
 msgid "Deny"
 msgstr ""
 
-#: ../../mod/admin.php:652
+#: ../../mod/admin.php:665
 msgid "Register date"
 msgstr ""
 
-#: ../../mod/admin.php:652
+#: ../../mod/admin.php:665
 msgid "Last login"
 msgstr ""
 
-#: ../../mod/admin.php:652
+#: ../../mod/admin.php:665
 msgid "Last item"
 msgstr ""
 
-#: ../../mod/admin.php:652
+#: ../../mod/admin.php:665
 msgid "Account"
 msgstr ""
 
-#: ../../mod/admin.php:654
+#: ../../mod/admin.php:667
 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:655
+#: ../../mod/admin.php:668
 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:696
+#: ../../mod/admin.php:709
 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../mod/admin.php:700
+#: ../../mod/admin.php:713
 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../mod/admin.php:710 ../../mod/admin.php:908
+#: ../../mod/admin.php:723 ../../mod/admin.php:921
 msgid "Disable"
 msgstr ""
 
-#: ../../mod/admin.php:712 ../../mod/admin.php:910
+#: ../../mod/admin.php:725 ../../mod/admin.php:923
 msgid "Enable"
 msgstr ""
 
-#: ../../mod/admin.php:734 ../../mod/admin.php:939
+#: ../../mod/admin.php:747 ../../mod/admin.php:952
 msgid "Toggle"
 msgstr ""
 
-#: ../../mod/admin.php:742 ../../mod/admin.php:949
+#: ../../mod/admin.php:755 ../../mod/admin.php:962
 msgid "Author: "
 msgstr ""
 
-#: ../../mod/admin.php:743 ../../mod/admin.php:950
+#: ../../mod/admin.php:756 ../../mod/admin.php:963
 msgid "Maintainer: "
 msgstr ""
 
-#: ../../mod/admin.php:872
+#: ../../mod/admin.php:885
 msgid "No themes found."
 msgstr ""
 
-#: ../../mod/admin.php:931
+#: ../../mod/admin.php:944
 msgid "Screenshot"
 msgstr ""
 
-#: ../../mod/admin.php:979
+#: ../../mod/admin.php:992
 msgid "[Experimental]"
 msgstr ""
 
-#: ../../mod/admin.php:980
+#: ../../mod/admin.php:993
 msgid "[Unsupported]"
 msgstr ""
 
-#: ../../mod/admin.php:1007
+#: ../../mod/admin.php:1020
 msgid "Log settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:1063
+#: ../../mod/admin.php:1076
 msgid "Clear"
 msgstr ""
 
-#: ../../mod/admin.php:1069
+#: ../../mod/admin.php:1082
 msgid "Debugging"
 msgstr ""
 
-#: ../../mod/admin.php:1070
+#: ../../mod/admin.php:1083
 msgid "Log file"
 msgstr ""
 
-#: ../../mod/admin.php:1070
+#: ../../mod/admin.php:1083
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr ""
 
-#: ../../mod/admin.php:1071
+#: ../../mod/admin.php:1084
 msgid "Log level"
 msgstr ""
 
-#: ../../mod/admin.php:1121
+#: ../../mod/admin.php:1134
 msgid "Close"
 msgstr ""
 
-#: ../../mod/admin.php:1127
+#: ../../mod/admin.php:1140
 msgid "FTP Host"
 msgstr ""
 
-#: ../../mod/admin.php:1128
+#: ../../mod/admin.php:1141
 msgid "FTP Path"
 msgstr ""
 
-#: ../../mod/admin.php:1129
+#: ../../mod/admin.php:1142
 msgid "FTP User"
 msgstr ""
 
-#: ../../mod/admin.php:1130
+#: ../../mod/admin.php:1143
 msgid "FTP Password"
 msgstr ""
 
-#: ../../mod/profile.php:21 ../../boot.php:959
+#: ../../mod/profile.php:21 ../../boot.php:960
 msgid "Requested profile is not available."
 msgstr ""
 
@@ -3625,48 +3636,48 @@ msgstr ""
 msgid "Tips for New Members"
 msgstr ""
 
-#: ../../mod/ping.php:177
+#: ../../mod/ping.php:185
 msgid "{0} wants to be your friend"
 msgstr ""
 
-#: ../../mod/ping.php:182
+#: ../../mod/ping.php:190
 msgid "{0} sent you a message"
 msgstr ""
 
-#: ../../mod/ping.php:187
+#: ../../mod/ping.php:195
 msgid "{0} requested registration"
 msgstr ""
 
-#: ../../mod/ping.php:193
+#: ../../mod/ping.php:201
 #, php-format
 msgid "{0} commented %s's post"
 msgstr ""
 
-#: ../../mod/ping.php:198
+#: ../../mod/ping.php:206
 #, php-format
 msgid "{0} liked %s's post"
 msgstr ""
 
-#: ../../mod/ping.php:203
+#: ../../mod/ping.php:211
 #, php-format
 msgid "{0} disliked %s's post"
 msgstr ""
 
-#: ../../mod/ping.php:208
+#: ../../mod/ping.php:216
 #, php-format
 msgid "{0} is now friends with %s"
 msgstr ""
 
-#: ../../mod/ping.php:213
+#: ../../mod/ping.php:221
 msgid "{0} posted"
 msgstr ""
 
-#: ../../mod/ping.php:218
+#: ../../mod/ping.php:226
 #, php-format
 msgid "{0} tagged %s's post with #%s"
 msgstr ""
 
-#: ../../mod/ping.php:224
+#: ../../mod/ping.php:232
 msgid "{0} mentioned you in a post"
 msgstr ""
 
@@ -3683,8 +3694,8 @@ msgid ""
 "Account not found and OpenID registration is not permitted on this site."
 msgstr ""
 
-#: ../../mod/openid.php:93 ../../include/auth.php:90
-#: ../../include/auth.php:153
+#: ../../mod/openid.php:93 ../../include/auth.php:97
+#: ../../include/auth.php:160
 msgid "Login failed."
 msgstr ""
 
@@ -3763,8 +3774,9 @@ msgstr ""
 msgid "No installed applications."
 msgstr ""
 
-#: ../../mod/search.php:83
-msgid "Search This Site"
+#: ../../mod/search.php:83 ../../include/text.php:649
+#: ../../include/text.php:650 ../../include/nav.php:91
+msgid "Search"
 msgstr ""
 
 #: ../../mod/profiles.php:21 ../../mod/profiles.php:375
@@ -3833,6 +3845,11 @@ msgstr ""
 msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
 msgstr ""
 
+#: ../../mod/profiles.php:332
+#, php-format
+msgid " - Visit %1$s's %2$s"
+msgstr ""
+
 #: ../../mod/profiles.php:335
 #, php-format
 msgid "%1$s has an updated %2$s, changing %3$s."
@@ -4021,27 +4038,27 @@ msgstr ""
 msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/profiles.php:621 ../../boot.php:1068
+#: ../../mod/profiles.php:621 ../../boot.php:1069
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/profiles.php:622 ../../boot.php:1069
+#: ../../mod/profiles.php:622 ../../boot.php:1070
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/profiles.php:633 ../../boot.php:1079
+#: ../../mod/profiles.php:633 ../../boot.php:1080
 msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/profiles.php:635 ../../boot.php:1082
+#: ../../mod/profiles.php:635 ../../boot.php:1083
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../mod/profiles.php:636 ../../boot.php:1083
+#: ../../mod/profiles.php:636 ../../boot.php:1084
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../mod/filer.php:29 ../../include/conversation.php:925
+#: ../../mod/filer.php:29 ../../include/conversation.php:926
 msgid "Save to Folder:"
 msgstr ""
 
@@ -4214,83 +4231,83 @@ msgid ""
 "has already been approved."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:242
+#: ../../mod/dfrn_confirm.php:235
 msgid "Response from remote site was not understood."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:251
+#: ../../mod/dfrn_confirm.php:244
 msgid "Unexpected response from remote site: "
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:259
+#: ../../mod/dfrn_confirm.php:252
 msgid "Confirmation completed successfully."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:261 ../../mod/dfrn_confirm.php:275
-#: ../../mod/dfrn_confirm.php:282
+#: ../../mod/dfrn_confirm.php:254 ../../mod/dfrn_confirm.php:268
+#: ../../mod/dfrn_confirm.php:275
 msgid "Remote site reported: "
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:273
+#: ../../mod/dfrn_confirm.php:266
 msgid "Temporary failure. Please wait and try again."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:280
+#: ../../mod/dfrn_confirm.php:273
 msgid "Introduction failed or was revoked."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:425
+#: ../../mod/dfrn_confirm.php:418
 msgid "Unable to set contact photo."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:482 ../../include/diaspora.php:507
+#: ../../mod/dfrn_confirm.php:475 ../../include/diaspora.php:507
 #: ../../include/conversation.php:101
 #, php-format
 msgid "%1$s is now friends with %2$s"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:564
+#: ../../mod/dfrn_confirm.php:557
 #, php-format
 msgid "No user record found for '%s' "
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:574
+#: ../../mod/dfrn_confirm.php:567
 msgid "Our site encryption key is apparently messed up."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:585
+#: ../../mod/dfrn_confirm.php:578
 msgid "Empty site URL was provided or URL could not be decrypted by us."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:606
+#: ../../mod/dfrn_confirm.php:599
 msgid "Contact record was not found for you on our site."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:620
+#: ../../mod/dfrn_confirm.php:613
 #, php-format
 msgid "Site public key not available in contact record for URL %s."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:640
+#: ../../mod/dfrn_confirm.php:633
 msgid ""
 "The ID provided by your system is a duplicate on our system. It should work "
 "if you try again."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:651
+#: ../../mod/dfrn_confirm.php:644
 msgid "Unable to set your contact credentials on our system."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:716
+#: ../../mod/dfrn_confirm.php:709
 msgid "Unable to update your contact profile details on our system"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:750
+#: ../../mod/dfrn_confirm.php:743
 #, php-format
 msgid "Connection accepted at %s"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:799
+#: ../../mod/dfrn_confirm.php:792
 #, php-format
 msgid "%1$s has joined %2$s"
 msgstr ""
@@ -4502,23 +4519,23 @@ msgid ""
 "connection again, you have to %3$sre-authenticate the Facebook-connector%4$s."
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:144
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:147
 msgid "Lifetime of the cache (in hours)"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:149
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:152
 msgid "Cache Statistics"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:152
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:155
 msgid "Number of items"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:154
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:157
 msgid "Size of the cache"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:156
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:159
 msgid "Delete the whole cache"
 msgstr ""
 
@@ -4644,8 +4661,8 @@ msgid "Forums"
 msgstr ""
 
 #: ../../addon/page/page.php:63 ../../addon/showmore/showmore.php:87
-#: ../../include/contact_widgets.php:188 ../../include/conversation.php:469
-#: ../../boot.php:517
+#: ../../include/contact_widgets.php:188 ../../include/conversation.php:470
+#: ../../boot.php:518
 msgid "show more"
 msgstr ""
 
@@ -4661,7 +4678,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:815
+#: ../../include/nav.php:64 ../../boot.php:816
 msgid "Login"
 msgstr ""
 
@@ -4689,7 +4706,7 @@ msgid "Latest likes"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:155
-#: ../../view/theme/diabook/theme.php:557 ../../include/text.php:1303
+#: ../../view/theme/diabook/theme.php:557 ../../include/text.php:1309
 #: ../../include/conversation.php:45 ../../include/conversation.php:118
 msgid "event"
 msgstr ""
@@ -4845,6 +4862,18 @@ msgstr ""
 msgid "Post from Friendica"
 msgstr ""
 
+#: ../../addon/startpage/startpage.php:83
+msgid "Startpage Settings"
+msgstr ""
+
+#: ../../addon/startpage/startpage.php:85
+msgid "Home page to load after login  - leave blank for profile wall"
+msgstr ""
+
+#: ../../addon/startpage/startpage.php:88
+msgid "Examples: &quot;network&quot; or &quot;notifications/system&quot;"
+msgstr ""
+
 #: ../../addon/geonames/geonames.php:143
 msgid "Geonames settings updated."
 msgstr ""
@@ -4857,6 +4886,25 @@ msgstr ""
 msgid "Enable Geonames Plugin"
 msgstr ""
 
+#: ../../addon/public_server/public_server.php:126
+#: ../../addon/testdrive/testdrive.php:94
+#, php-format
+msgid "Your account on %s will expire in a few days."
+msgstr ""
+
+#: ../../addon/public_server/public_server.php:127
+msgid "Your Friendica account is about to expire."
+msgstr ""
+
+#: ../../addon/public_server/public_server.php:128
+#, php-format
+msgid ""
+"Hi %1$s,\n"
+"\n"
+"Your account on %2$s will expire in less than five days. You may keep your "
+"account by logging in at least once every 30 days"
+msgstr ""
+
 #: ../../addon/js_upload/js_upload.php:43
 msgid "Upload a file"
 msgstr ""
@@ -5116,16 +5164,11 @@ msgstr ""
 msgid "Gravatar settings updated."
 msgstr ""
 
-#: ../../addon/testdrive/testdrive.php:85
-#, php-format
-msgid "Your account on %s will expire in a few days."
-msgstr ""
-
-#: ../../addon/testdrive/testdrive.php:86
+#: ../../addon/testdrive/testdrive.php:95
 msgid "Your Friendica test account is about to expire."
 msgstr ""
 
-#: ../../addon/testdrive/testdrive.php:87
+#: ../../addon/testdrive/testdrive.php:96
 #, php-format
 msgid ""
 "Hi %1$s,\n"
@@ -5812,7 +5855,7 @@ msgstr ""
 msgid "Set colour scheme"
 msgstr ""
 
-#: ../../include/profile_advanced.php:17 ../../boot.php:1104
+#: ../../include/profile_advanced.php:17 ../../boot.php:1105
 msgid "Gender:"
 msgstr ""
 
@@ -5833,11 +5876,11 @@ msgstr ""
 msgid "Age:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:37 ../../boot.php:1107
+#: ../../include/profile_advanced.php:37 ../../boot.php:1108
 msgid "Status:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:45 ../../boot.php:1109
+#: ../../include/profile_advanced.php:45 ../../boot.php:1110
 msgid "Homepage:"
 msgstr ""
 
@@ -6201,12 +6244,12 @@ msgstr ""
 msgid "Finishes:"
 msgstr ""
 
-#: ../../include/delivery.php:452 ../../include/notifier.php:652
+#: ../../include/delivery.php:455 ../../include/notifier.php:677
 msgid "(no subject)"
 msgstr ""
 
-#: ../../include/delivery.php:459 ../../include/enotify.php:23
-#: ../../include/notifier.php:659
+#: ../../include/delivery.php:462 ../../include/enotify.php:23
+#: ../../include/notifier.php:684
 msgid "noreply"
 msgstr ""
 
@@ -6237,10 +6280,6 @@ msgid_plural "%d Contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/text.php:650 ../../include/nav.php:91
-msgid "Search"
-msgstr ""
-
 #: ../../include/text.php:831
 msgid "Monday"
 msgstr ""
@@ -6317,51 +6356,51 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: ../../include/text.php:919
+#: ../../include/text.php:920
 msgid "bytes"
 msgstr ""
 
-#: ../../include/text.php:934 ../../include/text.php:949
+#: ../../include/text.php:940 ../../include/text.php:955
 msgid "remove"
 msgstr ""
 
-#: ../../include/text.php:934 ../../include/text.php:949
+#: ../../include/text.php:940 ../../include/text.php:955
 msgid "[remove]"
 msgstr ""
 
-#: ../../include/text.php:937
+#: ../../include/text.php:943
 msgid "Categories:"
 msgstr ""
 
-#: ../../include/text.php:952
+#: ../../include/text.php:958
 msgid "Filed under:"
 msgstr ""
 
-#: ../../include/text.php:968 ../../include/text.php:980
+#: ../../include/text.php:974 ../../include/text.php:986
 msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/text.php:1085
+#: ../../include/text.php:1091
 msgid "default"
 msgstr ""
 
-#: ../../include/text.php:1097
+#: ../../include/text.php:1103
 msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/text.php:1307
+#: ../../include/text.php:1313
 msgid "activity"
 msgstr ""
 
-#: ../../include/text.php:1309
+#: ../../include/text.php:1315
 msgid "comment"
 msgstr ""
 
-#: ../../include/text.php:1310
+#: ../../include/text.php:1316
 msgid "post"
 msgstr ""
 
-#: ../../include/text.php:1465
+#: ../../include/text.php:1471
 msgid "Item filed"
 msgstr ""
 
@@ -6425,7 +6464,7 @@ msgstr ""
 msgid "Contacts not in any group"
 msgstr ""
 
-#: ../../include/nav.php:46 ../../boot.php:814
+#: ../../include/nav.php:46 ../../boot.php:815
 msgid "Logout"
 msgstr ""
 
@@ -6433,7 +6472,7 @@ msgstr ""
 msgid "End this session"
 msgstr ""
 
-#: ../../include/nav.php:49 ../../boot.php:1482
+#: ../../include/nav.php:49 ../../boot.php:1502
 msgid "Status"
 msgstr ""
 
@@ -6513,11 +6552,11 @@ msgstr ""
 msgid "Manage other pages"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../boot.php:1062
+#: ../../include/nav.php:138 ../../boot.php:1063
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../boot.php:1062
+#: ../../include/nav.php:138 ../../boot.php:1063
 msgid "Manage/edit profiles"
 msgstr ""
 
@@ -6596,17 +6635,17 @@ msgstr ""
 msgid "Categories"
 msgstr ""
 
-#: ../../include/auth.php:29
+#: ../../include/auth.php:36
 msgid "Logged out."
 msgstr ""
 
-#: ../../include/auth.php:106
+#: ../../include/auth.php:113
 msgid ""
 "We encountered a problem while logging in with the OpenID you provided. "
 "Please check the correct spelling of the ID."
 msgstr ""
 
-#: ../../include/auth.php:106
+#: ../../include/auth.php:113
 msgid "The error message was:"
 msgstr ""
 
@@ -6935,30 +6974,30 @@ msgstr ""
 msgid "stopped following"
 msgstr ""
 
-#: ../../include/Contact.php:203 ../../include/conversation.php:820
+#: ../../include/Contact.php:203 ../../include/conversation.php:821
 msgid "View Status"
 msgstr ""
 
-#: ../../include/Contact.php:204 ../../include/conversation.php:821
+#: ../../include/Contact.php:204 ../../include/conversation.php:822
 msgid "View Profile"
 msgstr ""
 
-#: ../../include/Contact.php:205 ../../include/conversation.php:822
+#: ../../include/Contact.php:205 ../../include/conversation.php:823
 msgid "View Photos"
 msgstr ""
 
 #: ../../include/Contact.php:206 ../../include/Contact.php:219
-#: ../../include/conversation.php:823
+#: ../../include/conversation.php:824
 msgid "Network Posts"
 msgstr ""
 
 #: ../../include/Contact.php:207 ../../include/Contact.php:219
-#: ../../include/conversation.php:824
+#: ../../include/conversation.php:825
 msgid "Edit Contact"
 msgstr ""
 
 #: ../../include/Contact.php:208 ../../include/Contact.php:219
-#: ../../include/conversation.php:825
+#: ../../include/conversation.php:826
 msgid "Send PM"
 msgstr ""
 
@@ -6971,309 +7010,309 @@ msgstr ""
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 
-#: ../../include/conversation.php:320 ../../include/conversation.php:586
+#: ../../include/conversation.php:321 ../../include/conversation.php:587
 msgid "Select"
 msgstr ""
 
-#: ../../include/conversation.php:337 ../../include/conversation.php:679
-#: ../../include/conversation.php:680
+#: ../../include/conversation.php:338 ../../include/conversation.php:680
+#: ../../include/conversation.php:681
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 
-#: ../../include/conversation.php:347 ../../include/conversation.php:691
+#: ../../include/conversation.php:348 ../../include/conversation.php:692
 #, php-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../../include/conversation.php:362
+#: ../../include/conversation.php:363
 msgid "View in context"
 msgstr ""
 
-#: ../../include/conversation.php:468
+#: ../../include/conversation.php:469
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:532
+#: ../../include/conversation.php:533
 msgid "like"
 msgstr ""
 
-#: ../../include/conversation.php:533
+#: ../../include/conversation.php:534
 msgid "dislike"
 msgstr ""
 
-#: ../../include/conversation.php:535
+#: ../../include/conversation.php:536
 msgid "Share this"
 msgstr ""
 
-#: ../../include/conversation.php:535
+#: ../../include/conversation.php:536
 msgid "share"
 msgstr ""
 
-#: ../../include/conversation.php:559
+#: ../../include/conversation.php:560
 msgid "Bold"
 msgstr ""
 
-#: ../../include/conversation.php:560
+#: ../../include/conversation.php:561
 msgid "Italic"
 msgstr ""
 
-#: ../../include/conversation.php:561
+#: ../../include/conversation.php:562
 msgid "Underline"
 msgstr ""
 
-#: ../../include/conversation.php:562
+#: ../../include/conversation.php:563
 msgid "Quote"
 msgstr ""
 
-#: ../../include/conversation.php:563
+#: ../../include/conversation.php:564
 msgid "Code"
 msgstr ""
 
-#: ../../include/conversation.php:564
+#: ../../include/conversation.php:565
 msgid "Image"
 msgstr ""
 
-#: ../../include/conversation.php:565
+#: ../../include/conversation.php:566
 msgid "Link"
 msgstr ""
 
-#: ../../include/conversation.php:566
+#: ../../include/conversation.php:567
 msgid "Video"
 msgstr ""
 
-#: ../../include/conversation.php:599
+#: ../../include/conversation.php:600
 msgid "add star"
 msgstr ""
 
-#: ../../include/conversation.php:600
+#: ../../include/conversation.php:601
 msgid "remove star"
 msgstr ""
 
-#: ../../include/conversation.php:601
+#: ../../include/conversation.php:602
 msgid "toggle star status"
 msgstr ""
 
-#: ../../include/conversation.php:604
+#: ../../include/conversation.php:605
 msgid "starred"
 msgstr ""
 
-#: ../../include/conversation.php:605
+#: ../../include/conversation.php:606
 msgid "add tag"
 msgstr ""
 
-#: ../../include/conversation.php:609
+#: ../../include/conversation.php:610
 msgid "save to folder"
 msgstr ""
 
-#: ../../include/conversation.php:681
+#: ../../include/conversation.php:682
 msgid "to"
 msgstr ""
 
-#: ../../include/conversation.php:682
+#: ../../include/conversation.php:683
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../include/conversation.php:683
+#: ../../include/conversation.php:684
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../include/conversation.php:728
+#: ../../include/conversation.php:729
 msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/conversation.php:879
+#: ../../include/conversation.php:880
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: ../../include/conversation.php:879
+#: ../../include/conversation.php:880
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/conversation.php:883
+#: ../../include/conversation.php:884
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""
 
-#: ../../include/conversation.php:885
+#: ../../include/conversation.php:886
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:891
+#: ../../include/conversation.php:892
 msgid "and"
 msgstr ""
 
-#: ../../include/conversation.php:894
+#: ../../include/conversation.php:895
 #, php-format
 msgid ", and %d other people"
 msgstr ""
 
-#: ../../include/conversation.php:895
+#: ../../include/conversation.php:896
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../include/conversation.php:895
+#: ../../include/conversation.php:896
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:920
+#: ../../include/conversation.php:921
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: ../../include/conversation.php:922
+#: ../../include/conversation.php:923
 msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:923
+#: ../../include/conversation.php:924
 msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:924
+#: ../../include/conversation.php:925
 msgid "Tag term:"
 msgstr ""
 
-#: ../../include/conversation.php:926
+#: ../../include/conversation.php:927
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/conversation.php:969
+#: ../../include/conversation.php:970
 msgid "upload photo"
 msgstr ""
 
-#: ../../include/conversation.php:971
+#: ../../include/conversation.php:972
 msgid "attach file"
 msgstr ""
 
-#: ../../include/conversation.php:973
+#: ../../include/conversation.php:974
 msgid "web link"
 msgstr ""
 
-#: ../../include/conversation.php:974
+#: ../../include/conversation.php:975
 msgid "Insert video link"
 msgstr ""
 
-#: ../../include/conversation.php:975
+#: ../../include/conversation.php:976
 msgid "video link"
 msgstr ""
 
-#: ../../include/conversation.php:976
+#: ../../include/conversation.php:977
 msgid "Insert audio link"
 msgstr ""
 
-#: ../../include/conversation.php:977
+#: ../../include/conversation.php:978
 msgid "audio link"
 msgstr ""
 
-#: ../../include/conversation.php:979
+#: ../../include/conversation.php:980
 msgid "set location"
 msgstr ""
 
-#: ../../include/conversation.php:981
+#: ../../include/conversation.php:982
 msgid "clear location"
 msgstr ""
 
-#: ../../include/conversation.php:988
+#: ../../include/conversation.php:989
 msgid "permissions"
 msgstr ""
 
-#: ../../boot.php:515
+#: ../../boot.php:516
 msgid "Delete this item?"
 msgstr ""
 
-#: ../../boot.php:518
+#: ../../boot.php:519
 msgid "show fewer"
 msgstr ""
 
-#: ../../boot.php:691
+#: ../../boot.php:692
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:693
+#: ../../boot.php:694
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:793
+#: ../../boot.php:794
 msgid "Create a New Account"
 msgstr ""
 
-#: ../../boot.php:817
+#: ../../boot.php:818
 msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../boot.php:818
+#: ../../boot.php:819
 msgid "Password: "
 msgstr ""
 
-#: ../../boot.php:821
+#: ../../boot.php:822
 msgid "Or login using OpenID: "
 msgstr ""
 
-#: ../../boot.php:827
+#: ../../boot.php:828
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:994
+#: ../../boot.php:995
 msgid "Edit profile"
 msgstr ""
 
-#: ../../boot.php:1054
+#: ../../boot.php:1055
 msgid "Message"
 msgstr ""
 
-#: ../../boot.php:1170 ../../boot.php:1246
+#: ../../boot.php:1171 ../../boot.php:1247
 msgid "g A l F d"
 msgstr ""
 
-#: ../../boot.php:1171 ../../boot.php:1247
+#: ../../boot.php:1172 ../../boot.php:1248
 msgid "F d"
 msgstr ""
 
-#: ../../boot.php:1216 ../../boot.php:1287
+#: ../../boot.php:1217 ../../boot.php:1288
 msgid "[today]"
 msgstr ""
 
-#: ../../boot.php:1228
+#: ../../boot.php:1229
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../boot.php:1229
+#: ../../boot.php:1230
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../boot.php:1280
+#: ../../boot.php:1281
 msgid "[No description]"
 msgstr ""
 
-#: ../../boot.php:1298
+#: ../../boot.php:1299
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../boot.php:1299
+#: ../../boot.php:1300
 msgid "Events this week:"
 msgstr ""
 
-#: ../../boot.php:1485
+#: ../../boot.php:1505
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../boot.php:1491
+#: ../../boot.php:1511
 msgid "Profile Details"
 msgstr ""
 
-#: ../../boot.php:1506
+#: ../../boot.php:1526
 msgid "Events and Calendar"
 msgstr ""
 
-#: ../../boot.php:1512
+#: ../../boot.php:1532
 msgid "Only You Can See This"
 msgstr ""