Merge branch 'master' of git://github.com/friendica/friendica

2012-05-05 20:48:16 +05:30 · 2012-05-05 20:48:16 +05:30 · b5e857c0e7
commit b5e857c0e7
parent 214ec91a3f 8ae83201cf
141 changed files with 10220 additions and 6910 deletions
--- a/util/messages.po
+++ b/util/messages.po
@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.3.1324\n"
+"Project-Id-Version: 2.3.1332\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-26 10:00-0700\n"
+"POT-Creation-Date: 2012-05-04 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"
@ -35,12 +35,12 @@ msgid "Contact update failed."
 msgstr ""

 #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44
-#: ../../mod/fsuggest.php:78 ../../mod/events.php:110 ../../mod/api.php:26
+#: ../../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/notifications.php:66 ../../mod/contacts.php:125
-#: ../../mod/settings.php:99 ../../mod/settings.php:514
-#: ../../mod/settings.php:519 ../../mod/manage.php:86 ../../mod/network.php:6
+#: ../../mod/settings.php:104 ../../mod/settings.php:521
+#: ../../mod/settings.php:526 ../../mod/manage.php:86 ../../mod/network.php:6
 #: ../../mod/notes.php:20 ../../mod/wallmessage.php:9
 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
@ -51,12 +51,11 @@ msgstr ""
 #: ../../mod/profile_photo.php:163 ../../mod/message.php:38
 #: ../../mod/message.php:90 ../../mod/allfriends.php:9
 #: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53
-#: ../../mod/follow.php:8 ../../mod/common.php:9 ../../mod/display.php:138
-#: ../../mod/profiles.php:7 ../../mod/profiles.php:329
-#: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13
-#: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53
-#: ../../addon/facebook/facebook.php:484 ../../include/items.php:3171
-#: ../../index.php:309
+#: ../../mod/follow.php:8 ../../mod/display.php:138 ../../mod/profiles.php:7
+#: ../../mod/profiles.php:365 ../../mod/delegate.php:6
+#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
+#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:485
+#: ../../include/items.php:3187 ../../index.php:306
 msgid "Permission denied."
 msgstr ""

@ -85,8 +84,8 @@ msgstr ""
 msgid "Return to contact editor"
 msgstr ""

-#: ../../mod/crepair.php:148 ../../mod/settings.php:534
-#: ../../mod/settings.php:560 ../../mod/admin.php:573 ../../mod/admin.php:582
+#: ../../mod/crepair.php:148 ../../mod/settings.php:541
+#: ../../mod/settings.php:567 ../../mod/admin.php:640 ../../mod/admin.php:649
 msgid "Name"
 msgstr ""

@ -123,19 +122,19 @@ msgid "New photo from this URL"
 msgstr ""

 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
-#: ../../mod/events.php:400 ../../mod/photos.php:900 ../../mod/photos.php:958
+#: ../../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/localtime.php:45 ../../mod/contacts.php:296
-#: ../../mod/settings.php:532 ../../mod/settings.php:678
-#: ../../mod/settings.php:739 ../../mod/settings.php:930
-#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:392
-#: ../../mod/admin.php:570 ../../mod/admin.php:706 ../../mod/admin.php:905
-#: ../../mod/admin.php:993 ../../mod/profiles.php:498 ../../mod/invite.php:119
-#: ../../addon/facebook/facebook.php:574 ../../addon/yourls/yourls.php:76
-#: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57
-#: ../../addon/planets/planets.php:158
+#: ../../mod/localtime.php:45 ../../mod/contacts.php:322
+#: ../../mod/settings.php:539 ../../mod/settings.php:685
+#: ../../mod/settings.php:746 ../../mod/settings.php:940
+#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:402
+#: ../../mod/admin.php:637 ../../mod/admin.php:773 ../../mod/admin.php:972
+#: ../../mod/admin.php:1059 ../../mod/profiles.php:534
+#: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:575
+#: ../../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
@ -158,8 +157,10 @@ msgstr ""
 #: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375
 #: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102
 #: ../../addon/posterous/posterous.php:90
+#: ../../view/theme/cleanzero/config.php:71
 #: ../../view/theme/diabook/config.php:91
-#: ../../view/theme/quattro/config.php:52 ../../include/conversation.php:555
+#: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70
+#: ../../include/conversation.php:555
 msgid "Submit"
 msgstr ""

@ -171,11 +172,11 @@ msgstr ""
 msgid "Help"
 msgstr ""

-#: ../../mod/help.php:38 ../../index.php:228
+#: ../../mod/help.php:38 ../../index.php:225
 msgid "Not Found"
 msgstr ""

-#: ../../mod/help.php:41 ../../index.php:231
+#: ../../mod/help.php:41 ../../index.php:228
 msgid "Page not found."
 msgstr ""

@ -201,84 +202,84 @@ msgstr ""
 msgid "Suggest a friend for %s"
 msgstr ""

-#: ../../mod/events.php:62
+#: ../../mod/events.php:65
 msgid "Event description and start time are required."
 msgstr ""

-#: ../../mod/events.php:230
+#: ../../mod/events.php:258
 msgid "l, F j"
 msgstr ""

-#: ../../mod/events.php:252
+#: ../../mod/events.php:280
 msgid "Edit event"
 msgstr ""

-#: ../../mod/events.php:272 ../../include/text.php:1053
+#: ../../mod/events.php:300 ../../include/text.php:1053
 msgid "link to source"
 msgstr ""

-#: ../../mod/events.php:296 ../../view/theme/diabook/theme.php:250
-#: ../../include/nav.php:52 ../../boot.php:1481
+#: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:69
+#: ../../include/nav.php:52 ../../boot.php:1493
 msgid "Events"
 msgstr ""

-#: ../../mod/events.php:297
+#: ../../mod/events.php:325
 msgid "Create New Event"
 msgstr ""

-#: ../../mod/events.php:298
+#: ../../mod/events.php:326
 msgid "Previous"
 msgstr ""

-#: ../../mod/events.php:299 ../../mod/install.php:210
+#: ../../mod/events.php:327 ../../mod/install.php:210
 msgid "Next"
 msgstr ""

-#: ../../mod/events.php:371
+#: ../../mod/events.php:399
 msgid "hour:minute"
 msgstr ""

-#: ../../mod/events.php:380
+#: ../../mod/events.php:408
 msgid "Event details"
 msgstr ""

-#: ../../mod/events.php:381
+#: ../../mod/events.php:409
 #, php-format
 msgid "Format is %s %s. Starting date and Description are required."
 msgstr ""

-#: ../../mod/events.php:383
+#: ../../mod/events.php:411
 msgid "Event Starts:"
 msgstr ""

-#: ../../mod/events.php:386
+#: ../../mod/events.php:414
 msgid "Finish date/time is not known or not relevant"
 msgstr ""

-#: ../../mod/events.php:388
+#: ../../mod/events.php:416
 msgid "Event Finishes:"
 msgstr ""

-#: ../../mod/events.php:391
+#: ../../mod/events.php:419
 msgid "Adjust for viewer timezone"
 msgstr ""

-#: ../../mod/events.php:393
+#: ../../mod/events.php:421
 msgid "Description:"
 msgstr ""

-#: ../../mod/events.php:395 ../../include/event.php:37
-#: ../../include/bb2diaspora.php:260 ../../boot.php:1083
+#: ../../mod/events.php:423 ../../include/event.php:37
+#: ../../include/bb2diaspora.php:260 ../../boot.php:1092
 msgid "Location:"
 msgstr ""

-#: ../../mod/events.php:397
+#: ../../mod/events.php:425
 msgid "Share this event"
 msgstr ""

 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/dfrn_request.php:812 ../../mod/settings.php:533
-#: ../../mod/settings.php:559 ../../addon/js_upload/js_upload.php:45
+#: ../../mod/dfrn_request.php:818 ../../mod/settings.php:540
+#: ../../mod/settings.php:566 ../../addon/js_upload/js_upload.php:45
 msgid "Cancel"
 msgstr ""

@ -321,36 +322,36 @@ msgid ""
 "and/or create new posts for you?"
 msgstr ""

-#: ../../mod/api.php:105 ../../mod/dfrn_request.php:800
-#: ../../mod/settings.php:844 ../../mod/settings.php:850
-#: ../../mod/settings.php:858 ../../mod/settings.php:862
-#: ../../mod/settings.php:867 ../../mod/settings.php:873
-#: ../../mod/settings.php:879 ../../mod/settings.php:885
-#: ../../mod/settings.php:921 ../../mod/settings.php:922
-#: ../../mod/settings.php:923 ../../mod/settings.php:924
-#: ../../mod/register.php:532 ../../mod/profiles.php:475
+#: ../../mod/api.php:105 ../../mod/dfrn_request.php:806
+#: ../../mod/settings.php:854 ../../mod/settings.php:860
+#: ../../mod/settings.php:868 ../../mod/settings.php:872
+#: ../../mod/settings.php:877 ../../mod/settings.php:883
+#: ../../mod/settings.php:889 ../../mod/settings.php:895
+#: ../../mod/settings.php:931 ../../mod/settings.php:932
+#: ../../mod/settings.php:933 ../../mod/settings.php:934
+#: ../../mod/register.php:532 ../../mod/profiles.php:511
 msgid "Yes"
 msgstr ""

-#: ../../mod/api.php:106 ../../mod/dfrn_request.php:801
-#: ../../mod/settings.php:844 ../../mod/settings.php:850
-#: ../../mod/settings.php:858 ../../mod/settings.php:862
-#: ../../mod/settings.php:867 ../../mod/settings.php:873
-#: ../../mod/settings.php:879 ../../mod/settings.php:885
-#: ../../mod/settings.php:921 ../../mod/settings.php:922
-#: ../../mod/settings.php:923 ../../mod/settings.php:924
-#: ../../mod/register.php:533 ../../mod/profiles.php:476
+#: ../../mod/api.php:106 ../../mod/dfrn_request.php:807
+#: ../../mod/settings.php:854 ../../mod/settings.php:860
+#: ../../mod/settings.php:868 ../../mod/settings.php:872
+#: ../../mod/settings.php:877 ../../mod/settings.php:883
+#: ../../mod/settings.php:889 ../../mod/settings.php:895
+#: ../../mod/settings.php:931 ../../mod/settings.php:932
+#: ../../mod/settings.php:933 ../../mod/settings.php:934
+#: ../../mod/register.php:533 ../../mod/profiles.php:512
 msgid "No"
 msgstr ""

-#: ../../mod/photos.php:43
+#: ../../mod/photos.php:43 ../../boot.php:1487
 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
-#: ../../view/theme/diabook/theme.php:130
+#: ../../view/theme/diabook/theme.php:436
 msgid "Contact Photos"
 msgstr ""

@ -373,7 +374,7 @@ msgstr ""
 #: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174
 #: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261
 #: ../../addon/communityhome/communityhome.php:111
-#: ../../view/theme/diabook/theme.php:131
+#: ../../view/theme/diabook/theme.php:437
 msgid "Profile Photos"
 msgstr ""

@ -395,7 +396,7 @@ msgstr ""

 #: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70
 #: ../../addon/communityhome/communityhome.php:163
-#: ../../view/theme/diabook/theme.php:102 ../../include/text.php:1304
+#: ../../view/theme/diabook/theme.php:408 ../../include/text.php:1304
 #: ../../include/diaspora.php:1654 ../../include/conversation.php:53
 #: ../../include/conversation.php:126
 msgid "photo"
@ -424,7 +425,7 @@ msgid "Image upload failed."
 msgstr ""

 #: ../../mod/photos.php:759 ../../mod/community.php:16
-#: ../../mod/dfrn_request.php:731 ../../mod/viewcontacts.php:17
+#: ../../mod/dfrn_request.php:732 ../../mod/viewcontacts.php:17
 #: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29
 msgid "Public access denied."
 msgstr ""
@ -525,14 +526,14 @@ msgstr ""
 msgid "I don't like this (toggle)"
 msgstr ""

-#: ../../mod/photos.php:1213 ../../include/conversation.php:956
+#: ../../mod/photos.php:1213 ../../include/conversation.php:964
 msgid "Share"
 msgstr ""

 #: ../../mod/photos.php:1214 ../../mod/editpost.php:104
 #: ../../mod/wallmessage.php:145 ../../mod/message.php:188
 #: ../../mod/message.php:380 ../../include/conversation.php:361
-#: ../../include/conversation.php:698 ../../include/conversation.php:975
+#: ../../include/conversation.php:706 ../../include/conversation.php:983
 msgid "Please wait"
 msgstr ""

@ -543,18 +544,18 @@ msgstr ""

 #: ../../mod/photos.php:1232 ../../mod/photos.php:1272
 #: ../../mod/photos.php:1303 ../../include/conversation.php:554
-#: ../../boot.php:495
+#: ../../boot.php:506
 msgid "Comment"
 msgstr ""

 #: ../../mod/photos.php:1234 ../../mod/editpost.php:125
-#: ../../include/conversation.php:556 ../../include/conversation.php:993
+#: ../../include/conversation.php:564 ../../include/conversation.php:1001
 msgid "Preview"
 msgstr ""

-#: ../../mod/photos.php:1331 ../../mod/settings.php:595
-#: ../../mod/settings.php:676 ../../mod/group.php:168 ../../mod/admin.php:577
-#: ../../include/conversation.php:318 ../../include/conversation.php:576
+#: ../../mod/photos.php:1331 ../../mod/settings.php:602
+#: ../../mod/settings.php:683 ../../mod/group.php:168 ../../mod/admin.php:644
+#: ../../include/conversation.php:318 ../../include/conversation.php:584
 msgid "Delete"
 msgstr ""

@ -570,7 +571,7 @@ msgstr ""
 msgid "Not available."
 msgstr ""

-#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:252
+#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:71
 #: ../../include/nav.php:101
 msgid "Community"
 msgstr ""
@ -579,35 +580,35 @@ msgstr ""
 msgid "No results."
 msgstr ""

-#: ../../mod/friendica.php:47
+#: ../../mod/friendica.php:55
 msgid "This is Friendica, version"
 msgstr ""

-#: ../../mod/friendica.php:48
+#: ../../mod/friendica.php:56
 msgid "running at web location"
 msgstr ""

-#: ../../mod/friendica.php:50
+#: ../../mod/friendica.php:58
 msgid ""
 "Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn "
 "more about the Friendica project."
 msgstr ""

-#: ../../mod/friendica.php:52
+#: ../../mod/friendica.php:60
 msgid "Bug reports and issues: please visit"
 msgstr ""

-#: ../../mod/friendica.php:53
+#: ../../mod/friendica.php:61
 msgid ""
 "Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
 "dot com"
 msgstr ""

-#: ../../mod/friendica.php:58
+#: ../../mod/friendica.php:75
 msgid "Installed plugins/addons/apps:"
 msgstr ""

-#: ../../mod/friendica.php:71
+#: ../../mod/friendica.php:88
 msgid "No installed plugins/addons/apps"
 msgstr ""

@ -619,28 +620,28 @@ msgstr ""
 msgid "Edit post"
 msgstr ""

-#: ../../mod/editpost.php:80 ../../include/conversation.php:942
+#: ../../mod/editpost.php:80 ../../include/conversation.php:950
 msgid "Post to Email"
 msgstr ""

-#: ../../mod/editpost.php:95 ../../mod/settings.php:594
-#: ../../include/conversation.php:563
+#: ../../mod/editpost.php:95 ../../mod/settings.php:601
+#: ../../include/conversation.php:571
 msgid "Edit"
 msgstr ""

 #: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143
 #: ../../mod/message.php:186 ../../mod/message.php:378
-#: ../../include/conversation.php:957
+#: ../../include/conversation.php:965
 msgid "Upload photo"
 msgstr ""

-#: ../../mod/editpost.php:97 ../../include/conversation.php:959
+#: ../../mod/editpost.php:97 ../../include/conversation.php:967
 msgid "Attach file"
 msgstr ""

 #: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144
 #: ../../mod/message.php:187 ../../mod/message.php:379
-#: ../../include/conversation.php:961
+#: ../../include/conversation.php:969
 msgid "Insert web link"
 msgstr ""

@ -656,35 +657,35 @@ msgstr ""
 msgid "Insert Vorbis [.ogg] audio"
 msgstr ""

-#: ../../mod/editpost.php:102 ../../include/conversation.php:967
+#: ../../mod/editpost.php:102 ../../include/conversation.php:975
 msgid "Set your location"
 msgstr ""

-#: ../../mod/editpost.php:103 ../../include/conversation.php:969
+#: ../../mod/editpost.php:103 ../../include/conversation.php:977
 msgid "Clear browser location"
 msgstr ""

-#: ../../mod/editpost.php:105 ../../include/conversation.php:976
+#: ../../mod/editpost.php:105 ../../include/conversation.php:984
 msgid "Permission settings"
 msgstr ""

-#: ../../mod/editpost.php:113 ../../include/conversation.php:985
+#: ../../mod/editpost.php:113 ../../include/conversation.php:993
 msgid "CC: email addresses"
 msgstr ""

-#: ../../mod/editpost.php:114 ../../include/conversation.php:986
+#: ../../mod/editpost.php:114 ../../include/conversation.php:994
 msgid "Public post"
 msgstr ""

-#: ../../mod/editpost.php:117 ../../include/conversation.php:972
+#: ../../mod/editpost.php:117 ../../include/conversation.php:980
 msgid "Set title"
 msgstr ""

-#: ../../mod/editpost.php:119 ../../include/conversation.php:974
+#: ../../mod/editpost.php:119 ../../include/conversation.php:982
 msgid "Categories (comma-separated list)"
 msgstr ""

-#: ../../mod/editpost.php:120 ../../include/conversation.php:988
+#: ../../mod/editpost.php:120 ../../include/conversation.php:996
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""

@ -801,75 +802,75 @@ msgstr ""
 msgid "Confirm"
 msgstr ""

-#: ../../mod/dfrn_request.php:688 ../../include/items.php:2691
+#: ../../mod/dfrn_request.php:688 ../../include/items.php:2707
 msgid "[Name Withheld]"
 msgstr ""

-#: ../../mod/dfrn_request.php:775
+#: ../../mod/dfrn_request.php:781
 msgid ""
 "Please enter your 'Identity Address' from one of the following supported "
 "communications networks:"
 msgstr ""

-#: ../../mod/dfrn_request.php:791
+#: ../../mod/dfrn_request.php:797
 msgid "<strike>Connect as an email follower</strike> (Coming soon)"
 msgstr ""

-#: ../../mod/dfrn_request.php:793
+#: ../../mod/dfrn_request.php:799
 msgid ""
 "If you are not yet a member of the free social web, <a href=\"http://dir."
 "friendica.com/siteinfo\">follow this link to find a public Friendica site "
 "and join us today</a>."
 msgstr ""

-#: ../../mod/dfrn_request.php:796
+#: ../../mod/dfrn_request.php:802
 msgid "Friend/Connection Request"
 msgstr ""

-#: ../../mod/dfrn_request.php:797
+#: ../../mod/dfrn_request.php:803
 msgid ""
 "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
 "testuser@identi.ca"
 msgstr ""

-#: ../../mod/dfrn_request.php:798
+#: ../../mod/dfrn_request.php:804
 msgid "Please answer the following:"
 msgstr ""

-#: ../../mod/dfrn_request.php:799
+#: ../../mod/dfrn_request.php:805
 #, php-format
 msgid "Does %s know you?"
 msgstr ""

-#: ../../mod/dfrn_request.php:802
+#: ../../mod/dfrn_request.php:808
 msgid "Add a personal note:"
 msgstr ""

-#: ../../mod/dfrn_request.php:804 ../../include/contact_selectors.php:76
+#: ../../mod/dfrn_request.php:810 ../../include/contact_selectors.php:76
 msgid "Friendica"
 msgstr ""

-#: ../../mod/dfrn_request.php:805
+#: ../../mod/dfrn_request.php:811
 msgid "StatusNet/Federated Social Web"
 msgstr ""

-#: ../../mod/dfrn_request.php:806 ../../mod/settings.php:629
+#: ../../mod/dfrn_request.php:812 ../../mod/settings.php:636
 #: ../../include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr ""

-#: ../../mod/dfrn_request.php:807
+#: ../../mod/dfrn_request.php:813
 #, php-format
 msgid ""
 " - please do not use this form.  Instead, enter %s into your Diaspora search "
 "bar."
 msgstr ""

-#: ../../mod/dfrn_request.php:808
+#: ../../mod/dfrn_request.php:814
 msgid "Your Identity Address:"
 msgstr ""

-#: ../../mod/dfrn_request.php:811
+#: ../../mod/dfrn_request.php:817
 msgid "Submit Request"
 msgstr ""

@ -1164,7 +1165,7 @@ msgid "is interested in:"
 msgstr ""

 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1027
+#: ../../include/contact_widgets.php:9 ../../boot.php:1036
 msgid "Connect"
 msgstr ""

@ -1195,8 +1196,8 @@ msgid "Discard"
 msgstr ""

 #: ../../mod/notifications.php:51 ../../mod/notifications.php:160
-#: ../../mod/notifications.php:206 ../../mod/contacts.php:279
-#: ../../mod/contacts.php:322
+#: ../../mod/notifications.php:206 ../../mod/contacts.php:296
+#: ../../mod/contacts.php:348
 msgid "Ignore"
 msgstr ""

@ -1208,11 +1209,11 @@ msgstr ""
 msgid "Network"
 msgstr ""

-#: ../../mod/notifications.php:85 ../../mod/network.php:182
+#: ../../mod/notifications.php:85 ../../mod/network.php:184
 msgid "Personal"
 msgstr ""

-#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:246
+#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:65
 #: ../../include/nav.php:77 ../../include/nav.php:115
 msgid "Home"
 msgstr ""
@ -1248,7 +1249,7 @@ msgid "suggested by %s"
 msgstr ""

 #: ../../mod/notifications.php:153 ../../mod/notifications.php:200
-#: ../../mod/contacts.php:327
+#: ../../mod/contacts.php:354
 msgid "Hide this contact from others"
 msgstr ""

@ -1261,7 +1262,7 @@ msgid "if applicable"
 msgstr ""

 #: ../../mod/notifications.php:157 ../../mod/notifications.php:204
-#: ../../mod/admin.php:575
+#: ../../mod/admin.php:642
 msgid "Approve"
 msgstr ""

@ -1398,207 +1399,275 @@ msgstr ""
 msgid "Contact has been unignored"
 msgstr ""

-#: ../../mod/contacts.php:192
+#: ../../mod/contacts.php:195
+msgid "Contact has been archived"
+msgstr ""
+
+#: ../../mod/contacts.php:195
+msgid "Contact has been unarchived"
+msgstr ""
+
+#: ../../mod/contacts.php:208
 msgid "Contact has been removed."
 msgstr ""

-#: ../../mod/contacts.php:222
+#: ../../mod/contacts.php:238
 #, php-format
 msgid "You are mutual friends with %s"
 msgstr ""

-#: ../../mod/contacts.php:226
+#: ../../mod/contacts.php:242
 #, php-format
 msgid "You are sharing with %s"
 msgstr ""

-#: ../../mod/contacts.php:231
+#: ../../mod/contacts.php:247
 #, php-format
 msgid "%s is sharing with you"
 msgstr ""

-#: ../../mod/contacts.php:248
+#: ../../mod/contacts.php:264
 msgid "Private communications are not available for this contact."
 msgstr ""

-#: ../../mod/contacts.php:251
+#: ../../mod/contacts.php:267
 msgid "Never"
 msgstr ""

-#: ../../mod/contacts.php:255
+#: ../../mod/contacts.php:271
 msgid "(Update was successful)"
 msgstr ""

-#: ../../mod/contacts.php:255
+#: ../../mod/contacts.php:271
 msgid "(Update was not successful)"
 msgstr ""

-#: ../../mod/contacts.php:257
+#: ../../mod/contacts.php:273
 msgid "Suggest friends"
 msgstr ""

-#: ../../mod/contacts.php:261
+#: ../../mod/contacts.php:277
 #, php-format
 msgid "Network type: %s"
 msgstr ""

-#: ../../mod/contacts.php:264
+#: ../../mod/contacts.php:280 ../../include/contact_widgets.php:183
 #, php-format
 msgid "%d contact in common"
 msgid_plural "%d contacts in common"
 msgstr[0] ""
 msgstr[1] ""

-#: ../../mod/contacts.php:269
+#: ../../mod/contacts.php:285
 msgid "View all contacts"
 msgstr ""

-#: ../../mod/contacts.php:274 ../../mod/contacts.php:321
-#: ../../mod/admin.php:579
+#: ../../mod/contacts.php:290 ../../mod/contacts.php:347
+#: ../../mod/admin.php:646
 msgid "Unblock"
 msgstr ""

-#: ../../mod/contacts.php:274 ../../mod/contacts.php:321
-#: ../../mod/admin.php:578
+#: ../../mod/contacts.php:290 ../../mod/contacts.php:347
+#: ../../mod/admin.php:645
 msgid "Block"
 msgstr ""

-#: ../../mod/contacts.php:279 ../../mod/contacts.php:322
+#: ../../mod/contacts.php:293
+msgid "Toggle Blocked status"
+msgstr ""
+
+#: ../../mod/contacts.php:296 ../../mod/contacts.php:348
 msgid "Unignore"
 msgstr ""

-#: ../../mod/contacts.php:284
+#: ../../mod/contacts.php:299
+msgid "Toggle Ignored status"
+msgstr ""
+
+#: ../../mod/contacts.php:303
+msgid "Unarchive"
+msgstr ""
+
+#: ../../mod/contacts.php:303
+msgid "Archive"
+msgstr ""
+
+#: ../../mod/contacts.php:306
+msgid "Toggle Archive status"
+msgstr ""
+
+#: ../../mod/contacts.php:309
 msgid "Repair"
 msgstr ""

-#: ../../mod/contacts.php:294
+#: ../../mod/contacts.php:312
+msgid "Advanced Contact Settings"
+msgstr ""
+
+#: ../../mod/contacts.php:320
 msgid "Contact Editor"
 msgstr ""

-#: ../../mod/contacts.php:297
+#: ../../mod/contacts.php:323
 msgid "Profile Visibility"
 msgstr ""

-#: ../../mod/contacts.php:298
+#: ../../mod/contacts.php:324
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr ""

-#: ../../mod/contacts.php:299
+#: ../../mod/contacts.php:325
 msgid "Contact Information / Notes"
 msgstr ""

-#: ../../mod/contacts.php:300
+#: ../../mod/contacts.php:326
 msgid "Edit contact notes"
 msgstr ""

-#: ../../mod/contacts.php:305 ../../mod/contacts.php:478
+#: ../../mod/contacts.php:331 ../../mod/contacts.php:522
 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr ""

-#: ../../mod/contacts.php:306
+#: ../../mod/contacts.php:332
 msgid "Block/Unblock contact"
 msgstr ""

-#: ../../mod/contacts.php:307
+#: ../../mod/contacts.php:333
 msgid "Ignore contact"
 msgstr ""

-#: ../../mod/contacts.php:308
+#: ../../mod/contacts.php:334
 msgid "Repair URL settings"
 msgstr ""

-#: ../../mod/contacts.php:309
+#: ../../mod/contacts.php:335
 msgid "View conversations"
 msgstr ""

-#: ../../mod/contacts.php:311
+#: ../../mod/contacts.php:337
 msgid "Delete contact"
 msgstr ""

-#: ../../mod/contacts.php:315
+#: ../../mod/contacts.php:341
 msgid "Last update:"
 msgstr ""

-#: ../../mod/contacts.php:316
+#: ../../mod/contacts.php:342
 msgid "Update public posts"
 msgstr ""

-#: ../../mod/contacts.php:318 ../../mod/admin.php:1051
+#: ../../mod/contacts.php:344 ../../mod/admin.php:1117
 msgid "Update now"
 msgstr ""

-#: ../../mod/contacts.php:325
+#: ../../mod/contacts.php:351
 msgid "Currently blocked"
 msgstr ""

-#: ../../mod/contacts.php:326
+#: ../../mod/contacts.php:352
 msgid "Currently ignored"
 msgstr ""

-#: ../../mod/contacts.php:327
+#: ../../mod/contacts.php:353
+msgid "Currently archived"
+msgstr ""
+
+#: ../../mod/contacts.php:354
 msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr ""

-#: ../../mod/contacts.php:376
+#: ../../mod/contacts.php:407
 msgid "Suggestions"
 msgstr ""

-#: ../../mod/contacts.php:381 ../../mod/group.php:191
+#: ../../mod/contacts.php:410
+msgid "Suggest potential friends"
+msgstr ""
+
+#: ../../mod/contacts.php:413 ../../mod/group.php:191
 msgid "All Contacts"
 msgstr ""

-#: ../../mod/contacts.php:386
-msgid "Unblocked Contacts"
+#: ../../mod/contacts.php:416
+msgid "Show all contacts"
 msgstr ""

-#: ../../mod/contacts.php:392
-msgid "Blocked Contacts"
+#: ../../mod/contacts.php:419
+msgid "Unblocked"
 msgstr ""

-#: ../../mod/contacts.php:398
-msgid "Ignored Contacts"
+#: ../../mod/contacts.php:422
+msgid "Only show unblocked contacts"
 msgstr ""

-#: ../../mod/contacts.php:404
-msgid "Hidden Contacts"
+#: ../../mod/contacts.php:426
+msgid "Blocked"
 msgstr ""

-#: ../../mod/contacts.php:454
+#: ../../mod/contacts.php:429
+msgid "Only show blocked contacts"
+msgstr ""
+
+#: ../../mod/contacts.php:433
+msgid "Ignored"
+msgstr ""
+
+#: ../../mod/contacts.php:436
+msgid "Only show ignored contacts"
+msgstr ""
+
+#: ../../mod/contacts.php:440
+msgid "Archived"
+msgstr ""
+
+#: ../../mod/contacts.php:443
+msgid "Only show archived contacts"
+msgstr ""
+
+#: ../../mod/contacts.php:447
+msgid "Hidden"
+msgstr ""
+
+#: ../../mod/contacts.php:450
+msgid "Only show hidden contacts"
+msgstr ""
+
+#: ../../mod/contacts.php:498
 msgid "Mutual Friendship"
 msgstr ""

-#: ../../mod/contacts.php:458
+#: ../../mod/contacts.php:502
 msgid "is a fan of yours"
 msgstr ""

-#: ../../mod/contacts.php:462
+#: ../../mod/contacts.php:506
 msgid "you are a fan of"
 msgstr ""

-#: ../../mod/contacts.php:479 ../../mod/nogroup.php:41
+#: ../../mod/contacts.php:523 ../../mod/nogroup.php:41
 msgid "Edit contact"
 msgstr ""

-#: ../../mod/contacts.php:500 ../../view/theme/diabook/theme.php:248
+#: ../../mod/contacts.php:544 ../../view/theme/diabook/theme.php:67
 #: ../../include/nav.php:139
 msgid "Contacts"
 msgstr ""

-#: ../../mod/contacts.php:504
+#: ../../mod/contacts.php:548
 msgid "Search your contacts"
 msgstr ""

-#: ../../mod/contacts.php:505 ../../mod/directory.php:57
+#: ../../mod/contacts.php:549 ../../mod/directory.php:57
 msgid "Finding: "
 msgstr ""

-#: ../../mod/contacts.php:506 ../../mod/directory.php:59
+#: ../../mod/contacts.php:550 ../../mod/directory.php:59
 #: ../../include/contact_widgets.php:33
 msgid "Find"
 msgstr ""
@ -1618,10 +1687,11 @@ 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:732
-#: ../../addon/facebook/facebook.php:650
-#: ../../addon/facebook/facebook.php:1139
-#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2700
+#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:742
+#: ../../addon/facebook/facebook.php:658
+#: ../../addon/facebook/facebook.php:1148
+#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2716
+#: ../../boot.php:686
 msgid "Administrator"
 msgstr ""

@ -1631,7 +1701,7 @@ msgid ""
 "Password reset failed."
 msgstr ""

-#: ../../mod/lostpass.php:83 ../../boot.php:809
+#: ../../mod/lostpass.php:83 ../../boot.php:818
 msgid "Password Reset"
 msgstr ""

@ -1699,61 +1769,64 @@ msgstr ""
 msgid "Export personal data"
 msgstr ""

-#: ../../mod/settings.php:83 ../../mod/admin.php:665 ../../mod/admin.php:870
+#: ../../mod/settings.php:80
+msgid "Remove account"
+msgstr ""
+
+#: ../../mod/settings.php:88 ../../mod/admin.php:732 ../../mod/admin.php:937
 #: ../../addon/mathjax/mathjax.php:36 ../../include/nav.php:137
 msgid "Settings"
 msgstr ""

-#: ../../mod/settings.php:126
+#: ../../mod/settings.php:131
 msgid "Missing some important data!"
 msgstr ""

-#: ../../mod/settings.php:129 ../../mod/settings.php:558
-#: ../../mod/admin.php:97
+#: ../../mod/settings.php:134 ../../mod/settings.php:565
 msgid "Update"
 msgstr ""

-#: ../../mod/settings.php:234
+#: ../../mod/settings.php:239
 msgid "Failed to connect with email account using the settings provided."
 msgstr ""

-#: ../../mod/settings.php:239
+#: ../../mod/settings.php:244
 msgid "Email settings updated."
 msgstr ""

-#: ../../mod/settings.php:298
+#: ../../mod/settings.php:303
 msgid "Passwords do not match. Password unchanged."
 msgstr ""

-#: ../../mod/settings.php:303
+#: ../../mod/settings.php:308
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""

-#: ../../mod/settings.php:314
+#: ../../mod/settings.php:319
 msgid "Password changed."
 msgstr ""

-#: ../../mod/settings.php:316
+#: ../../mod/settings.php:321
 msgid "Password update failed. Please try again."
 msgstr ""

-#: ../../mod/settings.php:379
+#: ../../mod/settings.php:385
 msgid " Please use a shorter name."
 msgstr ""

-#: ../../mod/settings.php:381
+#: ../../mod/settings.php:387
 msgid " Name too short."
 msgstr ""

-#: ../../mod/settings.php:387
+#: ../../mod/settings.php:393
 msgid " Not valid email."
 msgstr ""

-#: ../../mod/settings.php:389
+#: ../../mod/settings.php:395
 msgid " Cannot change to that email."
 msgstr ""

-#: ../../mod/settings.php:461 ../../addon/facebook/facebook.php:469
+#: ../../mod/settings.php:468 ../../addon/facebook/facebook.php:470
 #: ../../addon/impressum/impressum.php:77
 #: ../../addon/openstreetmap/openstreetmap.php:80
 #: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105
@ -1761,405 +1834,409 @@ msgstr ""
 msgid "Settings updated."
 msgstr ""

-#: ../../mod/settings.php:531 ../../mod/settings.php:557
-#: ../../mod/settings.php:593
+#: ../../mod/settings.php:538 ../../mod/settings.php:564
+#: ../../mod/settings.php:600
 msgid "Add application"
 msgstr ""

-#: ../../mod/settings.php:535 ../../mod/settings.php:561
+#: ../../mod/settings.php:542 ../../mod/settings.php:568
 #: ../../addon/statusnet/statusnet.php:547
 msgid "Consumer Key"
 msgstr ""

-#: ../../mod/settings.php:536 ../../mod/settings.php:562
+#: ../../mod/settings.php:543 ../../mod/settings.php:569
 #: ../../addon/statusnet/statusnet.php:546
 msgid "Consumer Secret"
 msgstr ""

-#: ../../mod/settings.php:537 ../../mod/settings.php:563
+#: ../../mod/settings.php:544 ../../mod/settings.php:570
 msgid "Redirect"
 msgstr ""

-#: ../../mod/settings.php:538 ../../mod/settings.php:564
+#: ../../mod/settings.php:545 ../../mod/settings.php:571
 msgid "Icon url"
 msgstr ""

-#: ../../mod/settings.php:549
+#: ../../mod/settings.php:556
 msgid "You can't edit this application."
 msgstr ""

-#: ../../mod/settings.php:592
+#: ../../mod/settings.php:599
 msgid "Connected Apps"
 msgstr ""

-#: ../../mod/settings.php:596
+#: ../../mod/settings.php:603
 msgid "Client key starts with"
 msgstr ""

-#: ../../mod/settings.php:597
+#: ../../mod/settings.php:604
 msgid "No name"
 msgstr ""

-#: ../../mod/settings.php:598
+#: ../../mod/settings.php:605
 msgid "Remove authorization"
 msgstr ""

-#: ../../mod/settings.php:609
+#: ../../mod/settings.php:616
 msgid "No Plugin settings configured"
 msgstr ""

-#: ../../mod/settings.php:617 ../../addon/widgets/widgets.php:123
+#: ../../mod/settings.php:624 ../../addon/widgets/widgets.php:123
 msgid "Plugin Settings"
 msgstr ""

-#: ../../mod/settings.php:629 ../../mod/settings.php:630
+#: ../../mod/settings.php:636 ../../mod/settings.php:637
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr ""

-#: ../../mod/settings.php:629 ../../mod/settings.php:630
+#: ../../mod/settings.php:636 ../../mod/settings.php:637
 msgid "enabled"
 msgstr ""

-#: ../../mod/settings.php:629 ../../mod/settings.php:630
+#: ../../mod/settings.php:636 ../../mod/settings.php:637
 msgid "disabled"
 msgstr ""

-#: ../../mod/settings.php:630
+#: ../../mod/settings.php:637
 msgid "StatusNet"
 msgstr ""

-#: ../../mod/settings.php:660
+#: ../../mod/settings.php:667
 msgid "Connector Settings"
 msgstr ""

-#: ../../mod/settings.php:665
+#: ../../mod/settings.php:672
 msgid "Email/Mailbox Setup"
 msgstr ""

-#: ../../mod/settings.php:666
+#: ../../mod/settings.php:673
 msgid ""
 "If you wish to communicate with email contacts using this service "
 "(optional), please specify how to connect to your mailbox."
 msgstr ""

-#: ../../mod/settings.php:667
+#: ../../mod/settings.php:674
 msgid "Last successful email check:"
 msgstr ""

-#: ../../mod/settings.php:668
+#: ../../mod/settings.php:675
 msgid "Email access is disabled on this site."
 msgstr ""

-#: ../../mod/settings.php:669
+#: ../../mod/settings.php:676
 msgid "IMAP server name:"
 msgstr ""

-#: ../../mod/settings.php:670
+#: ../../mod/settings.php:677
 msgid "IMAP port:"
 msgstr ""

-#: ../../mod/settings.php:671
+#: ../../mod/settings.php:678
 msgid "Security:"
 msgstr ""

-#: ../../mod/settings.php:671 ../../mod/settings.php:676
+#: ../../mod/settings.php:678 ../../mod/settings.php:683
 msgid "None"
 msgstr ""

-#: ../../mod/settings.php:672
+#: ../../mod/settings.php:679
 msgid "Email login name:"
 msgstr ""

-#: ../../mod/settings.php:673
+#: ../../mod/settings.php:680
 msgid "Email password:"
 msgstr ""

-#: ../../mod/settings.php:674
+#: ../../mod/settings.php:681
 msgid "Reply-to address:"
 msgstr ""

-#: ../../mod/settings.php:675
+#: ../../mod/settings.php:682
 msgid "Send public posts to all email contacts:"
 msgstr ""

-#: ../../mod/settings.php:676
+#: ../../mod/settings.php:683
 msgid "Action after import:"
 msgstr ""

-#: ../../mod/settings.php:676
+#: ../../mod/settings.php:683
 msgid "Mark as seen"
 msgstr ""

-#: ../../mod/settings.php:676
+#: ../../mod/settings.php:683
 msgid "Move to folder"
 msgstr ""

-#: ../../mod/settings.php:677
+#: ../../mod/settings.php:684
 msgid "Move to folder:"
 msgstr ""

-#: ../../mod/settings.php:737
+#: ../../mod/settings.php:744
 msgid "Display Settings"
 msgstr ""

-#: ../../mod/settings.php:743
+#: ../../mod/settings.php:750
 msgid "Display Theme:"
 msgstr ""

-#: ../../mod/settings.php:744
+#: ../../mod/settings.php:751
 msgid "Update browser every xx seconds"
 msgstr ""

-#: ../../mod/settings.php:744
+#: ../../mod/settings.php:751
 msgid "Minimum of 10 seconds, no maximum"
 msgstr ""

-#: ../../mod/settings.php:745
+#: ../../mod/settings.php:752
 msgid "Number of items to display on the network page:"
 msgstr ""

-#: ../../mod/settings.php:745
+#: ../../mod/settings.php:752
 msgid "Maximum of 100 items"
 msgstr ""

-#: ../../mod/settings.php:746
+#: ../../mod/settings.php:753
 msgid "Don't show emoticons"
 msgstr ""

-#: ../../mod/settings.php:811 ../../mod/admin.php:173 ../../mod/admin.php:551
+#: ../../mod/settings.php:821 ../../mod/admin.php:180 ../../mod/admin.php:618
 msgid "Normal Account"
 msgstr ""

-#: ../../mod/settings.php:812
+#: ../../mod/settings.php:822
 msgid "This account is a normal personal profile"
 msgstr ""

-#: ../../mod/settings.php:815 ../../mod/admin.php:174 ../../mod/admin.php:552
+#: ../../mod/settings.php:825 ../../mod/admin.php:181 ../../mod/admin.php:619
 msgid "Soapbox Account"
 msgstr ""

-#: ../../mod/settings.php:816
+#: ../../mod/settings.php:826
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr ""

-#: ../../mod/settings.php:819 ../../mod/admin.php:175 ../../mod/admin.php:553
+#: ../../mod/settings.php:829 ../../mod/admin.php:182 ../../mod/admin.php:620
 msgid "Community/Celebrity Account"
 msgstr ""

-#: ../../mod/settings.php:820
+#: ../../mod/settings.php:830
 msgid "Automatically approve all connection/friend requests as read-write fans"
 msgstr ""

-#: ../../mod/settings.php:823 ../../mod/admin.php:176 ../../mod/admin.php:554
+#: ../../mod/settings.php:833 ../../mod/admin.php:183 ../../mod/admin.php:621
 msgid "Automatic Friend Account"
 msgstr ""

-#: ../../mod/settings.php:824
+#: ../../mod/settings.php:834
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr ""

-#: ../../mod/settings.php:834
+#: ../../mod/settings.php:844
 msgid "OpenID:"
 msgstr ""

-#: ../../mod/settings.php:834
+#: ../../mod/settings.php:844
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr ""

-#: ../../mod/settings.php:844
+#: ../../mod/settings.php:854
 msgid "Publish your default profile in your local site directory?"
 msgstr ""

-#: ../../mod/settings.php:850
+#: ../../mod/settings.php:860
 msgid "Publish your default profile in the global social directory?"
 msgstr ""

-#: ../../mod/settings.php:858
+#: ../../mod/settings.php:868
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr ""

-#: ../../mod/settings.php:862
+#: ../../mod/settings.php:872
 msgid "Hide your profile details from unknown viewers?"
 msgstr ""

-#: ../../mod/settings.php:867
+#: ../../mod/settings.php:877
 msgid "Allow friends to post to your profile page?"
 msgstr ""

-#: ../../mod/settings.php:873
+#: ../../mod/settings.php:883
 msgid "Allow friends to tag your posts?"
 msgstr ""

-#: ../../mod/settings.php:879
+#: ../../mod/settings.php:889
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""

-#: ../../mod/settings.php:885
+#: ../../mod/settings.php:895
 msgid "Permit unknown people to send you private mail?"
 msgstr ""

-#: ../../mod/settings.php:896
+#: ../../mod/settings.php:906
 msgid "Profile is <strong>not published</strong>."
 msgstr ""

-#: ../../mod/settings.php:902 ../../mod/profile_photo.php:211
+#: ../../mod/settings.php:912 ../../mod/profile_photo.php:211
 msgid "or"
 msgstr ""

-#: ../../mod/settings.php:907
+#: ../../mod/settings.php:917
 msgid "Your Identity Address is"
 msgstr ""

-#: ../../mod/settings.php:918
+#: ../../mod/settings.php:928
 msgid "Automatically expire posts after this many days:"
 msgstr ""

-#: ../../mod/settings.php:918
+#: ../../mod/settings.php:928
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr ""

-#: ../../mod/settings.php:919
+#: ../../mod/settings.php:929
 msgid "Advanced expiration settings"
 msgstr ""

-#: ../../mod/settings.php:920
+#: ../../mod/settings.php:930
 msgid "Advanced Expiration"
 msgstr ""

-#: ../../mod/settings.php:921
+#: ../../mod/settings.php:931
 msgid "Expire posts:"
 msgstr ""

-#: ../../mod/settings.php:922
+#: ../../mod/settings.php:932
 msgid "Expire personal notes:"
 msgstr ""

-#: ../../mod/settings.php:923
+#: ../../mod/settings.php:933
 msgid "Expire starred posts:"
 msgstr ""

-#: ../../mod/settings.php:924
+#: ../../mod/settings.php:934
 msgid "Expire photos:"
 msgstr ""

-#: ../../mod/settings.php:928
+#: ../../mod/settings.php:938
 msgid "Account Settings"
 msgstr ""

-#: ../../mod/settings.php:937
+#: ../../mod/settings.php:947
 msgid "Password Settings"
 msgstr ""

-#: ../../mod/settings.php:938
+#: ../../mod/settings.php:948
 msgid "New Password:"
 msgstr ""

-#: ../../mod/settings.php:939
+#: ../../mod/settings.php:949
 msgid "Confirm:"
 msgstr ""

-#: ../../mod/settings.php:939
+#: ../../mod/settings.php:949
 msgid "Leave password fields blank unless changing"
 msgstr ""

-#: ../../mod/settings.php:943
+#: ../../mod/settings.php:953
 msgid "Basic Settings"
 msgstr ""

-#: ../../mod/settings.php:944 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:954 ../../include/profile_advanced.php:15
 msgid "Full Name:"
 msgstr ""

-#: ../../mod/settings.php:945
+#: ../../mod/settings.php:955
 msgid "Email Address:"
 msgstr ""

-#: ../../mod/settings.php:946
+#: ../../mod/settings.php:956
 msgid "Your Timezone:"
 msgstr ""

-#: ../../mod/settings.php:947
+#: ../../mod/settings.php:957
 msgid "Default Post Location:"
 msgstr ""

-#: ../../mod/settings.php:948
+#: ../../mod/settings.php:958
 msgid "Use Browser Location:"
 msgstr ""

-#: ../../mod/settings.php:951
+#: ../../mod/settings.php:961
 msgid "Security and Privacy Settings"
 msgstr ""

-#: ../../mod/settings.php:953
+#: ../../mod/settings.php:963
 msgid "Maximum Friend Requests/Day:"
 msgstr ""

-#: ../../mod/settings.php:953 ../../mod/settings.php:968
+#: ../../mod/settings.php:963 ../../mod/settings.php:978
 msgid "(to prevent spam abuse)"
 msgstr ""

-#: ../../mod/settings.php:954
+#: ../../mod/settings.php:964
 msgid "Default Post Permissions"
 msgstr ""

-#: ../../mod/settings.php:955
+#: ../../mod/settings.php:965
 msgid "(click to open/close)"
 msgstr ""

-#: ../../mod/settings.php:968
+#: ../../mod/settings.php:978
 msgid "Maximum private messages per day from unknown people:"
 msgstr ""

-#: ../../mod/settings.php:971
+#: ../../mod/settings.php:981
 msgid "Notification Settings"
 msgstr ""

-#: ../../mod/settings.php:972
+#: ../../mod/settings.php:982
 msgid "By default post a status message when:"
 msgstr ""

-#: ../../mod/settings.php:973
+#: ../../mod/settings.php:983
 msgid "accepting a friend request"
 msgstr ""

-#: ../../mod/settings.php:974
-msgid "making an <em>interesting</em> profile change"
-msgstr ""
-
-#: ../../mod/settings.php:975
-msgid "Send a notification email when:"
-msgstr ""
-
-#: ../../mod/settings.php:976
-msgid "You receive an introduction"
-msgstr ""
-
-#: ../../mod/settings.php:977
-msgid "Your introductions are confirmed"
-msgstr ""
-
-#: ../../mod/settings.php:978
-msgid "Someone writes on your profile wall"
-msgstr ""
-
-#: ../../mod/settings.php:979
-msgid "Someone writes a followup comment"
-msgstr ""
-
-#: ../../mod/settings.php:980
-msgid "You receive a private message"
-msgstr ""
-
-#: ../../mod/settings.php:981
-msgid "You receive a friend suggestion"
-msgstr ""
-
-#: ../../mod/settings.php:982
-msgid "You are tagged in a post"
+#: ../../mod/settings.php:984
+msgid "joining a forum/community"
 msgstr ""

 #: ../../mod/settings.php:985
+msgid "making an <em>interesting</em> profile change"
+msgstr ""
+
+#: ../../mod/settings.php:986
+msgid "Send a notification email when:"
+msgstr ""
+
+#: ../../mod/settings.php:987
+msgid "You receive an introduction"
+msgstr ""
+
+#: ../../mod/settings.php:988
+msgid "Your introductions are confirmed"
+msgstr ""
+
+#: ../../mod/settings.php:989
+msgid "Someone writes on your profile wall"
+msgstr ""
+
+#: ../../mod/settings.php:990
+msgid "Someone writes a followup comment"
+msgstr ""
+
+#: ../../mod/settings.php:991
+msgid "You receive a private message"
+msgstr ""
+
+#: ../../mod/settings.php:992
+msgid "You receive a friend suggestion"
+msgstr ""
+
+#: ../../mod/settings.php:993
+msgid "You are tagged in a post"
+msgstr ""
+
+#: ../../mod/settings.php:996
 msgid "Advanced Page Settings"
 msgstr ""

@ -2197,23 +2274,47 @@ msgstr ""
 msgid "Commented Order"
 msgstr ""

-#: ../../mod/network.php:176
+#: ../../mod/network.php:174
+msgid "Sort by Comment Date"
+msgstr ""
+
+#: ../../mod/network.php:177
 msgid "Posted Order"
 msgstr ""

+#: ../../mod/network.php:180
+msgid "Sort by Post Date"
+msgstr ""
+
 #: ../../mod/network.php:187
+msgid "Posts that mention or involve you"
+msgstr ""
+
+#: ../../mod/network.php:190
 msgid "New"
 msgstr ""

-#: ../../mod/network.php:192
+#: ../../mod/network.php:193
+msgid "Activity Stream - by date"
+msgstr ""
+
+#: ../../mod/network.php:196
 msgid "Starred"
 msgstr ""

-#: ../../mod/network.php:197
+#: ../../mod/network.php:199
+msgid "Favourite Posts"
+msgstr ""
+
+#: ../../mod/network.php:202
 msgid "Shared Links"
 msgstr ""

-#: ../../mod/network.php:274
+#: ../../mod/network.php:205
+msgid "Interesting Links"
+msgstr ""
+
+#: ../../mod/network.php:281
 #, php-format
 msgid "Warning: This group contains %s member from an insecure network."
 msgid_plural ""
@ -2221,40 +2322,40 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""

-#: ../../mod/network.php:277
+#: ../../mod/network.php:284
 msgid "Private messages to this group are at risk of public disclosure."
 msgstr ""

-#: ../../mod/network.php:322
+#: ../../mod/network.php:329
 msgid "No such group"
 msgstr ""

-#: ../../mod/network.php:333
+#: ../../mod/network.php:340
 msgid "Group is empty"
 msgstr ""

-#: ../../mod/network.php:337
+#: ../../mod/network.php:344
 msgid "Group: "
 msgstr ""

-#: ../../mod/network.php:347
+#: ../../mod/network.php:354
 msgid "Contact: "
 msgstr ""

-#: ../../mod/network.php:349
+#: ../../mod/network.php:356
 msgid "Private messages to this person are at risk of public disclosure."
 msgstr ""

-#: ../../mod/network.php:354
+#: ../../mod/network.php:361
 msgid "Invalid contact."
 msgstr ""

-#: ../../mod/notes.php:44 ../../boot.php:1486
+#: ../../mod/notes.php:44 ../../boot.php:1499
 msgid "Personal Notes"
 msgstr ""

 #: ../../mod/notes.php:63 ../../mod/filer.php:30
-#: ../../addon/facebook/facebook.php:717
+#: ../../addon/facebook/facebook.php:726
 #: ../../addon/privacy_image_cache/privacy_image_cache.php:147
 #: ../../include/text.php:652
 msgid "Save"
@ -2290,7 +2391,7 @@ msgid "No recipient."
 msgstr ""

 #: ../../mod/wallmessage.php:124 ../../mod/message.php:169
-#: ../../include/conversation.php:910
+#: ../../include/conversation.php:918
 msgid "Please enter a link URL:"
 msgstr ""

@ -2458,7 +2559,7 @@ msgstr ""
 msgid "Group name changed."
 msgstr ""

-#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:308
+#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:305
 msgid "Permission denied"
 msgstr ""

@ -2498,9 +2599,9 @@ msgstr ""
 msgid "Profile Visibility Editor"
 msgstr ""

-#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:247
+#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:66
 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74
-#: ../../include/nav.php:50 ../../boot.php:1468
+#: ../../include/nav.php:50 ../../boot.php:1478
 msgid "Profile"
 msgstr ""

@ -2649,7 +2750,7 @@ msgstr ""
 msgid "Your invitation ID: "
 msgstr ""

-#: ../../mod/register.php:553 ../../mod/admin.php:393
+#: ../../mod/register.php:553 ../../mod/admin.php:403
 msgid "Registration"
 msgstr ""

@ -2672,7 +2773,7 @@ msgstr ""
 msgid "Choose a nickname: "
 msgstr ""

-#: ../../mod/register.php:567 ../../include/nav.php:81 ../../boot.php:775
+#: ../../mod/register.php:567 ../../include/nav.php:81 ../../boot.php:784
 msgid "Register"
 msgstr ""

@ -2681,19 +2782,19 @@ msgid "People Search"
 msgstr ""

 #: ../../mod/like.php:127 ../../mod/tagger.php:70
-#: ../../addon/facebook/facebook.php:1533
+#: ../../addon/facebook/facebook.php:1542
 #: ../../addon/communityhome/communityhome.php:158
 #: ../../addon/communityhome/communityhome.php:167
-#: ../../view/theme/diabook/theme.php:97
-#: ../../view/theme/diabook/theme.php:106 ../../include/diaspora.php:1654
+#: ../../view/theme/diabook/theme.php:403
+#: ../../view/theme/diabook/theme.php:412 ../../include/diaspora.php:1654
 #: ../../include/conversation.php:48 ../../include/conversation.php:57
 #: ../../include/conversation.php:121 ../../include/conversation.php:130
 msgid "status"
 msgstr ""

-#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1537
+#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1546
 #: ../../addon/communityhome/communityhome.php:172
-#: ../../view/theme/diabook/theme.php:111 ../../include/diaspora.php:1670
+#: ../../view/theme/diabook/theme.php:417 ../../include/diaspora.php:1670
 #: ../../include/conversation.php:65
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
@ -2704,9 +2805,9 @@ msgstr ""
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""

-#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:149
-#: ../../mod/admin.php:614 ../../mod/admin.php:813 ../../mod/display.php:37
-#: ../../mod/display.php:142 ../../include/items.php:3083
+#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:156
+#: ../../mod/admin.php:681 ../../mod/admin.php:880 ../../mod/display.php:37
+#: ../../mod/display.php:142 ../../include/items.php:3099
 msgid "Item not found."
 msgstr ""

@ -2714,8 +2815,8 @@ msgstr ""
 msgid "Access denied."
 msgstr ""

-#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:249
-#: ../../include/nav.php:51 ../../boot.php:1473
+#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:68
+#: ../../include/nav.php:51 ../../boot.php:1484
 msgid "Photos"
 msgstr ""

@ -2750,28 +2851,28 @@ msgstr ""
 msgid "Wall Photos"
 msgstr ""

-#: ../../mod/item.php:762
+#: ../../mod/item.php:781
 msgid "System error. Post not saved."
 msgstr ""

-#: ../../mod/item.php:787
+#: ../../mod/item.php:806
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social network."
 msgstr ""

-#: ../../mod/item.php:789
+#: ../../mod/item.php:808
 #, php-format
 msgid "You may visit them online at %s"
 msgstr ""

-#: ../../mod/item.php:790
+#: ../../mod/item.php:809
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr ""

-#: ../../mod/item.php:792
+#: ../../mod/item.php:811
 #, php-format
 msgid "%s posted an update."
 msgstr ""
@ -2936,489 +3037,563 @@ msgstr ""
 msgid "Theme settings updated."
 msgstr ""

-#: ../../mod/admin.php:93 ../../mod/admin.php:391
+#: ../../mod/admin.php:96 ../../mod/admin.php:401
 msgid "Site"
 msgstr ""

-#: ../../mod/admin.php:94 ../../mod/admin.php:569 ../../mod/admin.php:581
+#: ../../mod/admin.php:97 ../../mod/admin.php:636 ../../mod/admin.php:648
 msgid "Users"
 msgstr ""

-#: ../../mod/admin.php:95 ../../mod/admin.php:663 ../../mod/admin.php:705
+#: ../../mod/admin.php:98 ../../mod/admin.php:730 ../../mod/admin.php:772
 msgid "Plugins"
 msgstr ""

-#: ../../mod/admin.php:96 ../../mod/admin.php:868 ../../mod/admin.php:904
+#: ../../mod/admin.php:99 ../../mod/admin.php:935 ../../mod/admin.php:971
 msgid "Themes"
 msgstr ""

-#: ../../mod/admin.php:111 ../../mod/admin.php:992
+#: ../../mod/admin.php:100
+msgid "DB updates"
+msgstr ""
+
+#: ../../mod/admin.php:101
+msgid "Software Update"
+msgstr ""
+
+#: ../../mod/admin.php:115 ../../mod/admin.php:1058
 msgid "Logs"
 msgstr ""

-#: ../../mod/admin.php:116
+#: ../../mod/admin.php:120
 msgid "User registrations waiting for confirmation"
 msgstr ""

-#: ../../mod/admin.php:188 ../../mod/admin.php:390 ../../mod/admin.php:568
-#: ../../mod/admin.php:662 ../../mod/admin.php:704 ../../mod/admin.php:867
-#: ../../mod/admin.php:903 ../../mod/admin.php:991
+#: ../../mod/admin.php:195 ../../mod/admin.php:400 ../../mod/admin.php:635
+#: ../../mod/admin.php:729 ../../mod/admin.php:771 ../../mod/admin.php:934
+#: ../../mod/admin.php:970 ../../mod/admin.php:1057
 msgid "Administration"
 msgstr ""

-#: ../../mod/admin.php:189
+#: ../../mod/admin.php:196
 msgid "Summary"
 msgstr ""

-#: ../../mod/admin.php:190
+#: ../../mod/admin.php:197
 msgid "Registered users"
 msgstr ""

-#: ../../mod/admin.php:192
+#: ../../mod/admin.php:199
 msgid "Pending registrations"
 msgstr ""

-#: ../../mod/admin.php:193
+#: ../../mod/admin.php:200
 msgid "Version"
 msgstr ""

-#: ../../mod/admin.php:195
+#: ../../mod/admin.php:202
 msgid "Active plugins"
 msgstr ""

-#: ../../mod/admin.php:329
+#: ../../mod/admin.php:339
 msgid "Site settings updated."
 msgstr ""

-#: ../../mod/admin.php:377
+#: ../../mod/admin.php:387
 msgid "Closed"
 msgstr ""

-#: ../../mod/admin.php:378
+#: ../../mod/admin.php:388
 msgid "Requires approval"
 msgstr ""

-#: ../../mod/admin.php:379
+#: ../../mod/admin.php:389
 msgid "Open"
 msgstr ""

-#: ../../mod/admin.php:383
+#: ../../mod/admin.php:393
 msgid "No SSL policy, links will track page SSL state"
 msgstr ""

-#: ../../mod/admin.php:384
+#: ../../mod/admin.php:394
 msgid "Force all links to use SSL"
 msgstr ""

-#: ../../mod/admin.php:385
+#: ../../mod/admin.php:395
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr ""

-#: ../../mod/admin.php:394
+#: ../../mod/admin.php:404
 msgid "File upload"
 msgstr ""

-#: ../../mod/admin.php:395
+#: ../../mod/admin.php:405
 msgid "Policies"
 msgstr ""

-#: ../../mod/admin.php:396
+#: ../../mod/admin.php:406
 msgid "Advanced"
 msgstr ""

-#: ../../mod/admin.php:400 ../../addon/statusnet/statusnet.php:544
+#: ../../mod/admin.php:410 ../../addon/statusnet/statusnet.php:544
 msgid "Site name"
 msgstr ""

-#: ../../mod/admin.php:401
+#: ../../mod/admin.php:411
 msgid "Banner/Logo"
 msgstr ""

-#: ../../mod/admin.php:402
+#: ../../mod/admin.php:412
 msgid "System language"
 msgstr ""

-#: ../../mod/admin.php:403
+#: ../../mod/admin.php:413
 msgid "System theme"
 msgstr ""

-#: ../../mod/admin.php:403
+#: ../../mod/admin.php:413
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr ""

-#: ../../mod/admin.php:404
+#: ../../mod/admin.php:414
 msgid "SSL link policy"
 msgstr ""

-#: ../../mod/admin.php:404
+#: ../../mod/admin.php:414
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr ""

-#: ../../mod/admin.php:405
+#: ../../mod/admin.php:415
 msgid "Maximum image size"
 msgstr ""

-#: ../../mod/admin.php:405
+#: ../../mod/admin.php:415
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""

-#: ../../mod/admin.php:407
+#: ../../mod/admin.php:417
 msgid "Register policy"
 msgstr ""

-#: ../../mod/admin.php:408
+#: ../../mod/admin.php:418
 msgid "Register text"
 msgstr ""

-#: ../../mod/admin.php:408
+#: ../../mod/admin.php:418
 msgid "Will be displayed prominently on the registration page."
 msgstr ""

-#: ../../mod/admin.php:409
+#: ../../mod/admin.php:419
 msgid "Accounts abandoned after x days"
 msgstr ""

-#: ../../mod/admin.php:409
+#: ../../mod/admin.php:419
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""

-#: ../../mod/admin.php:410
+#: ../../mod/admin.php:420
 msgid "Allowed friend domains"
 msgstr ""

-#: ../../mod/admin.php:410
+#: ../../mod/admin.php:420
 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:411
+#: ../../mod/admin.php:421
 msgid "Allowed email domains"
 msgstr ""

-#: ../../mod/admin.php:411
+#: ../../mod/admin.php:421
 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:412
+#: ../../mod/admin.php:422
 msgid "Block public"
 msgstr ""

-#: ../../mod/admin.php:412
+#: ../../mod/admin.php:422
 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:413
+#: ../../mod/admin.php:423
 msgid "Force publish"
 msgstr ""

-#: ../../mod/admin.php:413
+#: ../../mod/admin.php:423
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""

-#: ../../mod/admin.php:414
+#: ../../mod/admin.php:424
 msgid "Global directory update URL"
 msgstr ""

-#: ../../mod/admin.php:414
+#: ../../mod/admin.php:424
 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:416
+#: ../../mod/admin.php:426
 msgid "Block multiple registrations"
 msgstr ""

-#: ../../mod/admin.php:416
+#: ../../mod/admin.php:426
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr ""

-#: ../../mod/admin.php:417
+#: ../../mod/admin.php:427
 msgid "OpenID support"
 msgstr ""

-#: ../../mod/admin.php:417
+#: ../../mod/admin.php:427
 msgid "OpenID support for registration and logins."
 msgstr ""

-#: ../../mod/admin.php:418
+#: ../../mod/admin.php:428
 msgid "Fullname check"
 msgstr ""

-#: ../../mod/admin.php:418
+#: ../../mod/admin.php:428
 msgid ""
 "Force users to register with a space between firstname and lastname in Full "
 "name, as an antispam measure"
 msgstr ""

-#: ../../mod/admin.php:419
+#: ../../mod/admin.php:429
 msgid "UTF-8 Regular expressions"
 msgstr ""

-#: ../../mod/admin.php:419
+#: ../../mod/admin.php:429
 msgid "Use PHP UTF8 regular expressions"
 msgstr ""

-#: ../../mod/admin.php:420
+#: ../../mod/admin.php:430
 msgid "Show Community Page"
 msgstr ""

-#: ../../mod/admin.php:420
+#: ../../mod/admin.php:430
 msgid ""
 "Display a Community page showing all recent public postings on this site."
 msgstr ""

-#: ../../mod/admin.php:421
+#: ../../mod/admin.php:431
 msgid "Enable OStatus support"
 msgstr ""

-#: ../../mod/admin.php:421
+#: ../../mod/admin.php:431
 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:422
+#: ../../mod/admin.php:432
 msgid "Enable Diaspora support"
 msgstr ""

-#: ../../mod/admin.php:422
+#: ../../mod/admin.php:432
 msgid "Provide built-in Diaspora network compatibility."
 msgstr ""

-#: ../../mod/admin.php:423
+#: ../../mod/admin.php:433
 msgid "Only allow Friendica contacts"
 msgstr ""

-#: ../../mod/admin.php:423
+#: ../../mod/admin.php:433
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr ""

-#: ../../mod/admin.php:424
+#: ../../mod/admin.php:434
 msgid "Verify SSL"
 msgstr ""

-#: ../../mod/admin.php:424
+#: ../../mod/admin.php:434
 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:425
+#: ../../mod/admin.php:435
 msgid "Proxy user"
 msgstr ""

-#: ../../mod/admin.php:426
+#: ../../mod/admin.php:436
 msgid "Proxy URL"
 msgstr ""

-#: ../../mod/admin.php:427
+#: ../../mod/admin.php:437
 msgid "Network timeout"
 msgstr ""

-#: ../../mod/admin.php:427
+#: ../../mod/admin.php:437
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""

+#: ../../mod/admin.php:438
+msgid "Delivery interval"
+msgstr ""
+
+#: ../../mod/admin.php:438
+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:439
+msgid "Maximum Load Average"
+msgstr ""
+
+#: ../../mod/admin.php:439
+msgid ""
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
+msgstr ""
+
 #: ../../mod/admin.php:453
+msgid "Update has been marked successful"
+msgstr ""
+
+#: ../../mod/admin.php:463
+#, php-format
+msgid "Executing %s failed. Check system logs."
+msgstr ""
+
+#: ../../mod/admin.php:466
+#, php-format
+msgid "Update %s was successfully applied."
+msgstr ""
+
+#: ../../mod/admin.php:470
+#, php-format
+msgid "Update %s did not return a status. Unknown if it succeeded."
+msgstr ""
+
+#: ../../mod/admin.php:473
+#, php-format
+msgid "Update function %s could not be found."
+msgstr ""
+
+#: ../../mod/admin.php:488
+msgid "No failed updates."
+msgstr ""
+
+#: ../../mod/admin.php:492
+msgid "Failed Updates"
+msgstr ""
+
+#: ../../mod/admin.php:493
+msgid ""
+"This does not include updates prior to 1139, which did not return a status."
+msgstr ""
+
+#: ../../mod/admin.php:494
+msgid "Mark success (if update was manually applied)"
+msgstr ""
+
+#: ../../mod/admin.php:495
+msgid "Attempt to execute this update step automatically"
+msgstr ""
+
+#: ../../mod/admin.php:520
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""

-#: ../../mod/admin.php:460
+#: ../../mod/admin.php:527
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] ""
 msgstr[1] ""

-#: ../../mod/admin.php:499
+#: ../../mod/admin.php:566
 #, php-format
 msgid "User '%s' deleted"
 msgstr ""

-#: ../../mod/admin.php:507
+#: ../../mod/admin.php:574
 #, php-format
 msgid "User '%s' unblocked"
 msgstr ""

-#: ../../mod/admin.php:507
+#: ../../mod/admin.php:574
 #, php-format
 msgid "User '%s' blocked"
 msgstr ""

-#: ../../mod/admin.php:571
+#: ../../mod/admin.php:638
 msgid "select all"
 msgstr ""

-#: ../../mod/admin.php:572
+#: ../../mod/admin.php:639
 msgid "User registrations waiting for confirm"
 msgstr ""

-#: ../../mod/admin.php:573
+#: ../../mod/admin.php:640
 msgid "Request date"
 msgstr ""

-#: ../../mod/admin.php:573 ../../mod/admin.php:582
+#: ../../mod/admin.php:640 ../../mod/admin.php:649
 #: ../../include/contact_selectors.php:79
 msgid "Email"
 msgstr ""

-#: ../../mod/admin.php:574
+#: ../../mod/admin.php:641
 msgid "No registrations."
 msgstr ""

-#: ../../mod/admin.php:576
+#: ../../mod/admin.php:643
 msgid "Deny"
 msgstr ""

-#: ../../mod/admin.php:582
+#: ../../mod/admin.php:649
 msgid "Register date"
 msgstr ""

-#: ../../mod/admin.php:582
+#: ../../mod/admin.php:649
 msgid "Last login"
 msgstr ""

-#: ../../mod/admin.php:582
+#: ../../mod/admin.php:649
 msgid "Last item"
 msgstr ""

-#: ../../mod/admin.php:582
+#: ../../mod/admin.php:649
 msgid "Account"
 msgstr ""

-#: ../../mod/admin.php:584
+#: ../../mod/admin.php:651
 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:585
+#: ../../mod/admin.php:652
 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:626
+#: ../../mod/admin.php:693
 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""

-#: ../../mod/admin.php:630
+#: ../../mod/admin.php:697
 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""

-#: ../../mod/admin.php:640 ../../mod/admin.php:838
+#: ../../mod/admin.php:707 ../../mod/admin.php:905
 msgid "Disable"
 msgstr ""

-#: ../../mod/admin.php:642 ../../mod/admin.php:840
+#: ../../mod/admin.php:709 ../../mod/admin.php:907
 msgid "Enable"
 msgstr ""

-#: ../../mod/admin.php:664 ../../mod/admin.php:869
+#: ../../mod/admin.php:731 ../../mod/admin.php:936
 msgid "Toggle"
 msgstr ""

-#: ../../mod/admin.php:672 ../../mod/admin.php:879
+#: ../../mod/admin.php:739 ../../mod/admin.php:946
 msgid "Author: "
 msgstr ""

-#: ../../mod/admin.php:673 ../../mod/admin.php:880
+#: ../../mod/admin.php:740 ../../mod/admin.php:947
 msgid "Maintainer: "
 msgstr ""

-#: ../../mod/admin.php:802
+#: ../../mod/admin.php:869
 msgid "No themes found."
 msgstr ""

-#: ../../mod/admin.php:861
+#: ../../mod/admin.php:928
 msgid "Screenshot"
 msgstr ""

-#: ../../mod/admin.php:909
+#: ../../mod/admin.php:976
 msgid "[Experimental]"
 msgstr ""

-#: ../../mod/admin.php:910
+#: ../../mod/admin.php:977
 msgid "[Unsupported]"
 msgstr ""

-#: ../../mod/admin.php:937
+#: ../../mod/admin.php:1004
 msgid "Log settings updated."
 msgstr ""

-#: ../../mod/admin.php:994
+#: ../../mod/admin.php:1060
 msgid "Clear"
 msgstr ""

-#: ../../mod/admin.php:1000
+#: ../../mod/admin.php:1066
 msgid "Debugging"
 msgstr ""

-#: ../../mod/admin.php:1001
+#: ../../mod/admin.php:1067
 msgid "Log file"
 msgstr ""

-#: ../../mod/admin.php:1001
+#: ../../mod/admin.php:1067
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr ""

-#: ../../mod/admin.php:1002
+#: ../../mod/admin.php:1068
 msgid "Log level"
 msgstr ""

-#: ../../mod/admin.php:1052
+#: ../../mod/admin.php:1118
 msgid "Close"
 msgstr ""

-#: ../../mod/admin.php:1058
+#: ../../mod/admin.php:1124
 msgid "FTP Host"
 msgstr ""

-#: ../../mod/admin.php:1059
+#: ../../mod/admin.php:1125
 msgid "FTP Path"
 msgstr ""

-#: ../../mod/admin.php:1060
+#: ../../mod/admin.php:1126
 msgid "FTP User"
 msgstr ""

-#: ../../mod/admin.php:1061
+#: ../../mod/admin.php:1127
 msgid "FTP Password"
 msgstr ""

-#: ../../mod/profile.php:21 ../../boot.php:940
+#: ../../mod/profile.php:21 ../../boot.php:949
 msgid "Requested profile is not available."
 msgstr ""

-#: ../../mod/profile.php:124 ../../mod/display.php:75
+#: ../../mod/profile.php:126 ../../mod/display.php:75
 msgid "Access to this profile has been restricted."
 msgstr ""

-#: ../../mod/profile.php:145
+#: ../../mod/profile.php:151
 msgid "Tips for New Members"
 msgstr ""

@ -3530,12 +3705,12 @@ msgstr ""
 msgid "following"
 msgstr ""

-#: ../../mod/common.php:34
+#: ../../mod/common.php:42
 msgid "Common Friends"
 msgstr ""

-#: ../../mod/common.php:42
-msgid "No friends in common."
+#: ../../mod/common.php:78
+msgid "No contacts in common."
 msgstr ""

 #: ../../mod/display.php:135
@ -3554,8 +3729,8 @@ msgstr ""
 msgid "Search This Site"
 msgstr ""

-#: ../../mod/profiles.php:21 ../../mod/profiles.php:339
-#: ../../mod/profiles.php:453 ../../mod/dfrn_confirm.php:62
+#: ../../mod/profiles.php:21 ../../mod/profiles.php:375
+#: ../../mod/profiles.php:489 ../../mod/dfrn_confirm.php:62
 msgid "Profile not found."
 msgstr ""

@ -3563,263 +3738,272 @@ msgstr ""
 msgid "Profile Name is required."
 msgstr ""

-#: ../../mod/profiles.php:143
+#: ../../mod/profiles.php:145
 msgid "Marital Status"
 msgstr ""

-#: ../../mod/profiles.php:144
+#: ../../mod/profiles.php:149
 msgid "Romantic Partner"
 msgstr ""

-#: ../../mod/profiles.php:145
+#: ../../mod/profiles.php:153
 msgid "Work/Employment"
 msgstr ""

-#: ../../mod/profiles.php:146
+#: ../../mod/profiles.php:156
 msgid "Religion"
 msgstr ""

-#: ../../mod/profiles.php:147
+#: ../../mod/profiles.php:160
 msgid "Political Views"
 msgstr ""

-#: ../../mod/profiles.php:148
+#: ../../mod/profiles.php:164
 msgid "Gender"
 msgstr ""

-#: ../../mod/profiles.php:149
+#: ../../mod/profiles.php:168
 msgid "Sexual Preference"
 msgstr ""

-#: ../../mod/profiles.php:150
+#: ../../mod/profiles.php:172
 msgid "Homepage"
 msgstr ""

-#: ../../mod/profiles.php:151
+#: ../../mod/profiles.php:176
 msgid "Interests"
 msgstr ""

-#: ../../mod/profiles.php:154
+#: ../../mod/profiles.php:181
 msgid "Location"
 msgstr ""

-#: ../../mod/profiles.php:225
+#: ../../mod/profiles.php:253
 msgid "Profile updated."
 msgstr ""

-#: ../../mod/profiles.php:300
+#: ../../mod/profiles.php:320
+msgid " and "
+msgstr ""
+
+#: ../../mod/profiles.php:328
 msgid "public profile"
 msgstr ""

-#: ../../mod/profiles.php:302
+#: ../../mod/profiles.php:331
+#, php-format
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+msgstr ""
+
+#: ../../mod/profiles.php:335
 #, php-format
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""

-#: ../../mod/profiles.php:358
+#: ../../mod/profiles.php:394
 msgid "Profile deleted."
 msgstr ""

-#: ../../mod/profiles.php:376 ../../mod/profiles.php:410
+#: ../../mod/profiles.php:412 ../../mod/profiles.php:446
 msgid "Profile-"
 msgstr ""

-#: ../../mod/profiles.php:395 ../../mod/profiles.php:437
+#: ../../mod/profiles.php:431 ../../mod/profiles.php:473
 msgid "New profile created."
 msgstr ""

-#: ../../mod/profiles.php:416
+#: ../../mod/profiles.php:452
 msgid "Profile unavailable to clone."
 msgstr ""

-#: ../../mod/profiles.php:474
+#: ../../mod/profiles.php:510
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr ""

-#: ../../mod/profiles.php:497
+#: ../../mod/profiles.php:533
 msgid "Edit Profile Details"
 msgstr ""

-#: ../../mod/profiles.php:499
+#: ../../mod/profiles.php:535
 msgid "View this profile"
 msgstr ""

-#: ../../mod/profiles.php:500
+#: ../../mod/profiles.php:536
 msgid "Create a new profile using these settings"
 msgstr ""

-#: ../../mod/profiles.php:501
+#: ../../mod/profiles.php:537
 msgid "Clone this profile"
 msgstr ""

-#: ../../mod/profiles.php:502
+#: ../../mod/profiles.php:538
 msgid "Delete this profile"
 msgstr ""

-#: ../../mod/profiles.php:503
+#: ../../mod/profiles.php:539
 msgid "Profile Name:"
 msgstr ""

-#: ../../mod/profiles.php:504
+#: ../../mod/profiles.php:540
 msgid "Your Full Name:"
 msgstr ""

-#: ../../mod/profiles.php:505
+#: ../../mod/profiles.php:541
 msgid "Title/Description:"
 msgstr ""

-#: ../../mod/profiles.php:506
+#: ../../mod/profiles.php:542
 msgid "Your Gender:"
 msgstr ""

-#: ../../mod/profiles.php:507
+#: ../../mod/profiles.php:543
 #, php-format
 msgid "Birthday (%s):"
 msgstr ""

-#: ../../mod/profiles.php:508
+#: ../../mod/profiles.php:544
 msgid "Street Address:"
 msgstr ""

-#: ../../mod/profiles.php:509
+#: ../../mod/profiles.php:545
 msgid "Locality/City:"
 msgstr ""

-#: ../../mod/profiles.php:510
+#: ../../mod/profiles.php:546
 msgid "Postal/Zip Code:"
 msgstr ""

-#: ../../mod/profiles.php:511
+#: ../../mod/profiles.php:547
 msgid "Country:"
 msgstr ""

-#: ../../mod/profiles.php:512
+#: ../../mod/profiles.php:548
 msgid "Region/State:"
 msgstr ""

-#: ../../mod/profiles.php:513
+#: ../../mod/profiles.php:549
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr ""

-#: ../../mod/profiles.php:514
+#: ../../mod/profiles.php:550
 msgid "Who: (if applicable)"
 msgstr ""

-#: ../../mod/profiles.php:515
+#: ../../mod/profiles.php:551
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""

-#: ../../mod/profiles.php:516 ../../include/profile_advanced.php:43
+#: ../../mod/profiles.php:552 ../../include/profile_advanced.php:43
 msgid "Sexual Preference:"
 msgstr ""

-#: ../../mod/profiles.php:517
+#: ../../mod/profiles.php:553
 msgid "Homepage URL:"
 msgstr ""

-#: ../../mod/profiles.php:518 ../../include/profile_advanced.php:49
+#: ../../mod/profiles.php:554 ../../include/profile_advanced.php:49
 msgid "Political Views:"
 msgstr ""

-#: ../../mod/profiles.php:519
+#: ../../mod/profiles.php:555
 msgid "Religious Views:"
 msgstr ""

-#: ../../mod/profiles.php:520
+#: ../../mod/profiles.php:556
 msgid "Public Keywords:"
 msgstr ""

-#: ../../mod/profiles.php:521
+#: ../../mod/profiles.php:557
 msgid "Private Keywords:"
 msgstr ""

-#: ../../mod/profiles.php:522
+#: ../../mod/profiles.php:558
 msgid "Example: fishing photography software"
 msgstr ""

-#: ../../mod/profiles.php:523
+#: ../../mod/profiles.php:559
 msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr ""

-#: ../../mod/profiles.php:524
+#: ../../mod/profiles.php:560
 msgid "(Used for searching profiles, never shown to others)"
 msgstr ""

-#: ../../mod/profiles.php:525
+#: ../../mod/profiles.php:561
 msgid "Tell us about yourself..."
 msgstr ""

-#: ../../mod/profiles.php:526
+#: ../../mod/profiles.php:562
 msgid "Hobbies/Interests"
 msgstr ""

-#: ../../mod/profiles.php:527
+#: ../../mod/profiles.php:563
 msgid "Contact information and Social Networks"
 msgstr ""

-#: ../../mod/profiles.php:528
+#: ../../mod/profiles.php:564
 msgid "Musical interests"
 msgstr ""

-#: ../../mod/profiles.php:529
+#: ../../mod/profiles.php:565
 msgid "Books, literature"
 msgstr ""

-#: ../../mod/profiles.php:530
+#: ../../mod/profiles.php:566
 msgid "Television"
 msgstr ""

-#: ../../mod/profiles.php:531
+#: ../../mod/profiles.php:567
 msgid "Film/dance/culture/entertainment"
 msgstr ""

-#: ../../mod/profiles.php:532
+#: ../../mod/profiles.php:568
 msgid "Love/romance"
 msgstr ""

-#: ../../mod/profiles.php:533
+#: ../../mod/profiles.php:569
 msgid "Work/employment"
 msgstr ""

-#: ../../mod/profiles.php:534
+#: ../../mod/profiles.php:570
 msgid "School/education"
 msgstr ""

-#: ../../mod/profiles.php:539
+#: ../../mod/profiles.php:575
 msgid ""
 "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
 "be visible to anybody using the internet."
 msgstr ""

-#: ../../mod/profiles.php:549 ../../mod/directory.php:111
+#: ../../mod/profiles.php:585 ../../mod/directory.php:111
 msgid "Age: "
 msgstr ""

-#: ../../mod/profiles.php:584
+#: ../../mod/profiles.php:620
 msgid "Edit/Manage Profiles"
 msgstr ""

-#: ../../mod/profiles.php:585 ../../boot.php:1049
+#: ../../mod/profiles.php:621 ../../boot.php:1058
 msgid "Change profile photo"
 msgstr ""

-#: ../../mod/profiles.php:586 ../../boot.php:1050
+#: ../../mod/profiles.php:622 ../../boot.php:1059
 msgid "Create New Profile"
 msgstr ""

-#: ../../mod/profiles.php:597 ../../boot.php:1060
+#: ../../mod/profiles.php:633 ../../boot.php:1069
 msgid "Profile Image"
 msgstr ""

-#: ../../mod/profiles.php:599 ../../boot.php:1063
+#: ../../mod/profiles.php:635 ../../boot.php:1072
 msgid "visible to everybody"
 msgstr ""

-#: ../../mod/profiles.php:600 ../../boot.php:1064
+#: ../../mod/profiles.php:636 ../../boot.php:1073
 msgid "Edit visibility"
 msgstr ""

-#: ../../mod/filer.php:29 ../../include/conversation.php:914
+#: ../../mod/filer.php:29 ../../include/conversation.php:922
 msgid "Save to Folder:"
 msgstr ""

@ -3867,7 +4051,7 @@ msgstr ""
 msgid "No entries."
 msgstr ""

-#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:158
+#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:464
 #: ../../include/contact_widgets.php:34
 msgid "Friend Suggestions"
 msgstr ""
@ -3882,7 +4066,7 @@ msgstr ""
 msgid "Ignore/Hide"
 msgstr ""

-#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:156
+#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:462
 msgid "Global Directory"
 msgstr ""

@ -4021,118 +4205,123 @@ msgstr ""
 msgid "Unable to set contact photo."
 msgstr ""

-#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:507
+#: ../../mod/dfrn_confirm.php:482 ../../include/diaspora.php:507
 #: ../../include/conversation.php:101
 #, php-format
 msgid "%1$s is now friends with %2$s"
 msgstr ""

-#: ../../mod/dfrn_confirm.php:548
+#: ../../mod/dfrn_confirm.php:554
 #, php-format
 msgid "No user record found for '%s' "
 msgstr ""

-#: ../../mod/dfrn_confirm.php:558
+#: ../../mod/dfrn_confirm.php:564
 msgid "Our site encryption key is apparently messed up."
 msgstr ""

-#: ../../mod/dfrn_confirm.php:569
+#: ../../mod/dfrn_confirm.php:575
 msgid "Empty site URL was provided or URL could not be decrypted by us."
 msgstr ""

-#: ../../mod/dfrn_confirm.php:590
+#: ../../mod/dfrn_confirm.php:596
 msgid "Contact record was not found for you on our site."
 msgstr ""

-#: ../../mod/dfrn_confirm.php:604
+#: ../../mod/dfrn_confirm.php:610
 #, php-format
 msgid "Site public key not available in contact record for URL %s."
 msgstr ""

-#: ../../mod/dfrn_confirm.php:624
+#: ../../mod/dfrn_confirm.php:630
 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:635
+#: ../../mod/dfrn_confirm.php:641
 msgid "Unable to set your contact credentials on our system."
 msgstr ""

-#: ../../mod/dfrn_confirm.php:700
+#: ../../mod/dfrn_confirm.php:706
 msgid "Unable to update your contact profile details on our system"
 msgstr ""

-#: ../../mod/dfrn_confirm.php:730
+#: ../../mod/dfrn_confirm.php:740
 #, php-format
 msgid "Connection accepted at %s"
 msgstr ""

-#: ../../addon/facebook/facebook.php:490
+#: ../../mod/dfrn_confirm.php:789
+#, php-format
+msgid "%1$s has joined %2$s"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:491
 msgid "Facebook disabled"
 msgstr ""

-#: ../../addon/facebook/facebook.php:495
+#: ../../addon/facebook/facebook.php:496
 msgid "Updating contacts"
 msgstr ""

-#: ../../addon/facebook/facebook.php:515
+#: ../../addon/facebook/facebook.php:516
 msgid "Facebook API key is missing."
 msgstr ""

-#: ../../addon/facebook/facebook.php:522
+#: ../../addon/facebook/facebook.php:523
 msgid "Facebook Connect"
 msgstr ""

-#: ../../addon/facebook/facebook.php:528
+#: ../../addon/facebook/facebook.php:529
 msgid "Install Facebook connector for this account."
 msgstr ""

-#: ../../addon/facebook/facebook.php:535
+#: ../../addon/facebook/facebook.php:536
 msgid "Remove Facebook connector"
 msgstr ""

-#: ../../addon/facebook/facebook.php:540
+#: ../../addon/facebook/facebook.php:541
 msgid ""
 "Re-authenticate [This is necessary whenever your Facebook password is "
 "changed.]"
 msgstr ""

-#: ../../addon/facebook/facebook.php:547
+#: ../../addon/facebook/facebook.php:548
 msgid "Post to Facebook by default"
 msgstr ""

-#: ../../addon/facebook/facebook.php:551
+#: ../../addon/facebook/facebook.php:552
 msgid "Link all your Facebook friends and conversations on this website"
 msgstr ""

-#: ../../addon/facebook/facebook.php:553
+#: ../../addon/facebook/facebook.php:554
 msgid ""
 "Facebook conversations consist of your <em>profile wall</em> and your friend "
 "<em>stream</em>."
 msgstr ""

-#: ../../addon/facebook/facebook.php:554
+#: ../../addon/facebook/facebook.php:555
 msgid "On this website, your Facebook friend stream is only visible to you."
 msgstr ""

-#: ../../addon/facebook/facebook.php:555
+#: ../../addon/facebook/facebook.php:556
 msgid ""
 "The following settings determine the privacy of your Facebook profile wall "
 "on this website."
 msgstr ""

-#: ../../addon/facebook/facebook.php:559
+#: ../../addon/facebook/facebook.php:560
 msgid ""
 "On this website your Facebook profile wall conversations will only be "
 "visible to you"
 msgstr ""

-#: ../../addon/facebook/facebook.php:564
+#: ../../addon/facebook/facebook.php:565
 msgid "Do not import your Facebook profile wall conversations"
 msgstr ""

-#: ../../addon/facebook/facebook.php:566
+#: ../../addon/facebook/facebook.php:567
 msgid ""
 "If you choose to link conversations and leave both of these boxes unchecked, "
 "your Facebook profile wall will be merged with your profile wall on this "
@ -4140,120 +4329,120 @@ msgid ""
 "who may see the conversations."
 msgstr ""

-#: ../../addon/facebook/facebook.php:571
+#: ../../addon/facebook/facebook.php:572
 msgid "Comma separated applications to ignore"
 msgstr ""

-#: ../../addon/facebook/facebook.php:648
+#: ../../addon/facebook/facebook.php:656
 msgid "Problems with Facebook Real-Time Updates"
 msgstr ""

-#: ../../addon/facebook/facebook.php:675
+#: ../../addon/facebook/facebook.php:684
 #: ../../include/contact_selectors.php:81
 msgid "Facebook"
 msgstr ""

-#: ../../addon/facebook/facebook.php:676
+#: ../../addon/facebook/facebook.php:685
 msgid "Facebook Connector Settings"
 msgstr ""

-#: ../../addon/facebook/facebook.php:691
+#: ../../addon/facebook/facebook.php:700
 msgid "Facebook API Key"
 msgstr ""

-#: ../../addon/facebook/facebook.php:701
+#: ../../addon/facebook/facebook.php:710
 msgid ""
 "Error: it appears that you have specified the App-ID and -Secret in your ."
 "htconfig.php file. As long as they are specified there, they cannot be set "
 "using this form.<br><br>"
 msgstr ""

-#: ../../addon/facebook/facebook.php:706
+#: ../../addon/facebook/facebook.php:715
 msgid ""
 "Error: the given API Key seems to be incorrect (the application access token "
 "could not be retrieved)."
 msgstr ""

-#: ../../addon/facebook/facebook.php:708
+#: ../../addon/facebook/facebook.php:717
 msgid "The given API Key seems to work correctly."
 msgstr ""

-#: ../../addon/facebook/facebook.php:710
+#: ../../addon/facebook/facebook.php:719
 msgid ""
 "The correctness of the API Key could not be detected. Somthing strange's "
 "going on."
 msgstr ""

-#: ../../addon/facebook/facebook.php:713
+#: ../../addon/facebook/facebook.php:722
 msgid "App-ID / API-Key"
 msgstr ""

-#: ../../addon/facebook/facebook.php:714
+#: ../../addon/facebook/facebook.php:723
 msgid "Application secret"
 msgstr ""

-#: ../../addon/facebook/facebook.php:715
+#: ../../addon/facebook/facebook.php:724
 #, php-format
-msgid "Polling Interval (min. %1$s minutes)"
+msgid "Polling Interval in minutes (minimum %1$s minutes)"
 msgstr ""

-#: ../../addon/facebook/facebook.php:716
+#: ../../addon/facebook/facebook.php:725
 msgid ""
 "Synchronize comments (no comments on Facebook are missed, at the cost of "
 "increased system load)"
 msgstr ""

-#: ../../addon/facebook/facebook.php:720
+#: ../../addon/facebook/facebook.php:729
 msgid "Real-Time Updates"
 msgstr ""

-#: ../../addon/facebook/facebook.php:724
+#: ../../addon/facebook/facebook.php:733
 msgid "Real-Time Updates are activated."
 msgstr ""

-#: ../../addon/facebook/facebook.php:725
+#: ../../addon/facebook/facebook.php:734
 msgid "Deactivate Real-Time Updates"
 msgstr ""

-#: ../../addon/facebook/facebook.php:727
+#: ../../addon/facebook/facebook.php:736
 msgid "Real-Time Updates not activated."
 msgstr ""

-#: ../../addon/facebook/facebook.php:727
+#: ../../addon/facebook/facebook.php:736
 msgid "Activate Real-Time Updates"
 msgstr ""

-#: ../../addon/facebook/facebook.php:746
+#: ../../addon/facebook/facebook.php:755
 msgid "The new values have been saved."
 msgstr ""

-#: ../../addon/facebook/facebook.php:770
+#: ../../addon/facebook/facebook.php:779
 msgid "Post to Facebook"
 msgstr ""

-#: ../../addon/facebook/facebook.php:868
+#: ../../addon/facebook/facebook.php:877
 msgid ""
 "Post to Facebook cancelled because of multi-network access permission "
 "conflict."
 msgstr ""

-#: ../../addon/facebook/facebook.php:1088
+#: ../../addon/facebook/facebook.php:1097
 msgid "View on Friendica"
 msgstr ""

-#: ../../addon/facebook/facebook.php:1121
+#: ../../addon/facebook/facebook.php:1130
 msgid "Facebook post failed. Queued for retry."
 msgstr ""

-#: ../../addon/facebook/facebook.php:1161
+#: ../../addon/facebook/facebook.php:1170
 msgid "Your Facebook connection became invalid. Please Re-authenticate."
 msgstr ""

-#: ../../addon/facebook/facebook.php:1162
+#: ../../addon/facebook/facebook.php:1171
 msgid "Facebook connection became invalid"
 msgstr ""

-#: ../../addon/facebook/facebook.php:1163
+#: ../../addon/facebook/facebook.php:1172
 #, php-format
 msgid ""
 "Hi %1$s,\n"
@ -4297,6 +4486,10 @@ msgid_plural "%d people don't like this"
 msgstr[0] ""
 msgstr[1] ""

+#: ../../addon/widgets/widget_friendheader.php:40
+msgid "Get added to this list!"
+msgstr ""
+
 #: ../../addon/widgets/widgets.php:56
 msgid "Generate new key"
 msgstr ""
@ -4396,10 +4589,16 @@ msgstr ""
 msgid "%s - Click to open/close"
 msgstr ""

-#: ../../addon/page/page.php:47
+#: ../../addon/page/page.php:48
 msgid "Forums"
 msgstr ""

+#: ../../addon/page/page.php:63 ../../addon/showmore/showmore.php:87
+#: ../../include/contact_widgets.php:187 ../../include/conversation.php:466
+#: ../../boot.php:507
+msgid "show more"
+msgstr ""
+
 #: ../../addon/planets/planets.php:150
 msgid "Planets Settings"
 msgstr ""
@ -4412,7 +4611,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:796
+#: ../../include/nav.php:64 ../../boot.php:805
 msgid "Login"
 msgstr ""

@ -4440,7 +4639,7 @@ msgid "Latest likes"
 msgstr ""

 #: ../../addon/communityhome/communityhome.php:155
-#: ../../view/theme/diabook/theme.php:94 ../../include/text.php:1302
+#: ../../view/theme/diabook/theme.php:400 ../../include/text.php:1302
 #: ../../include/conversation.php:45 ../../include/conversation.php:118
 msgid "event"
 msgstr ""
@ -4592,7 +4791,7 @@ msgid "Post to Drupal by default"
 msgstr ""

 #: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:190
-#: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:173
+#: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:177
 msgid "Post from Friendica"
 msgstr ""

@ -5153,11 +5352,6 @@ msgstr ""
 msgid "Show More Settings saved."
 msgstr ""

-#: ../../addon/showmore/showmore.php:87 ../../include/conversation.php:466
-#: ../../boot.php:496
-msgid "show more"
-msgstr ""
-
 #: ../../addon/piwik/piwik.php:79
 msgid ""
 "This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
@ -5340,86 +5534,101 @@ msgstr ""
 msgid "Post to Posterous by default"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:43
-msgid "Last users"
+#: ../../view/theme/cleanzero/config.php:73
+#: ../../view/theme/diabook/config.php:93
+#: ../../view/theme/quattro/config.php:54 ../../view/theme/dispy/config.php:72
+msgid "Theme settings"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:72
-msgid "Last likes"
+#: ../../view/theme/cleanzero/config.php:74
+msgid "Set resize level for images in posts and comments (width and height)"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:117
-msgid "Last photos"
+#: ../../view/theme/cleanzero/config.php:75
+#: ../../view/theme/diabook/config.php:94 ../../view/theme/dispy/config.php:73
+msgid "Set font-size for posts and comments"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:154
-msgid "Find Friends"
+#: ../../view/theme/cleanzero/config.php:76
+#: ../../view/theme/quattro/config.php:56
+msgid "Color scheme"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:155
-msgid "Local Directory"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:157 ../../include/contact_widgets.php:35
-msgid "Similar Interests"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:159 ../../include/contact_widgets.php:37
-msgid "Invite Friends"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:175
-#: ../../view/theme/diabook/theme.php:253
-msgid "Community Pages"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:208
-msgid "Help or @NewHere ?"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:214
-msgid "Connect Services"
-msgstr ""
-
-#: ../../view/theme/diabook/theme.php:246 ../../include/nav.php:49
+#: ../../view/theme/diabook/theme.php:65 ../../include/nav.php:49
 #: ../../include/nav.php:115
 msgid "Your posts and conversations"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:247 ../../include/nav.php:50
+#: ../../view/theme/diabook/theme.php:66 ../../include/nav.php:50
 msgid "Your profile page"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:248
+#: ../../view/theme/diabook/theme.php:67
 msgid "Your contacts"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:249 ../../include/nav.php:51
+#: ../../view/theme/diabook/theme.php:68 ../../include/nav.php:51
 msgid "Your photos"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:250 ../../include/nav.php:52
+#: ../../view/theme/diabook/theme.php:69 ../../include/nav.php:52
 msgid "Your events"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:251 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:70 ../../include/nav.php:53
 msgid "Personal notes"
 msgstr ""

-#: ../../view/theme/diabook/theme.php:251 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:70 ../../include/nav.php:53
 msgid "Your personal photos"
 msgstr ""

-#: ../../view/theme/diabook/config.php:93
-#: ../../view/theme/quattro/config.php:54
-msgid "Theme settings"
+#: ../../view/theme/diabook/theme.php:72
+#: ../../view/theme/diabook/theme.php:481
+msgid "Community Pages"
 msgstr ""

-#: ../../view/theme/diabook/config.php:94
-msgid "Set font-size for posts and comments"
+#: ../../view/theme/diabook/theme.php:328
+msgid "Community Profiles"
 msgstr ""

-#: ../../view/theme/diabook/config.php:95
+#: ../../view/theme/diabook/theme.php:349
+msgid "Last users"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:378
+msgid "Last likes"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:423
+msgid "Last photos"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:460
+msgid "Find Friends"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:461
+msgid "Local Directory"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:463 ../../include/contact_widgets.php:35
+msgid "Similar Interests"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:465 ../../include/contact_widgets.php:37
+msgid "Invite Friends"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:515
+msgid "Help or @NewHere ?"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:522
+msgid "Connect Services"
+msgstr ""
+
+#: ../../view/theme/diabook/config.php:95 ../../view/theme/dispy/config.php:74
 msgid "Set line-height for posts and comments"
 msgstr ""

@ -5443,11 +5652,11 @@ msgstr ""
 msgid "Center"
 msgstr ""

-#: ../../view/theme/quattro/config.php:56
-msgid "Color scheme"
+#: ../../view/theme/dispy/config.php:75
+msgid "Set colour scheme"
 msgstr ""

-#: ../../include/profile_advanced.php:17 ../../boot.php:1085
+#: ../../include/profile_advanced.php:17 ../../boot.php:1094
 msgid "Gender:"
 msgstr ""

@ -5468,11 +5677,11 @@ msgstr ""
 msgid "Age:"
 msgstr ""

-#: ../../include/profile_advanced.php:37 ../../boot.php:1088
+#: ../../include/profile_advanced.php:37 ../../boot.php:1097
 msgid "Status:"
 msgstr ""

-#: ../../include/profile_advanced.php:45 ../../boot.php:1090
+#: ../../include/profile_advanced.php:45 ../../boot.php:1099
 msgid "Homepage:"
 msgstr ""

@ -5652,179 +5861,179 @@ msgstr ""
 msgid "Undecided"
 msgstr ""

-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:21
 msgid "Males"
 msgstr ""

-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:21
 msgid "Females"
 msgstr ""

-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:21
 msgid "Gay"
 msgstr ""

-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:21
 msgid "Lesbian"
 msgstr ""

-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:21
 msgid "No Preference"
 msgstr ""

-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:21
 msgid "Bisexual"
 msgstr ""

-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:21
 msgid "Autosexual"
 msgstr ""

-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:21
 msgid "Abstinent"
 msgstr ""

-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:21
 msgid "Virgin"
 msgstr ""

-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:21
 msgid "Deviant"
 msgstr ""

-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:21
 msgid "Fetish"
 msgstr ""

-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:21
 msgid "Oodles"
 msgstr ""

-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:21
 msgid "Nonsexual"
 msgstr ""

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37
 msgid "Single"
 msgstr ""

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37
 msgid "Lonely"
 msgstr ""

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37
 msgid "Available"
 msgstr ""

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37
 msgid "Unavailable"
 msgstr ""

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37
 msgid "Has crush"
 msgstr ""

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37
 msgid "Infatuated"
 msgstr ""

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37
 msgid "Dating"
 msgstr ""

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37
 msgid "Unfaithful"
 msgstr ""

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37
 msgid "Sex Addict"
 msgstr ""

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37
 msgid "Friends"
 msgstr ""

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37
 msgid "Friends/Benefits"
 msgstr ""

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37
 msgid "Casual"
 msgstr ""

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37
 msgid "Engaged"
 msgstr ""

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37
 msgid "Married"
 msgstr ""

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37
 msgid "Imaginarily married"
 msgstr ""

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37
 msgid "Partners"
 msgstr ""

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37
 msgid "Cohabiting"
 msgstr ""

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37
 msgid "Common law"
 msgstr ""

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37
 msgid "Happy"
 msgstr ""

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37
 msgid "Not looking"
 msgstr ""

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37
 msgid "Swinger"
 msgstr ""

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37
 msgid "Betrayed"
 msgstr ""

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37
 msgid "Separated"
 msgstr ""

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37
 msgid "Unstable"
 msgstr ""

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37
 msgid "Divorced"
 msgstr ""

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37
 msgid "Imaginarily divorced"
 msgstr ""

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37
 msgid "Widowed"
 msgstr ""

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37
 msgid "Uncertain"
 msgstr ""

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37
 msgid "It's complicated"
 msgstr ""

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37
 msgid "Don't care"
 msgstr ""

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37
 msgid "Ask me"
 msgstr ""

@ -5836,12 +6045,12 @@ msgstr ""
 msgid "Finishes:"
 msgstr ""

-#: ../../include/delivery.php:434 ../../include/notifier.php:651
+#: ../../include/delivery.php:445 ../../include/notifier.php:652
 msgid "(no subject)"
 msgstr ""

-#: ../../include/delivery.php:441 ../../include/enotify.php:23
-#: ../../include/notifier.php:658
+#: ../../include/delivery.php:452 ../../include/enotify.php:23
+#: ../../include/notifier.php:659
 msgid "noreply"
 msgstr ""

@ -5956,18 +6165,18 @@ msgstr ""
 msgid "bytes"
 msgstr ""

-#: ../../include/text.php:936
-msgid "Categories:"
-msgstr ""
-
-#: ../../include/text.php:948
+#: ../../include/text.php:933 ../../include/text.php:948
 msgid "remove"
 msgstr ""

-#: ../../include/text.php:948
+#: ../../include/text.php:933 ../../include/text.php:948
 msgid "[remove]"
 msgstr ""

+#: ../../include/text.php:936
+msgid "Categories:"
+msgstr ""
+
 #: ../../include/text.php:951
 msgid "Filed under:"
 msgstr ""
@ -6056,7 +6265,7 @@ msgstr ""
 msgid "Contacts not in any group"
 msgstr ""

-#: ../../include/nav.php:46 ../../boot.php:795
+#: ../../include/nav.php:46 ../../boot.php:804
 msgid "Logout"
 msgstr ""

@ -6064,7 +6273,7 @@ msgstr ""
 msgid "End this session"
 msgstr ""

-#: ../../include/nav.php:49 ../../boot.php:1463
+#: ../../include/nav.php:49 ../../boot.php:1472
 msgid "Status"
 msgstr ""

@ -6144,11 +6353,11 @@ msgstr ""
 msgid "Manage other pages"
 msgstr ""

-#: ../../include/nav.php:138 ../../boot.php:1043
+#: ../../include/nav.php:138 ../../boot.php:1052
 msgid "Profiles"
 msgstr ""

-#: ../../include/nav.php:138 ../../boot.php:1043
+#: ../../include/nav.php:138 ../../boot.php:1052
 msgid "Manage/edit profiles"
 msgstr ""

@ -6314,7 +6523,7 @@ msgstr ""
 msgid "%1$d %2$s ago"
 msgstr ""

-#: ../../include/poller.php:543
+#: ../../include/onepoll.php:402
 msgid "From: "
 msgstr ""

@ -6535,11 +6744,11 @@ msgstr ""
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""

-#: ../../include/items.php:2698
+#: ../../include/items.php:2714
 msgid "A new person is sharing with you at "
 msgstr ""

-#: ../../include/items.php:2698
+#: ../../include/items.php:2714
 msgid "You have a new follower at "
 msgstr ""

@ -6570,34 +6779,34 @@ msgid ""
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr ""

-#: ../../include/Contact.php:96
+#: ../../include/Contact.php:111
 msgid "stopped following"
 msgstr ""

-#: ../../include/Contact.php:188 ../../include/conversation.php:809
+#: ../../include/Contact.php:203 ../../include/conversation.php:817
 msgid "View Status"
 msgstr ""

-#: ../../include/Contact.php:189 ../../include/conversation.php:810
+#: ../../include/Contact.php:204 ../../include/conversation.php:818
 msgid "View Profile"
 msgstr ""

-#: ../../include/Contact.php:190 ../../include/conversation.php:811
+#: ../../include/Contact.php:205 ../../include/conversation.php:819
 msgid "View Photos"
 msgstr ""

-#: ../../include/Contact.php:191 ../../include/Contact.php:204
-#: ../../include/conversation.php:812
+#: ../../include/Contact.php:206 ../../include/Contact.php:219
+#: ../../include/conversation.php:820
 msgid "Network Posts"
 msgstr ""

-#: ../../include/Contact.php:192 ../../include/Contact.php:204
-#: ../../include/conversation.php:813
+#: ../../include/Contact.php:207 ../../include/Contact.php:219
+#: ../../include/conversation.php:821
 msgid "Edit Contact"
 msgstr ""

-#: ../../include/Contact.php:193 ../../include/Contact.php:204
-#: ../../include/conversation.php:814
+#: ../../include/Contact.php:208 ../../include/Contact.php:219
+#: ../../include/conversation.php:822
 msgid "Send PM"
 msgstr ""

@ -6610,17 +6819,17 @@ msgstr ""
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""

-#: ../../include/conversation.php:317 ../../include/conversation.php:575
+#: ../../include/conversation.php:317 ../../include/conversation.php:583
 msgid "Select"
 msgstr ""

-#: ../../include/conversation.php:334 ../../include/conversation.php:668
-#: ../../include/conversation.php:669
+#: ../../include/conversation.php:334 ../../include/conversation.php:676
+#: ../../include/conversation.php:677
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""

-#: ../../include/conversation.php:344 ../../include/conversation.php:680
+#: ../../include/conversation.php:344 ../../include/conversation.php:688
 #, php-format
 msgid "%s from %s"
 msgstr ""
@ -6652,209 +6861,267 @@ msgstr ""
 msgid "share"
 msgstr ""

-#: ../../include/conversation.php:588
+#: ../../include/conversation.php:556
+msgid "Bold"
+msgstr ""
+
+#: ../../include/conversation.php:557
+msgid "Italic"
+msgstr ""
+
+#: ../../include/conversation.php:558
+msgid "Underline"
+msgstr ""
+
+#: ../../include/conversation.php:559
+msgid "Quote"
+msgstr ""
+
+#: ../../include/conversation.php:560
+msgid "Code"
+msgstr ""
+
+#: ../../include/conversation.php:561
+msgid "Image"
+msgstr ""
+
+#: ../../include/conversation.php:562
+msgid "Link"
+msgstr ""
+
+#: ../../include/conversation.php:563
+msgid "Video"
+msgstr ""
+
+#: ../../include/conversation.php:596
 msgid "add star"
 msgstr ""

-#: ../../include/conversation.php:589
+#: ../../include/conversation.php:597
 msgid "remove star"
 msgstr ""

-#: ../../include/conversation.php:590
+#: ../../include/conversation.php:598
 msgid "toggle star status"
 msgstr ""

-#: ../../include/conversation.php:593
+#: ../../include/conversation.php:601
 msgid "starred"
 msgstr ""

-#: ../../include/conversation.php:594
+#: ../../include/conversation.php:602
 msgid "add tag"
 msgstr ""

-#: ../../include/conversation.php:598
+#: ../../include/conversation.php:606
 msgid "save to folder"
 msgstr ""

-#: ../../include/conversation.php:670
+#: ../../include/conversation.php:678
 msgid "to"
 msgstr ""

-#: ../../include/conversation.php:671
+#: ../../include/conversation.php:679
 msgid "Wall-to-Wall"
 msgstr ""

-#: ../../include/conversation.php:672
+#: ../../include/conversation.php:680
 msgid "via Wall-To-Wall:"
 msgstr ""

-#: ../../include/conversation.php:717
+#: ../../include/conversation.php:725
 msgid "Delete Selected Items"
 msgstr ""

-#: ../../include/conversation.php:868
+#: ../../include/conversation.php:876
 #, php-format
 msgid "%s likes this."
 msgstr ""

-#: ../../include/conversation.php:868
+#: ../../include/conversation.php:876
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""

-#: ../../include/conversation.php:872
+#: ../../include/conversation.php:880
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""

-#: ../../include/conversation.php:874
+#: ../../include/conversation.php:882
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr ""

-#: ../../include/conversation.php:880
+#: ../../include/conversation.php:888
 msgid "and"
 msgstr ""

-#: ../../include/conversation.php:883
+#: ../../include/conversation.php:891
 #, php-format
 msgid ", and %d other people"
 msgstr ""

-#: ../../include/conversation.php:884
+#: ../../include/conversation.php:892
 #, php-format
 msgid "%s like this."
 msgstr ""

-#: ../../include/conversation.php:884
+#: ../../include/conversation.php:892
 #, php-format
 msgid "%s don't like this."
 msgstr ""

-#: ../../include/conversation.php:909
+#: ../../include/conversation.php:917
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""

-#: ../../include/conversation.php:911
+#: ../../include/conversation.php:919
 msgid "Please enter a video link/URL:"
 msgstr ""

-#: ../../include/conversation.php:912
+#: ../../include/conversation.php:920
 msgid "Please enter an audio link/URL:"
 msgstr ""

-#: ../../include/conversation.php:913
+#: ../../include/conversation.php:921
 msgid "Tag term:"
 msgstr ""

-#: ../../include/conversation.php:915
+#: ../../include/conversation.php:923
 msgid "Where are you right now?"
 msgstr ""

-#: ../../include/conversation.php:958
+#: ../../include/conversation.php:966
 msgid "upload photo"
 msgstr ""

-#: ../../include/conversation.php:960
+#: ../../include/conversation.php:968
 msgid "attach file"
 msgstr ""

-#: ../../include/conversation.php:962
+#: ../../include/conversation.php:970
 msgid "web link"
 msgstr ""

-#: ../../include/conversation.php:963
+#: ../../include/conversation.php:971
 msgid "Insert video link"
 msgstr ""

-#: ../../include/conversation.php:964
+#: ../../include/conversation.php:972
 msgid "video link"
 msgstr ""

-#: ../../include/conversation.php:965
+#: ../../include/conversation.php:973
 msgid "Insert audio link"
 msgstr ""

-#: ../../include/conversation.php:966
+#: ../../include/conversation.php:974
 msgid "audio link"
 msgstr ""

-#: ../../include/conversation.php:968
+#: ../../include/conversation.php:976
 msgid "set location"
 msgstr ""

-#: ../../include/conversation.php:970
+#: ../../include/conversation.php:978
 msgid "clear location"
 msgstr ""

-#: ../../include/conversation.php:977
+#: ../../include/conversation.php:985
 msgid "permissions"
 msgstr ""

-#: ../../boot.php:494
+#: ../../boot.php:505
 msgid "Delete this item?"
 msgstr ""

-#: ../../boot.php:497
+#: ../../boot.php:508
 msgid "show fewer"
 msgstr ""

-#: ../../boot.php:774
+#: ../../boot.php:681
+#, php-format
+msgid "Update %s failed. See error logs."
+msgstr ""
+
+#: ../../boot.php:683
+#, php-format
+msgid "Update Error at %s"
+msgstr ""
+
+#: ../../boot.php:783
 msgid "Create a New Account"
 msgstr ""

-#: ../../boot.php:798
+#: ../../boot.php:807
 msgid "Nickname or Email address: "
 msgstr ""

-#: ../../boot.php:799
+#: ../../boot.php:808
 msgid "Password: "
 msgstr ""

-#: ../../boot.php:802
+#: ../../boot.php:811
 msgid "Or login using OpenID: "
 msgstr ""

-#: ../../boot.php:808
+#: ../../boot.php:817
 msgid "Forgot your password?"
 msgstr ""

-#: ../../boot.php:975
+#: ../../boot.php:984
 msgid "Edit profile"
 msgstr ""

-#: ../../boot.php:1035
+#: ../../boot.php:1044
 msgid "Message"
 msgstr ""

-#: ../../boot.php:1151 ../../boot.php:1227
+#: ../../boot.php:1160 ../../boot.php:1236
 msgid "g A l F d"
 msgstr ""

-#: ../../boot.php:1152 ../../boot.php:1228
+#: ../../boot.php:1161 ../../boot.php:1237
 msgid "F d"
 msgstr ""

-#: ../../boot.php:1197 ../../boot.php:1268
+#: ../../boot.php:1206 ../../boot.php:1277
 msgid "[today]"
 msgstr ""

-#: ../../boot.php:1209
+#: ../../boot.php:1218
 msgid "Birthday Reminders"
 msgstr ""

-#: ../../boot.php:1210
+#: ../../boot.php:1219
 msgid "Birthdays this week:"
 msgstr ""

-#: ../../boot.php:1261
+#: ../../boot.php:1270
 msgid "[No description]"
 msgstr ""

-#: ../../boot.php:1279
+#: ../../boot.php:1288
 msgid "Event Reminders"
 msgstr ""

-#: ../../boot.php:1280
+#: ../../boot.php:1289
 msgid "Events this week:"
 msgstr ""
+
+#: ../../boot.php:1475
+msgid "Status Messages and Posts"
+msgstr ""
+
+#: ../../boot.php:1481
+msgid "Profile Details"
+msgstr ""
+
+#: ../../boot.php:1496
+msgid "Events and Calendar"
+msgstr ""
+
+#: ../../boot.php:1502
+msgid "Only You Can See This"
+msgstr ""