]> git.mxchange.org Git - friendica.git/blobdiff - util/messages.po
rev update
[friendica.git] / util / messages.po
index cd05029765695a935e79ae0bdb46a5329c7ba28d..65674774a9d315d65f5b6ab48e7a7db707836cc8 100644 (file)
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.3.1174\n"
+"Project-Id-Version: 3.0.1348\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-23 16:07-0800\n"
+"POT-Creation-Date: 2012-05-20 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"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 #"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../../mod/oexchange.php:27
+#: ../../mod/oexchange.php:25
 msgid "Post successful."
 msgstr ""
 
@@ -26,117 +26,142 @@ msgstr ""
 msgid "[Embedded content - reload page to view]"
 msgstr ""
 
-#: ../../mod/crepair.php:100
+#: ../../mod/crepair.php:102
 msgid "Contact settings applied."
 msgstr ""
 
-#: ../../mod/crepair.php:102
+#: ../../mod/crepair.php:104
 msgid "Contact update failed."
 msgstr ""
 
-#: ../../mod/crepair.php:113 ../../mod/wall_attach.php:43
-#: ../../mod/fsuggest.php:78 ../../mod/events.php:109 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/photos.php:123 ../../mod/photos.php:858
-#: ../../mod/editpost.php:10 ../../mod/install.php:96
-#: ../../mod/notifications.php:62 ../../mod/contacts.php:115
-#: ../../mod/settings.php:41 ../../mod/settings.php:46
-#: ../../mod/settings.php:388 ../../mod/manage.php:75 ../../mod/network.php:6
-#: ../../mod/notes.php:20 ../../mod/attach.php:33 ../../mod/group.php:19
-#: ../../mod/viewcontacts.php:21 ../../mod/register.php:27
-#: ../../mod/regmod.php:111 ../../mod/item.php:113
-#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:137
-#: ../../mod/profile_photo.php:148 ../../mod/profile_photo.php:159
-#: ../../mod/message.php:9 ../../mod/message.php:42 ../../mod/allfriends.php:9
-#: ../../mod/wall_upload.php:42 ../../mod/follow.php:8 ../../mod/common.php:9
-#: ../../mod/display.php:111 ../../mod/profiles.php:7
-#: ../../mod/profiles.php:229 ../../mod/suggest.php:28 ../../mod/invite.php:13
-#: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53
-#: ../../addon/facebook/facebook.php:331 ../../include/items.php:2986
-#: ../../index.php:284
+#: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44
+#: ../../mod/fsuggest.php:78 ../../mod/events.php:138 ../../mod/api.php:26
+#: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:865
+#: ../../mod/editpost.php:10 ../../mod/install.php:171
+#: ../../mod/notifications.php:66 ../../mod/contacts.php:125
+#: ../../mod/settings.php:104 ../../mod/settings.php:535
+#: ../../mod/settings.php:540 ../../mod/manage.php:86 ../../mod/network.php:6
+#: ../../mod/notes.php:20 ../../mod/wallmessage.php:9
+#: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
+#: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
+#: ../../mod/group.php:19 ../../mod/viewcontacts.php:22
+#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:124
+#: ../../mod/item.php:140 ../../mod/profile_photo.php:19
+#: ../../mod/profile_photo.php:139 ../../mod/profile_photo.php:150
+#: ../../mod/profile_photo.php:163 ../../mod/message.php:44
+#: ../../mod/message.php:96 ../../mod/allfriends.php:9
+#: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53
+#: ../../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:503
+#: ../../include/items.php:3214 ../../index.php:306
 msgid "Permission denied."
 msgstr ""
 
-#: ../../mod/crepair.php:127 ../../mod/fsuggest.php:20
-#: ../../mod/fsuggest.php:92 ../../mod/dfrn_confirm.php:114
+#: ../../mod/crepair.php:129 ../../mod/fsuggest.php:20
+#: ../../mod/fsuggest.php:92 ../../mod/dfrn_confirm.php:118
 msgid "Contact not found."
 msgstr ""
 
-#: ../../mod/crepair.php:133
+#: ../../mod/crepair.php:135
 msgid "Repair Contact Settings"
 msgstr ""
 
-#: ../../mod/crepair.php:135
+#: ../../mod/crepair.php:137
 msgid ""
 "<strong>WARNING: This is highly advanced</strong> and if you enter incorrect "
 "information your communications with this contact may stop working."
 msgstr ""
 
-#: ../../mod/crepair.php:136
+#: ../../mod/crepair.php:138
 msgid ""
 "Please use your browser 'Back' button <strong>now</strong> if you are "
 "uncertain what to do on this page."
 msgstr ""
 
-#: ../../mod/crepair.php:144 ../../mod/settings.php:434
-#: ../../mod/settings.php:460 ../../mod/admin.php:464 ../../mod/admin.php:473
+#: ../../mod/crepair.php:144
+msgid "Return to contact editor"
+msgstr ""
+
+#: ../../mod/crepair.php:148 ../../mod/settings.php:555
+#: ../../mod/settings.php:581 ../../mod/admin.php:643 ../../mod/admin.php:652
 msgid "Name"
 msgstr ""
 
-#: ../../mod/crepair.php:145
+#: ../../mod/crepair.php:149
 msgid "Account Nickname"
 msgstr ""
 
-#: ../../mod/crepair.php:146
+#: ../../mod/crepair.php:150
 msgid "@Tagname - overrides Name/Nickname"
 msgstr ""
 
-#: ../../mod/crepair.php:147
+#: ../../mod/crepair.php:151
 msgid "Account URL"
 msgstr ""
 
-#: ../../mod/crepair.php:148
+#: ../../mod/crepair.php:152
 msgid "Friend Request URL"
 msgstr ""
 
-#: ../../mod/crepair.php:149
+#: ../../mod/crepair.php:153
 msgid "Friend Confirm URL"
 msgstr ""
 
-#: ../../mod/crepair.php:150
+#: ../../mod/crepair.php:154
 msgid "Notification Endpoint URL"
 msgstr ""
 
-#: ../../mod/crepair.php:151
+#: ../../mod/crepair.php:155
 msgid "Poll/Feed URL"
 msgstr ""
 
-#: ../../mod/crepair.php:152
+#: ../../mod/crepair.php:156
 msgid "New photo from this URL"
 msgstr ""
 
-#: ../../mod/crepair.php:162 ../../mod/fsuggest.php:107
-#: ../../mod/events.php:330 ../../mod/photos.php:886 ../../mod/photos.php:944
-#: ../../mod/photos.php:1163 ../../mod/photos.php:1203
-#: ../../mod/photos.php:1242 ../../mod/photos.php:1273
-#: ../../mod/install.php:137 ../../mod/localtime.php:45
-#: ../../mod/contacts.php:306 ../../mod/settings.php:432
-#: ../../mod/settings.php:571 ../../mod/settings.php:739
-#: ../../mod/manage.php:106 ../../mod/group.php:84 ../../mod/group.php:167
-#: ../../mod/admin.php:296 ../../mod/admin.php:461 ../../mod/admin.php:587
-#: ../../mod/admin.php:652 ../../mod/profiles.php:375 ../../mod/invite.php:106
-#: ../../addon/facebook/facebook.php:404 ../../addon/nsfw/nsfw.php:53
-#: ../../addon/randplace/randplace.php:178
-#: ../../addon/impressum/impressum.php:69 ../../addon/oembed/oembed.php:41
-#: ../../addon/statusnet/statusnet.php:282
-#: ../../addon/statusnet/statusnet.php:296
-#: ../../addon/statusnet/statusnet.php:322
-#: ../../addon/statusnet/statusnet.php:329
-#: ../../addon/statusnet/statusnet.php:351
-#: ../../addon/statusnet/statusnet.php:486 ../../addon/tumblr/tumblr.php:89
-#: ../../addon/wppost/wppost.php:101 ../../addon/piwik/piwik.php:81
-#: ../../addon/twitter/twitter.php:179 ../../addon/twitter/twitter.php:202
-#: ../../addon/twitter/twitter.php:299 ../../addon/posterous/posterous.php:89
-#: ../../include/conversation.php:479
+#: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
+#: ../../mod/events.php:428 ../../mod/photos.php:900 ../../mod/photos.php:958
+#: ../../mod/photos.php:1193 ../../mod/photos.php:1233
+#: ../../mod/photos.php:1273 ../../mod/photos.php:1304
+#: ../../mod/install.php:251 ../../mod/install.php:289
+#: ../../mod/localtime.php:45 ../../mod/contacts.php:322
+#: ../../mod/settings.php:553 ../../mod/settings.php:699
+#: ../../mod/settings.php:760 ../../mod/settings.php:964
+#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:404
+#: ../../mod/admin.php:640 ../../mod/admin.php:776 ../../mod/admin.php:975
+#: ../../mod/admin.php:1062 ../../mod/profiles.php:534
+#: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:605
+#: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93
+#: ../../addon/nsfw/nsfw.php:57 ../../addon/planets/planets.php:158
+#: ../../addon/uhremotestorage/uhremotestorage.php:89
+#: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
+#: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187
+#: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:82
+#: ../../addon/blockem/blockem.php:57 ../../addon/qcomment/qcomment.php:61
+#: ../../addon/openstreetmap/openstreetmap.php:70
+#: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84
+#: ../../addon/blackout/blackout.php:98 ../../addon/gravatar/gravatar.php:86
+#: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93
+#: ../../addon/jappixmini/jappixmini.php:302
+#: ../../addon/statusnet/statusnet.php:278
+#: ../../addon/statusnet/statusnet.php:292
+#: ../../addon/statusnet/statusnet.php:318
+#: ../../addon/statusnet/statusnet.php:325
+#: ../../addon/statusnet/statusnet.php:353
+#: ../../addon/statusnet/statusnet.php:561 ../../addon/tumblr/tumblr.php:90
+#: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88
+#: ../../addon/wppost/wppost.php:109 ../../addon/showmore/showmore.php:48
+#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180
+#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:381
+#: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102
+#: ../../addon/posterous/posterous.php:103
+#: ../../view/theme/cleanzero/config.php:80
+#: ../../view/theme/diabook/theme.php:752
+#: ../../view/theme/diabook/config.php:190
+#: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70
+#: ../../include/conversation.php:558
 msgid "Submit"
 msgstr ""
 
@@ -144,24 +169,24 @@ msgstr ""
 msgid "Help:"
 msgstr ""
 
-#: ../../mod/help.php:34 ../../include/nav.php:82
+#: ../../mod/help.php:34 ../../include/nav.php:86
 msgid "Help"
 msgstr ""
 
-#: ../../mod/help.php:38 ../../index.php:217
+#: ../../mod/help.php:38 ../../index.php:225
 msgid "Not Found"
 msgstr ""
 
-#: ../../mod/help.php:41 ../../index.php:220
+#: ../../mod/help.php:41 ../../index.php:228
 msgid "Page not found."
 msgstr ""
 
-#: ../../mod/wall_attach.php:57
+#: ../../mod/wall_attach.php:58
 #, php-format
 msgid "File exceeds size limit of %d"
 msgstr ""
 
-#: ../../mod/wall_attach.php:87 ../../mod/wall_attach.php:98
+#: ../../mod/wall_attach.php:86 ../../mod/wall_attach.php:97
 msgid "File upload failed."
 msgstr ""
 
@@ -178,83 +203,84 @@ msgstr ""
 msgid "Suggest a friend for %s"
 msgstr ""
 
-#: ../../mod/events.php:61
+#: ../../mod/events.php:65
 msgid "Event description and start time are required."
 msgstr ""
 
-#: ../../mod/events.php:117 ../../include/nav.php:50 ../../boot.php:1302
-msgid "Events"
+#: ../../mod/events.php:258
+msgid "l, F j"
 msgstr ""
 
-#: ../../mod/events.php:207
-msgid "Create New Event"
+#: ../../mod/events.php:280
+msgid "Edit event"
 msgstr ""
 
-#: ../../mod/events.php:210
-msgid "Previous"
+#: ../../mod/events.php:300 ../../include/text.php:1054
+msgid "link to source"
 msgstr ""
 
-#: ../../mod/events.php:213
-msgid "Next"
+#: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:126
+#: ../../include/nav.php:52 ../../boot.php:1503
+msgid "Events"
 msgstr ""
 
-#: ../../mod/events.php:220
-msgid "l, F j"
+#: ../../mod/events.php:325
+msgid "Create New Event"
 msgstr ""
 
-#: ../../mod/events.php:232
-msgid "Edit event"
+#: ../../mod/events.php:326
+msgid "Previous"
 msgstr ""
 
-#: ../../mod/events.php:234 ../../include/text.php:857
-msgid "link to source"
+#: ../../mod/events.php:327 ../../mod/install.php:210
+msgid "Next"
 msgstr ""
 
-#: ../../mod/events.php:302
+#: ../../mod/events.php:399
 msgid "hour:minute"
 msgstr ""
 
-#: ../../mod/events.php:311
+#: ../../mod/events.php:408
 msgid "Event details"
 msgstr ""
 
-#: ../../mod/events.php:312
+#: ../../mod/events.php:409
 #, php-format
 msgid "Format is %s %s. Starting date and Description are required."
 msgstr ""
 
-#: ../../mod/events.php:313
+#: ../../mod/events.php:411
 msgid "Event Starts:"
 msgstr ""
 
-#: ../../mod/events.php:316
+#: ../../mod/events.php:414
 msgid "Finish date/time is not known or not relevant"
 msgstr ""
 
-#: ../../mod/events.php:318
+#: ../../mod/events.php:416
 msgid "Event Finishes:"
 msgstr ""
 
-#: ../../mod/events.php:321
+#: ../../mod/events.php:419
 msgid "Adjust for viewer timezone"
 msgstr ""
 
-#: ../../mod/events.php:323
+#: ../../mod/events.php:421
 msgid "Description:"
 msgstr ""
 
-#: ../../mod/events.php:325 ../../include/event.php:37
-#: ../../include/bb2diaspora.php:249 ../../boot.php:942
+#: ../../mod/events.php:423 ../../include/event.php:37
+#: ../../include/bb2diaspora.php:260 ../../boot.php:1102
 msgid "Location:"
 msgstr ""
 
-#: ../../mod/events.php:327
+#: ../../mod/events.php:425
 msgid "Share this event"
 msgstr ""
 
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/dfrn_request.php:655 ../../mod/settings.php:433
-#: ../../mod/settings.php:459 ../../addon/js_upload/js_upload.php:45
+#: ../../mod/dfrn_request.php:826 ../../mod/settings.php:554
+#: ../../mod/settings.php:580 ../../addon/js_upload/js_upload.php:45
 msgid "Cancel"
 msgstr ""
 
@@ -270,11 +296,11 @@ msgstr ""
 msgid "Select a tag to remove: "
 msgstr ""
 
-#: ../../mod/tagrm.php:93
+#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130
 msgid "Remove"
 msgstr ""
 
-#: ../../mod/dfrn_poll.php:90 ../../mod/dfrn_poll.php:516
+#: ../../mod/dfrn_poll.php:94 ../../mod/dfrn_poll.php:522
 #, php-format
 msgid "%s welcomes %s"
 msgstr ""
@@ -297,288 +323,293 @@ msgid ""
 "and/or create new posts for you?"
 msgstr ""
 
-#: ../../mod/api.php:105 ../../mod/dfrn_request.php:645
-#: ../../mod/settings.php:653 ../../mod/settings.php:659
-#: ../../mod/settings.php:667 ../../mod/settings.php:671
-#: ../../mod/settings.php:676 ../../mod/settings.php:682
-#: ../../mod/settings.php:729 ../../mod/settings.php:730
-#: ../../mod/settings.php:731 ../../mod/settings.php:732
-#: ../../mod/register.php:500 ../../mod/profiles.php:357
+#: ../../mod/api.php:105 ../../mod/dfrn_request.php:814
+#: ../../mod/settings.php:875 ../../mod/settings.php:881
+#: ../../mod/settings.php:889 ../../mod/settings.php:893
+#: ../../mod/settings.php:898 ../../mod/settings.php:904
+#: ../../mod/settings.php:910 ../../mod/settings.php:916
+#: ../../mod/settings.php:952 ../../mod/settings.php:953
+#: ../../mod/settings.php:954 ../../mod/settings.php:955
+#: ../../mod/register.php:511 ../../mod/profiles.php:511
 msgid "Yes"
 msgstr ""
 
-#: ../../mod/api.php:106 ../../mod/dfrn_request.php:646
-#: ../../mod/settings.php:653 ../../mod/settings.php:659
-#: ../../mod/settings.php:667 ../../mod/settings.php:671
-#: ../../mod/settings.php:676 ../../mod/settings.php:682
-#: ../../mod/settings.php:729 ../../mod/settings.php:730
-#: ../../mod/settings.php:731 ../../mod/settings.php:732
-#: ../../mod/register.php:501 ../../mod/profiles.php:358
+#: ../../mod/api.php:106 ../../mod/dfrn_request.php:815
+#: ../../mod/settings.php:875 ../../mod/settings.php:881
+#: ../../mod/settings.php:889 ../../mod/settings.php:893
+#: ../../mod/settings.php:898 ../../mod/settings.php:904
+#: ../../mod/settings.php:910 ../../mod/settings.php:916
+#: ../../mod/settings.php:952 ../../mod/settings.php:953
+#: ../../mod/settings.php:954 ../../mod/settings.php:955
+#: ../../mod/register.php:512 ../../mod/profiles.php:512
 msgid "No"
 msgstr ""
 
-#: ../../mod/photos.php:42
+#: ../../mod/photos.php:43 ../../boot.php:1497
 msgid "Photo Albums"
 msgstr ""
 
-#: ../../mod/photos.php:50 ../../mod/photos.php:144 ../../mod/photos.php:866
-#: ../../mod/photos.php:936 ../../mod/photos.php:951 ../../mod/photos.php:1351
-#: ../../mod/photos.php:1363 ../../addon/communityhome/communityhome.php:110
+#: ../../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:593
 msgid "Contact Photos"
 msgstr ""
 
-#: ../../mod/photos.php:62 ../../mod/settings.php:9
+#: ../../mod/photos.php:58 ../../mod/photos.php:975 ../../mod/photos.php:1424
+msgid "Upload New Photos"
+msgstr ""
+
+#: ../../mod/photos.php:69 ../../mod/settings.php:20
 msgid "everybody"
 msgstr ""
 
-#: ../../mod/photos.php:133
+#: ../../mod/photos.php:140
 msgid "Contact information unavailable"
 msgstr ""
 
-#: ../../mod/photos.php:144 ../../mod/photos.php:591 ../../mod/photos.php:936
-#: ../../mod/photos.php:951 ../../mod/register.php:318
-#: ../../mod/register.php:325 ../../mod/register.php:332
-#: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65
-#: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:170
-#: ../../mod/profile_photo.php:246 ../../mod/profile_photo.php:255
+#: ../../mod/photos.php:151 ../../mod/photos.php:597 ../../mod/photos.php:950
+#: ../../mod/photos.php:965 ../../mod/register.php:314
+#: ../../mod/register.php:321 ../../mod/register.php:328
+#: ../../mod/profile_photo.php:60 ../../mod/profile_photo.php:67
+#: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174
+#: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261
 #: ../../addon/communityhome/communityhome.php:111
+#: ../../view/theme/diabook/theme.php:594
 msgid "Profile Photos"
 msgstr ""
 
-#: ../../mod/photos.php:154
+#: ../../mod/photos.php:161
 msgid "Album not found."
 msgstr ""
 
-#: ../../mod/photos.php:172 ../../mod/photos.php:945
+#: ../../mod/photos.php:179 ../../mod/photos.php:959
 msgid "Delete Album"
 msgstr ""
 
-#: ../../mod/photos.php:235 ../../mod/photos.php:1164
+#: ../../mod/photos.php:242 ../../mod/photos.php:1194
 msgid "Delete Photo"
 msgstr ""
 
-#: ../../mod/photos.php:522
+#: ../../mod/photos.php:528
 msgid "was tagged in a"
 msgstr ""
 
-#: ../../mod/photos.php:522 ../../mod/like.php:127 ../../mod/tagger.php:70
+#: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70
 #: ../../addon/communityhome/communityhome.php:163
-#: ../../include/diaspora.php:1213 ../../include/conversation.php:31
-#: ../../include/conversation.php:104
+#: ../../view/theme/diabook/theme.php:565 ../../include/text.php:1305
+#: ../../include/diaspora.php:1662 ../../include/conversation.php:53
+#: ../../include/conversation.php:126
 msgid "photo"
 msgstr ""
 
-#: ../../mod/photos.php:522
+#: ../../mod/photos.php:528
 msgid "by"
 msgstr ""
 
-#: ../../mod/photos.php:625 ../../addon/js_upload/js_upload.php:312
+#: ../../mod/photos.php:631 ../../addon/js_upload/js_upload.php:315
 msgid "Image exceeds size limit of "
 msgstr ""
 
-#: ../../mod/photos.php:633
+#: ../../mod/photos.php:639
 msgid "Image file is empty."
 msgstr ""
 
-#: ../../mod/photos.php:647 ../../mod/profile_photo.php:122
-#: ../../mod/wall_upload.php:65
+#: ../../mod/photos.php:653 ../../mod/profile_photo.php:124
+#: ../../mod/wall_upload.php:83
 msgid "Unable to process image."
 msgstr ""
 
-#: ../../mod/photos.php:667 ../../mod/profile_photo.php:251
-#: ../../mod/wall_upload.php:84
+#: ../../mod/photos.php:673 ../../mod/profile_photo.php:257
+#: ../../mod/wall_upload.php:102
 msgid "Image upload failed."
 msgstr ""
 
-#: ../../mod/photos.php:752 ../../mod/community.php:16
-#: ../../mod/dfrn_request.php:594 ../../mod/viewcontacts.php:16
-#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:31
+#: ../../mod/photos.php:759 ../../mod/community.php:16
+#: ../../mod/dfrn_request.php:740 ../../mod/viewcontacts.php:17
+#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29
 msgid "Public access denied."
 msgstr ""
 
-#: ../../mod/photos.php:762
+#: ../../mod/photos.php:769
 msgid "No photos selected"
 msgstr ""
 
-#: ../../mod/photos.php:839
+#: ../../mod/photos.php:846
 msgid "Access to this item is restricted."
 msgstr ""
 
-#: ../../mod/photos.php:893
+#: ../../mod/photos.php:907
 msgid "Upload Photos"
 msgstr ""
 
-#: ../../mod/photos.php:896 ../../mod/photos.php:940
+#: ../../mod/photos.php:910 ../../mod/photos.php:954
 msgid "New album name: "
 msgstr ""
 
-#: ../../mod/photos.php:897
+#: ../../mod/photos.php:911
 msgid "or existing album name: "
 msgstr ""
 
-#: ../../mod/photos.php:898
+#: ../../mod/photos.php:912
 msgid "Do not show a status post for this upload"
 msgstr ""
 
-#: ../../mod/photos.php:900 ../../mod/photos.php:1159
+#: ../../mod/photos.php:914 ../../mod/photos.php:1189
 msgid "Permissions"
 msgstr ""
 
-#: ../../mod/photos.php:955
+#: ../../mod/photos.php:969
 msgid "Edit Album"
 msgstr ""
 
-#: ../../mod/photos.php:965 ../../mod/photos.php:1381
+#: ../../mod/photos.php:984 ../../mod/photos.php:1407
 msgid "View Photo"
 msgstr ""
 
-#: ../../mod/photos.php:1000
+#: ../../mod/photos.php:1019
 msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: ../../mod/photos.php:1002
+#: ../../mod/photos.php:1021
 msgid "Photo not available"
 msgstr ""
 
-#: ../../mod/photos.php:1052
+#: ../../mod/photos.php:1071
 msgid "View photo"
 msgstr ""
 
-#: ../../mod/photos.php:1052
+#: ../../mod/photos.php:1071
 msgid "Edit photo"
 msgstr ""
 
-#: ../../mod/photos.php:1053
+#: ../../mod/photos.php:1072
 msgid "Use as profile photo"
 msgstr ""
 
-#: ../../mod/photos.php:1059 ../../include/conversation.php:414
+#: ../../mod/photos.php:1078 ../../include/conversation.php:483
 msgid "Private Message"
 msgstr ""
 
-#: ../../mod/photos.php:1070
+#: ../../mod/photos.php:1100
 msgid "View Full Size"
 msgstr ""
 
-#: ../../mod/photos.php:1138
+#: ../../mod/photos.php:1168
 msgid "Tags: "
 msgstr ""
 
-#: ../../mod/photos.php:1141
+#: ../../mod/photos.php:1171
 msgid "[Remove any tag]"
 msgstr ""
 
-#: ../../mod/photos.php:1152
+#: ../../mod/photos.php:1182
 msgid "New album name"
 msgstr ""
 
-#: ../../mod/photos.php:1155
+#: ../../mod/photos.php:1185
 msgid "Caption"
 msgstr ""
 
-#: ../../mod/photos.php:1157
+#: ../../mod/photos.php:1187
 msgid "Add a Tag"
 msgstr ""
 
-#: ../../mod/photos.php:1161
+#: ../../mod/photos.php:1191
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: ../../mod/photos.php:1181 ../../include/conversation.php:461
+#: ../../mod/photos.php:1211 ../../include/conversation.php:532
 msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1182 ../../include/conversation.php:462
+#: ../../mod/photos.php:1212 ../../include/conversation.php:533
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1183 ../../include/conversation.php:852
+#: ../../mod/photos.php:1213 ../../include/conversation.php:967
 msgid "Share"
 msgstr ""
 
-#: ../../mod/photos.php:1184 ../../mod/editpost.php:99
-#: ../../mod/message.php:137 ../../mod/message.php:270
-#: ../../include/conversation.php:288 ../../include/conversation.php:616
-#: ../../include/conversation.php:861
+#: ../../mod/photos.php:1214 ../../mod/editpost.php:104
+#: ../../mod/wallmessage.php:145 ../../mod/message.php:214
+#: ../../mod/message.php:408 ../../include/conversation.php:364
+#: ../../include/conversation.php:709 ../../include/conversation.php:986
 msgid "Please wait"
 msgstr ""
 
-#: ../../mod/photos.php:1200 ../../mod/photos.php:1239
-#: ../../mod/photos.php:1270 ../../include/conversation.php:476
+#: ../../mod/photos.php:1230 ../../mod/photos.php:1270
+#: ../../mod/photos.php:1301 ../../include/conversation.php:555
 msgid "This is you"
 msgstr ""
 
-#: ../../mod/photos.php:1202 ../../mod/photos.php:1241
-#: ../../mod/photos.php:1272 ../../include/conversation.php:478
-#: ../../boot.php:420
+#: ../../mod/photos.php:1232 ../../mod/photos.php:1272
+#: ../../mod/photos.php:1303 ../../include/conversation.php:557
+#: ../../boot.php:516
 msgid "Comment"
 msgstr ""
 
-#: ../../mod/photos.php:1300 ../../mod/settings.php:492
-#: ../../mod/group.php:154 ../../mod/admin.php:468
-#: ../../include/conversation.php:248 ../../include/conversation.php:499
-msgid "Delete"
+#: ../../mod/photos.php:1234 ../../mod/editpost.php:125
+#: ../../include/conversation.php:567 ../../include/conversation.php:1004
+msgid "Preview"
 msgstr ""
 
-#: ../../mod/photos.php:1368
-msgid "Recent Photos"
+#: ../../mod/photos.php:1331 ../../mod/settings.php:616
+#: ../../mod/settings.php:697 ../../mod/group.php:168 ../../mod/admin.php:647
+#: ../../include/conversation.php:321 ../../include/conversation.php:587
+msgid "Delete"
 msgstr ""
 
-#: ../../mod/photos.php:1372
-msgid "Upload New Photos"
+#: ../../mod/photos.php:1413
+msgid "View Album"
 msgstr ""
 
-#: ../../mod/photos.php:1385
-msgid "View Album"
+#: ../../mod/photos.php:1422
+msgid "Recent Photos"
 msgstr ""
 
 #: ../../mod/community.php:21
 msgid "Not available."
 msgstr ""
 
-#: ../../mod/community.php:30 ../../include/nav.php:97
+#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:128
+#: ../../include/nav.php:101
 msgid "Community"
 msgstr ""
 
-#: ../../mod/community.php:60 ../../mod/search.php:125
+#: ../../mod/community.php:61 ../../mod/search.php:138
 msgid "No results."
 msgstr ""
 
-#: ../../mod/community.php:87
-msgid ""
-"Shared content is covered by the <a href=\"http://creativecommons.org/"
-"licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license."
-msgstr ""
-
-#: ../../mod/friendica.php:43
+#: ../../mod/friendica.php:55
 msgid "This is Friendica, version"
 msgstr ""
 
-#: ../../mod/friendica.php:44
+#: ../../mod/friendica.php:56
 msgid "running at web location"
 msgstr ""
 
-#: ../../mod/friendica.php:46
+#: ../../mod/friendica.php:58
 msgid ""
-"Please visit <a href=\"http://project.friendika.com\">Project.Friendika.com</"
-"a> to learn more about the Friendica project."
+"Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn "
+"more about the Friendica project."
 msgstr ""
 
-#: ../../mod/friendica.php:48
+#: ../../mod/friendica.php:60
 msgid "Bug reports and issues: please visit"
 msgstr ""
 
-#: ../../mod/friendica.php:49
+#: ../../mod/friendica.php:61
 msgid ""
 "Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - "
 "dot com"
 msgstr ""
 
-#: ../../mod/friendica.php:54
-msgid "Installed plugins/addons/apps"
+#: ../../mod/friendica.php:75
+msgid "Installed plugins/addons/apps:"
 msgstr ""
 
-#: ../../mod/friendica.php:62
+#: ../../mod/friendica.php:88
 msgid "No installed plugins/addons/apps"
 msgstr ""
 
@@ -586,441 +617,510 @@ msgstr ""
 msgid "Item not found"
 msgstr ""
 
-#: ../../mod/editpost.php:32
+#: ../../mod/editpost.php:36
 msgid "Edit post"
 msgstr ""
 
-#: ../../mod/editpost.php:75 ../../include/conversation.php:838
+#: ../../mod/editpost.php:80 ../../include/conversation.php:953
 msgid "Post to Email"
 msgstr ""
 
-#: ../../mod/editpost.php:90 ../../mod/settings.php:491
-#: ../../include/conversation.php:486
+#: ../../mod/editpost.php:95 ../../mod/settings.php:615
+#: ../../include/conversation.php:574
 msgid "Edit"
 msgstr ""
 
-#: ../../mod/editpost.php:91 ../../mod/message.php:135
-#: ../../mod/message.php:268 ../../include/conversation.php:853
+#: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143
+#: ../../mod/message.php:212 ../../mod/message.php:406
+#: ../../include/conversation.php:968
 msgid "Upload photo"
 msgstr ""
 
-#: ../../mod/editpost.php:92 ../../include/conversation.php:854
+#: ../../mod/editpost.php:97 ../../include/conversation.php:970
 msgid "Attach file"
 msgstr ""
 
-#: ../../mod/editpost.php:93 ../../mod/message.php:136
-#: ../../mod/message.php:269 ../../include/conversation.php:855
+#: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144
+#: ../../mod/message.php:213 ../../mod/message.php:407
+#: ../../include/conversation.php:972
 msgid "Insert web link"
 msgstr ""
 
-#: ../../mod/editpost.php:94
+#: ../../mod/editpost.php:99
 msgid "Insert YouTube video"
 msgstr ""
 
-#: ../../mod/editpost.php:95
+#: ../../mod/editpost.php:100
 msgid "Insert Vorbis [.ogg] video"
 msgstr ""
 
-#: ../../mod/editpost.php:96
+#: ../../mod/editpost.php:101
 msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../mod/editpost.php:97 ../../include/conversation.php:858
+#: ../../mod/editpost.php:102 ../../include/conversation.php:978
 msgid "Set your location"
 msgstr ""
 
-#: ../../mod/editpost.php:98 ../../include/conversation.php:859
+#: ../../mod/editpost.php:103 ../../include/conversation.php:980
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/editpost.php:100 ../../include/conversation.php:862
+#: ../../mod/editpost.php:105 ../../include/conversation.php:987
 msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/editpost.php:108 ../../include/conversation.php:870
+#: ../../mod/editpost.php:113 ../../include/conversation.php:996
 msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/editpost.php:109 ../../include/conversation.php:871
+#: ../../mod/editpost.php:114 ../../include/conversation.php:997
 msgid "Public post"
 msgstr ""
 
-#: ../../mod/editpost.php:111 ../../include/conversation.php:873
+#: ../../mod/editpost.php:117 ../../include/conversation.php:983
+msgid "Set title"
+msgstr ""
+
+#: ../../mod/editpost.php:119 ../../include/conversation.php:985
+msgid "Categories (comma-separated list)"
+msgstr ""
+
+#: ../../mod/editpost.php:120 ../../include/conversation.php:999
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:92
+#: ../../mod/dfrn_request.php:93
 msgid "This introduction has already been accepted."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:116 ../../mod/dfrn_request.php:351
+#: ../../mod/dfrn_request.php:117 ../../mod/dfrn_request.php:495
 msgid "Profile location is not valid or does not contain profile information."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:121 ../../mod/dfrn_request.php:356
+#: ../../mod/dfrn_request.php:122 ../../mod/dfrn_request.php:500
 msgid "Warning: profile location has no identifiable owner name."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:358
+#: ../../mod/dfrn_request.php:124 ../../mod/dfrn_request.php:502
 msgid "Warning: profile location has no profile photo."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:126 ../../mod/dfrn_request.php:361
+#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:505
 #, php-format
 msgid "%d required parameter was not found at the given location"
 msgid_plural "%d required parameters were not found at the given location"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/dfrn_request.php:167
+#: ../../mod/dfrn_request.php:168
 msgid "Introduction complete."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:191
+#: ../../mod/dfrn_request.php:192
 msgid "Unrecoverable protocol error."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:219
+#: ../../mod/dfrn_request.php:220
 msgid "Profile unavailable."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:244
+#: ../../mod/dfrn_request.php:245
 #, php-format
 msgid "%s has received too many connection requests today."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:245
+#: ../../mod/dfrn_request.php:246
 msgid "Spam protection measures have been invoked."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:246
+#: ../../mod/dfrn_request.php:247
 msgid "Friends are advised to please try again in 24 hours."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:276
+#: ../../mod/dfrn_request.php:309
 msgid "Invalid locator"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:296
+#: ../../mod/dfrn_request.php:318
+msgid "Invalid email address."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:344
+msgid "This account has not been configured for email. Request failed."
+msgstr ""
+
+#: ../../mod/dfrn_request.php:440
 msgid "Unable to resolve your name at the provided location."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:309
+#: ../../mod/dfrn_request.php:453
 msgid "You have already introduced yourself here."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:313
+#: ../../mod/dfrn_request.php:457
 #, php-format
 msgid "Apparently you are already friends with %s."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:334
+#: ../../mod/dfrn_request.php:478
 msgid "Invalid profile URL."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:340 ../../mod/follow.php:20
+#: ../../mod/dfrn_request.php:484 ../../mod/follow.php:23
 msgid "Disallowed profile URL."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:409 ../../mod/contacts.php:99
+#: ../../mod/dfrn_request.php:553 ../../mod/contacts.php:102
 msgid "Failed to update contact record."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:430
+#: ../../mod/dfrn_request.php:574
 msgid "Your introduction has been sent."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:483
+#: ../../mod/dfrn_request.php:627
 msgid "Please login to confirm introduction."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:497
+#: ../../mod/dfrn_request.php:641
 msgid ""
 "Incorrect identity currently logged in. Please login to <strong>this</"
 "strong> profile."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:509
+#: ../../mod/dfrn_request.php:653
 #, php-format
 msgid "Welcome home %s."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:510
+#: ../../mod/dfrn_request.php:654
 #, php-format
 msgid "Please confirm your introduction/connection request to %s."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:511
+#: ../../mod/dfrn_request.php:655
 msgid "Confirm"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:544 ../../include/items.php:2525
+#: ../../mod/dfrn_request.php:696 ../../include/items.php:2729
 msgid "[Name Withheld]"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:551
-msgid "Introduction received at "
-msgstr ""
-
-#: ../../mod/dfrn_request.php:553 ../../mod/lostpass.php:44
-#: ../../mod/lostpass.php:106 ../../mod/register.php:371
-#: ../../mod/register.php:425 ../../mod/regmod.php:54
-#: ../../mod/dfrn_confirm.php:703 ../../include/items.php:1833
-#: ../../include/items.php:2208 ../../include/items.php:2534
-msgid "Administrator"
+#: ../../mod/dfrn_request.php:789
+msgid ""
+"Please enter your 'Identity Address' from one of the following supported "
+"communications networks:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:635
-#, php-format
-msgid ""
-"Diaspora members: Please do not use this form. Instead, enter \"%s\" into "
-"your Diaspora search bar."
+#: ../../mod/dfrn_request.php:805
+msgid "<strike>Connect as an email follower</strike> (Coming soon)"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:638
+#: ../../mod/dfrn_request.php:807
 msgid ""
-"Please enter your 'Identity Address' from one of the following supported "
-"social networks:"
+"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:641
+#: ../../mod/dfrn_request.php:810
 msgid "Friend/Connection Request"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:642
+#: ../../mod/dfrn_request.php:811
 msgid ""
 "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
 "testuser@identi.ca"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:643
+#: ../../mod/dfrn_request.php:812
 msgid "Please answer the following:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:644
+#: ../../mod/dfrn_request.php:813
 #, php-format
 msgid "Does %s know you?"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:647
+#: ../../mod/dfrn_request.php:816
 msgid "Add a personal note:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:649 ../../include/contact_selectors.php:78
+#: ../../mod/dfrn_request.php:818 ../../include/contact_selectors.php:76
 msgid "Friendica"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:650
+#: ../../mod/dfrn_request.php:819
 msgid "StatusNet/Federated Social Web"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:651 ../../mod/settings.php:527
-#: ../../include/contact_selectors.php:78
+#: ../../mod/dfrn_request.php:820 ../../mod/settings.php:650
+#: ../../include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:652
-msgid "- please share from your own site as noted above"
+#: ../../mod/dfrn_request.php:821
+#, php-format
+msgid ""
+" - please do not use this form.  Instead, enter %s into your Diaspora search "
+"bar."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:653
+#: ../../mod/dfrn_request.php:822
 msgid "Your Identity Address:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:654
+#: ../../mod/dfrn_request.php:825
 msgid "Submit Request"
 msgstr ""
 
-#: ../../mod/install.php:34
-msgid "Could not create/connect to database."
+#: ../../mod/install.php:111
+msgid "Friendica Social Communications Server - Setup"
 msgstr ""
 
-#: ../../mod/install.php:39
-msgid "Connected to database."
+#: ../../mod/install.php:117 ../../mod/install.php:157
+#: ../../mod/install.php:230
+msgid "Database connection"
 msgstr ""
 
-#: ../../mod/install.php:75
-msgid "Proceed with Installation"
+#: ../../mod/install.php:124
+msgid "Could not connect to database."
+msgstr ""
+
+#: ../../mod/install.php:128
+msgid "Could not create table."
 msgstr ""
 
-#: ../../mod/install.php:77
-msgid "Your Friendika site database has been installed."
+#: ../../mod/install.php:133
+msgid "Your Friendica site database has been installed."
 msgstr ""
 
-#: ../../mod/install.php:78
+#: ../../mod/install.php:134
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
-#: ../../mod/install.php:79 ../../mod/install.php:89 ../../mod/install.php:207
+#: ../../mod/install.php:135 ../../mod/install.php:151
+#: ../../mod/install.php:209
 msgid "Please see the file \"INSTALL.txt\"."
 msgstr ""
 
-#: ../../mod/install.php:81
+#: ../../mod/install.php:137
 msgid "Proceed to registration"
 msgstr ""
 
-#: ../../mod/install.php:87
-msgid "Database import failed."
+#: ../../mod/install.php:143
+msgid "Proceed with Installation"
 msgstr ""
 
-#: ../../mod/install.php:88
+#: ../../mod/install.php:150
 msgid ""
 "You may need to import the file \"database.sql\" manually using phpmyadmin "
 "or mysql."
 msgstr ""
 
-#: ../../mod/install.php:101
-msgid "Welcome to Friendika."
+#: ../../mod/install.php:158
+msgid "Database import failed."
 msgstr ""
 
-#: ../../mod/install.php:124
-msgid "Friendika Social Network"
+#: ../../mod/install.php:206
+msgid "System check"
 msgstr ""
 
-#: ../../mod/install.php:125
-msgid "Installation"
+#: ../../mod/install.php:211
+msgid "Check again"
 msgstr ""
 
-#: ../../mod/install.php:126
+#: ../../mod/install.php:231
 msgid ""
-"In order to install Friendika we need to know how to connect to your "
+"In order to install Friendica we need to know how to connect to your "
 "database."
 msgstr ""
 
-#: ../../mod/install.php:127
+#: ../../mod/install.php:232
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
 msgstr ""
 
-#: ../../mod/install.php:128
+#: ../../mod/install.php:233
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
 msgstr ""
 
-#: ../../mod/install.php:129
+#: ../../mod/install.php:237
 msgid "Database Server Name"
 msgstr ""
 
-#: ../../mod/install.php:130
+#: ../../mod/install.php:238
 msgid "Database Login Name"
 msgstr ""
 
-#: ../../mod/install.php:131
+#: ../../mod/install.php:239
 msgid "Database Login Password"
 msgstr ""
 
-#: ../../mod/install.php:132
+#: ../../mod/install.php:240
 msgid "Database Name"
 msgstr ""
 
-#: ../../mod/install.php:133
-msgid "Please select a default timezone for your website"
+#: ../../mod/install.php:241 ../../mod/install.php:280
+msgid "Site administrator email address"
 msgstr ""
 
-#: ../../mod/install.php:134
+#: ../../mod/install.php:241 ../../mod/install.php:280
 msgid ""
-"Site administrator email address. Your account email address must match this "
-"in order to use the web admin panel."
+"Your account email address must match this in order to use the web admin "
+"panel."
+msgstr ""
+
+#: ../../mod/install.php:245 ../../mod/install.php:283
+msgid "Please select a default timezone for your website"
+msgstr ""
+
+#: ../../mod/install.php:270
+msgid "Site settings"
 msgstr ""
 
-#: ../../mod/install.php:153
+#: ../../mod/install.php:323
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 
-#: ../../mod/install.php:154
-msgid ""
-"This is required. Please adjust the configuration file .htconfig.php "
-"accordingly."
+#: ../../mod/install.php:326
+msgid "PHP executable path"
 msgstr ""
 
-#: ../../mod/install.php:161
+#: ../../mod/install.php:326
+msgid "Enter full path to php executable"
+msgstr ""
+
+#: ../../mod/install.php:331
+msgid "Command line PHP"
+msgstr ""
+
+#: ../../mod/install.php:340
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr ""
 
-#: ../../mod/install.php:162
+#: ../../mod/install.php:341
 msgid "This is required for message delivery to work."
 msgstr ""
 
-#: ../../mod/install.php:184
+#: ../../mod/install.php:343
+msgid "PHP register_argc_argv"
+msgstr ""
+
+#: ../../mod/install.php:364
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr ""
 
-#: ../../mod/install.php:185
+#: ../../mod/install.php:365
 msgid ""
 "If running under Windows, please see \"http://www.php.net/manual/en/openssl."
 "installation.php\"."
 msgstr ""
 
-#: ../../mod/install.php:194
+#: ../../mod/install.php:367
+msgid "Generate encryption keys"
+msgstr ""
+
+#: ../../mod/install.php:374
+msgid "libCurl PHP module"
+msgstr ""
+
+#: ../../mod/install.php:375
+msgid "GD graphics PHP module"
+msgstr ""
+
+#: ../../mod/install.php:376
+msgid "OpenSSL PHP module"
+msgstr ""
+
+#: ../../mod/install.php:377
+msgid "mysqli PHP module"
+msgstr ""
+
+#: ../../mod/install.php:378
+msgid "mb_string PHP module"
+msgstr ""
+
+#: ../../mod/install.php:383 ../../mod/install.php:385
+msgid "Apache mod_rewrite module"
+msgstr ""
+
+#: ../../mod/install.php:383
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: ../../mod/install.php:196
+#: ../../mod/install.php:390
 msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/install.php:198
+#: ../../mod/install.php:394
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: ../../mod/install.php:200
+#: ../../mod/install.php:398
 msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/install.php:202
+#: ../../mod/install.php:402
 msgid "Error: mysqli PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/install.php:204
+#: ../../mod/install.php:406
 msgid "Error: mb_string PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/install.php:216
+#: ../../mod/install.php:423
 msgid ""
 "The web installer needs to be able to create a file called \".htconfig.php\" "
 "in the top folder of your web server and it is unable to do so."
 msgstr ""
 
-#: ../../mod/install.php:217
+#: ../../mod/install.php:424
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
 msgstr ""
 
-#: ../../mod/install.php:218
+#: ../../mod/install.php:425
 msgid ""
 "Please check with your site documentation or support people to see if this "
 "situation can be corrected."
 msgstr ""
 
-#: ../../mod/install.php:219
+#: ../../mod/install.php:426
 msgid ""
 "If not, you may be required to perform a manual installation. Please see the "
 "file \"INSTALL.txt\" for instructions."
 msgstr ""
 
-#: ../../mod/install.php:228
+#: ../../mod/install.php:429
+msgid ".htconfig.php is writable"
+msgstr ""
+
+#: ../../mod/install.php:436
 msgid ""
 "The database configuration file \".htconfig.php\" could not be written. "
 "Please use the enclosed text to create a configuration file in your web "
 "server root."
 msgstr ""
 
-#: ../../mod/install.php:243
+#: ../../mod/install.php:461
 msgid "Errors encountered creating database tables."
 msgstr ""
 
 #: ../../mod/localtime.php:12 ../../include/event.php:11
-#: ../../include/bb2diaspora.php:227
+#: ../../include/bb2diaspora.php:238
 msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
@@ -1053,15 +1153,24 @@ msgstr ""
 msgid "Please select your timezone:"
 msgstr ""
 
-#: ../../mod/match.php:10
+#: ../../mod/match.php:12
 msgid "Profile Match"
 msgstr ""
 
-#: ../../mod/match.php:18
+#: ../../mod/match.php:20
 msgid "No keywords to match. Please add keywords to your default profile."
 msgstr ""
 
-#: ../../mod/match.php:57 ../../mod/dirfind.php:57
+#: ../../mod/match.php:57
+msgid "is interested in:"
+msgstr ""
+
+#: ../../mod/match.php:58 ../../mod/suggest.php:59
+#: ../../include/contact_widgets.php:9 ../../boot.php:1046
+msgid "Connect"
+msgstr ""
+
+#: ../../mod/match.php:65 ../../mod/dirfind.php:60
 msgid "No matches"
 msgstr ""
 
@@ -1073,7 +1182,7 @@ msgstr ""
 msgid "Visible to:"
 msgstr ""
 
-#: ../../mod/home.php:23 ../../addon/communityhome/communityhome.php:179
+#: ../../mod/home.php:26 ../../addon/communityhome/communityhome.php:179
 #, php-format
 msgid "Welcome to %s"
 msgstr ""
@@ -1082,870 +1191,1149 @@ msgstr ""
 msgid "Invalid request identifier."
 msgstr ""
 
-#: ../../mod/notifications.php:35 ../../mod/notifications.php:144
-#: ../../mod/notifications.php:188
+#: ../../mod/notifications.php:35 ../../mod/notifications.php:161
+#: ../../mod/notifications.php:207
 msgid "Discard"
 msgstr ""
 
-#: ../../mod/notifications.php:47 ../../mod/notifications.php:143
-#: ../../mod/notifications.php:187 ../../mod/contacts.php:289
-#: ../../mod/contacts.php:332
+#: ../../mod/notifications.php:51 ../../mod/notifications.php:160
+#: ../../mod/notifications.php:206 ../../mod/contacts.php:296
+#: ../../mod/contacts.php:348
 msgid "Ignore"
 msgstr ""
 
-#: ../../mod/notifications.php:71 ../../include/nav.php:109
+#: ../../mod/notifications.php:75
+msgid "System"
+msgstr ""
+
+#: ../../mod/notifications.php:80 ../../include/nav.php:113
 msgid "Network"
 msgstr ""
 
-#: ../../mod/notifications.php:76 ../../include/nav.php:73
-#: ../../include/nav.php:111
+#: ../../mod/notifications.php:85 ../../mod/network.php:184
+msgid "Personal"
+msgstr ""
+
+#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:122
+#: ../../include/nav.php:77 ../../include/nav.php:115
 msgid "Home"
 msgstr ""
 
-#: ../../mod/notifications.php:81 ../../include/nav.php:117
+#: ../../mod/notifications.php:95 ../../include/nav.php:121
 msgid "Introductions"
 msgstr ""
 
-#: ../../mod/notifications.php:86 ../../mod/message.php:72
-#: ../../include/nav.php:122
+#: ../../mod/notifications.php:100 ../../mod/message.php:104
+#: ../../include/nav.php:128
 msgid "Messages"
 msgstr ""
 
-#: ../../mod/notifications.php:105
+#: ../../mod/notifications.php:119
 msgid "Show Ignored Requests"
 msgstr ""
 
-#: ../../mod/notifications.php:105
+#: ../../mod/notifications.php:119
 msgid "Hide Ignored Requests"
 msgstr ""
 
-#: ../../mod/notifications.php:131 ../../mod/notifications.php:174
+#: ../../mod/notifications.php:145 ../../mod/notifications.php:191
 msgid "Notification type: "
 msgstr ""
 
-#: ../../mod/notifications.php:132
+#: ../../mod/notifications.php:146
 msgid "Friend Suggestion"
 msgstr ""
 
-#: ../../mod/notifications.php:134
+#: ../../mod/notifications.php:148
 #, php-format
 msgid "suggested by %s"
 msgstr ""
 
-#: ../../mod/notifications.php:140 ../../mod/notifications.php:185
-#: ../../mod/admin.php:466
+#: ../../mod/notifications.php:153 ../../mod/notifications.php:200
+#: ../../mod/contacts.php:354
+msgid "Hide this contact from others"
+msgstr ""
+
+#: ../../mod/notifications.php:154 ../../mod/notifications.php:201
+msgid "Post a new friend activity"
+msgstr ""
+
+#: ../../mod/notifications.php:154 ../../mod/notifications.php:201
+msgid "if applicable"
+msgstr ""
+
+#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
+#: ../../mod/admin.php:645
 msgid "Approve"
 msgstr ""
 
-#: ../../mod/notifications.php:160
+#: ../../mod/notifications.php:177
 msgid "Claims to be known to you: "
 msgstr ""
 
-#: ../../mod/notifications.php:160
+#: ../../mod/notifications.php:177
 msgid "yes"
 msgstr ""
 
-#: ../../mod/notifications.php:160
+#: ../../mod/notifications.php:177
 msgid "no"
 msgstr ""
 
-#: ../../mod/notifications.php:167
+#: ../../mod/notifications.php:184
 msgid "Approve as: "
 msgstr ""
 
-#: ../../mod/notifications.php:168
+#: ../../mod/notifications.php:185
 msgid "Friend"
 msgstr ""
 
-#: ../../mod/notifications.php:169
+#: ../../mod/notifications.php:186
 msgid "Sharer"
 msgstr ""
 
-#: ../../mod/notifications.php:169
+#: ../../mod/notifications.php:186
 msgid "Fan/Admirer"
 msgstr ""
 
-#: ../../mod/notifications.php:175
+#: ../../mod/notifications.php:192
 msgid "Friend/Connect Request"
 msgstr ""
 
-#: ../../mod/notifications.php:175
+#: ../../mod/notifications.php:192
 msgid "New Follower"
 msgstr ""
 
-#: ../../mod/notifications.php:194
-msgid "No notifications."
+#: ../../mod/notifications.php:213
+msgid "No introductions."
 msgstr ""
 
-#: ../../mod/notifications.php:197 ../../mod/notifications.php:283
-#: ../../mod/notifications.php:359 ../../include/nav.php:118
+#: ../../mod/notifications.php:216 ../../include/nav.php:122
 msgid "Notifications"
 msgstr ""
 
-#: ../../mod/notifications.php:234 ../../mod/notifications.php:316
+#: ../../mod/notifications.php:253 ../../mod/notifications.php:378
+#: ../../mod/notifications.php:465
 #, php-format
 msgid "%s liked %s's post"
 msgstr ""
 
-#: ../../mod/notifications.php:243 ../../mod/notifications.php:325
+#: ../../mod/notifications.php:262 ../../mod/notifications.php:387
+#: ../../mod/notifications.php:474
 #, php-format
 msgid "%s disliked %s's post"
 msgstr ""
 
-#: ../../mod/notifications.php:257 ../../mod/notifications.php:339
+#: ../../mod/notifications.php:276 ../../mod/notifications.php:401
+#: ../../mod/notifications.php:488
 #, php-format
 msgid "%s is now friends with %s"
 msgstr ""
 
-#: ../../mod/notifications.php:264
+#: ../../mod/notifications.php:283 ../../mod/notifications.php:408
 #, php-format
 msgid "%s created a new post"
 msgstr ""
 
-#: ../../mod/notifications.php:265 ../../mod/notifications.php:348
+#: ../../mod/notifications.php:284 ../../mod/notifications.php:409
+#: ../../mod/notifications.php:497
 #, php-format
 msgid "%s commented on %s's post"
 msgstr ""
 
-#: ../../mod/notifications.php:279 ../../mod/notifications.php:355
-msgid "Nothing new!"
+#: ../../mod/notifications.php:298
+msgid "No more network notifications."
+msgstr ""
+
+#: ../../mod/notifications.php:302
+msgid "Network Notifications"
+msgstr ""
+
+#: ../../mod/notifications.php:328 ../../mod/notify.php:61
+msgid "No more system notifications."
+msgstr ""
+
+#: ../../mod/notifications.php:332 ../../mod/notify.php:65
+msgid "System Notifications"
+msgstr ""
+
+#: ../../mod/notifications.php:423
+msgid "No more personal notifications."
+msgstr ""
+
+#: ../../mod/notifications.php:427
+msgid "Personal Notifications"
+msgstr ""
+
+#: ../../mod/notifications.php:504
+msgid "No more home notifications."
+msgstr ""
+
+#: ../../mod/notifications.php:508
+msgid "Home Notifications"
 msgstr ""
 
-#: ../../mod/contacts.php:62 ../../mod/contacts.php:133
+#: ../../mod/contacts.php:63 ../../mod/contacts.php:143
 msgid "Could not access contact record."
 msgstr ""
 
-#: ../../mod/contacts.php:76
+#: ../../mod/contacts.php:77
 msgid "Could not locate selected profile."
 msgstr ""
 
-#: ../../mod/contacts.php:97
+#: ../../mod/contacts.php:100
 msgid "Contact updated."
 msgstr ""
 
-#: ../../mod/contacts.php:155
+#: ../../mod/contacts.php:165
 msgid "Contact has been blocked"
 msgstr ""
 
-#: ../../mod/contacts.php:155
+#: ../../mod/contacts.php:165
 msgid "Contact has been unblocked"
 msgstr ""
 
-#: ../../mod/contacts.php:169
+#: ../../mod/contacts.php:179
 msgid "Contact has been ignored"
 msgstr ""
 
-#: ../../mod/contacts.php:169
+#: ../../mod/contacts.php:179
 msgid "Contact has been unignored"
 msgstr ""
 
-#: ../../mod/contacts.php:190
-msgid "stopped following"
+#: ../../mod/contacts.php:195
+msgid "Contact has been archived"
+msgstr ""
+
+#: ../../mod/contacts.php:195
+msgid "Contact has been unarchived"
 msgstr ""
 
-#: ../../mod/contacts.php:211
+#: ../../mod/contacts.php:208
 msgid "Contact has been removed."
 msgstr ""
 
-#: ../../mod/contacts.php:232
+#: ../../mod/contacts.php:238
 #, php-format
 msgid "You are mutual friends with %s"
 msgstr ""
 
-#: ../../mod/contacts.php:236
+#: ../../mod/contacts.php:242
 #, php-format
 msgid "You are sharing with %s"
 msgstr ""
 
-#: ../../mod/contacts.php:241
+#: ../../mod/contacts.php:247
 #, php-format
 msgid "%s is sharing with you"
 msgstr ""
 
-#: ../../mod/contacts.php:258
+#: ../../mod/contacts.php:264
 msgid "Private communications are not available for this contact."
 msgstr ""
 
-#: ../../mod/contacts.php:261
+#: ../../mod/contacts.php:267
 msgid "Never"
 msgstr ""
 
-#: ../../mod/contacts.php:265
+#: ../../mod/contacts.php:271
 msgid "(Update was successful)"
 msgstr ""
 
-#: ../../mod/contacts.php:265
+#: ../../mod/contacts.php:271
 msgid "(Update was not successful)"
 msgstr ""
 
-#: ../../mod/contacts.php:267
+#: ../../mod/contacts.php:273
 msgid "Suggest friends"
 msgstr ""
 
-#: ../../mod/contacts.php:271
+#: ../../mod/contacts.php:277
 #, php-format
 msgid "Network type: %s"
 msgstr ""
 
-#: ../../mod/contacts.php:274
+#: ../../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:279
+#: ../../mod/contacts.php:285
 msgid "View all contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:284 ../../mod/contacts.php:331
-#: ../../mod/admin.php:470
+#: ../../mod/contacts.php:290 ../../mod/contacts.php:347
+#: ../../mod/admin.php:649
 msgid "Unblock"
 msgstr ""
 
-#: ../../mod/contacts.php:284 ../../mod/contacts.php:331
-#: ../../mod/admin.php:469
+#: ../../mod/contacts.php:290 ../../mod/contacts.php:347
+#: ../../mod/admin.php:648
 msgid "Block"
 msgstr ""
 
-#: ../../mod/contacts.php:289 ../../mod/contacts.php:332
+#: ../../mod/contacts.php:293
+msgid "Toggle Blocked status"
+msgstr ""
+
+#: ../../mod/contacts.php:296 ../../mod/contacts.php:348
 msgid "Unignore"
 msgstr ""
 
-#: ../../mod/contacts.php:294
+#: ../../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:304
+#: ../../mod/contacts.php:312
+msgid "Advanced Contact Settings"
+msgstr ""
+
+#: ../../mod/contacts.php:320
 msgid "Contact Editor"
 msgstr ""
 
-#: ../../mod/contacts.php:307
+#: ../../mod/contacts.php:323
 msgid "Profile Visibility"
 msgstr ""
 
-#: ../../mod/contacts.php:308
+#: ../../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:309
+#: ../../mod/contacts.php:325
 msgid "Contact Information / Notes"
 msgstr ""
 
-#: ../../mod/contacts.php:310
+#: ../../mod/contacts.php:326
 msgid "Edit contact notes"
 msgstr ""
 
-#: ../../mod/contacts.php:315 ../../mod/contacts.php:430
-#: ../../mod/viewcontacts.php:61
+#: ../../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:316
+#: ../../mod/contacts.php:332
 msgid "Block/Unblock contact"
 msgstr ""
 
-#: ../../mod/contacts.php:317
+#: ../../mod/contacts.php:333
 msgid "Ignore contact"
 msgstr ""
 
-#: ../../mod/contacts.php:318
+#: ../../mod/contacts.php:334
 msgid "Repair URL settings"
 msgstr ""
 
-#: ../../mod/contacts.php:319
+#: ../../mod/contacts.php:335
 msgid "View conversations"
 msgstr ""
 
-#: ../../mod/contacts.php:321
+#: ../../mod/contacts.php:337
 msgid "Delete contact"
 msgstr ""
 
-#: ../../mod/contacts.php:325
+#: ../../mod/contacts.php:341
 msgid "Last update:"
 msgstr ""
 
-#: ../../mod/contacts.php:326
+#: ../../mod/contacts.php:342
 msgid "Update public posts"
 msgstr ""
 
-#: ../../mod/contacts.php:328 ../../mod/admin.php:701
+#: ../../mod/contacts.php:344 ../../mod/admin.php:1120
 msgid "Update now"
 msgstr ""
 
-#: ../../mod/contacts.php:335
+#: ../../mod/contacts.php:351
 msgid "Currently blocked"
 msgstr ""
 
-#: ../../mod/contacts.php:336
+#: ../../mod/contacts.php:352
 msgid "Currently ignored"
 msgstr ""
 
-#: ../../mod/contacts.php:364 ../../include/nav.php:130
-msgid "Contacts"
+#: ../../mod/contacts.php:353
+msgid "Currently archived"
 msgstr ""
 
-#: ../../mod/contacts.php:366
-msgid "Show Blocked Connections"
+#: ../../mod/contacts.php:354
+msgid ""
+"Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr ""
 
-#: ../../mod/contacts.php:366
-msgid "Hide Blocked Connections"
+#: ../../mod/contacts.php:407
+msgid "Suggestions"
 msgstr ""
 
-#: ../../mod/contacts.php:368
-msgid "Search your contacts"
+#: ../../mod/contacts.php:410
+msgid "Suggest potential friends"
 msgstr ""
 
-#: ../../mod/contacts.php:369 ../../mod/directory.php:65
-msgid "Finding: "
+#: ../../mod/contacts.php:413 ../../mod/group.php:191
+msgid "All Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:370 ../../mod/directory.php:67
-#: ../../include/contact_widgets.php:34
-msgid "Find"
+#: ../../mod/contacts.php:416
+msgid "Show all contacts"
+msgstr ""
+
+#: ../../mod/contacts.php:419
+msgid "Unblocked"
+msgstr ""
+
+#: ../../mod/contacts.php:422
+msgid "Only show unblocked contacts"
+msgstr ""
+
+#: ../../mod/contacts.php:426
+msgid "Blocked"
+msgstr ""
+
+#: ../../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:406
+#: ../../mod/contacts.php:498
 msgid "Mutual Friendship"
 msgstr ""
 
-#: ../../mod/contacts.php:410
+#: ../../mod/contacts.php:502
 msgid "is a fan of yours"
 msgstr ""
 
-#: ../../mod/contacts.php:414
+#: ../../mod/contacts.php:506
 msgid "you are a fan of"
 msgstr ""
 
-#: ../../mod/contacts.php:431 ../../include/Contact.php:129
-#: ../../include/conversation.php:717
+#: ../../mod/contacts.php:523 ../../mod/nogroup.php:41
 msgid "Edit contact"
 msgstr ""
 
+#: ../../mod/contacts.php:544 ../../view/theme/diabook/theme.php:124
+#: ../../include/nav.php:139
+msgid "Contacts"
+msgstr ""
+
+#: ../../mod/contacts.php:548
+msgid "Search your contacts"
+msgstr ""
+
+#: ../../mod/contacts.php:549 ../../mod/directory.php:57
+msgid "Finding: "
+msgstr ""
+
+#: ../../mod/contacts.php:550 ../../mod/directory.php:59
+#: ../../include/contact_widgets.php:33
+msgid "Find"
+msgstr ""
+
 #: ../../mod/lostpass.php:16
 msgid "No valid account found."
 msgstr ""
 
-#: ../../mod/lostpass.php:31
+#: ../../mod/lostpass.php:32
 msgid "Password reset request issued. Check your email."
 msgstr ""
 
-#: ../../mod/lostpass.php:42
+#: ../../mod/lostpass.php:43
 #, php-format
 msgid "Password reset requested at %s"
 msgstr ""
 
-#: ../../mod/lostpass.php:64
+#: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
+#: ../../mod/register.php:367 ../../mod/register.php:421
+#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:745
+#: ../../addon/facebook/facebook.php:688
+#: ../../addon/facebook/facebook.php:1178
+#: ../../addon/public_server/public_server.php:62
+#: ../../addon/testdrive/testdrive.php:61 ../../include/items.php:2738
+#: ../../boot.php:696
+msgid "Administrator"
+msgstr ""
+
+#: ../../mod/lostpass.php:65
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:82 ../../boot.php:695
+#: ../../mod/lostpass.php:83 ../../boot.php:828
 msgid "Password Reset"
 msgstr ""
 
-#: ../../mod/lostpass.php:83
+#: ../../mod/lostpass.php:84
 msgid "Your password has been reset as requested."
 msgstr ""
 
-#: ../../mod/lostpass.php:84
+#: ../../mod/lostpass.php:85
 msgid "Your new password is"
 msgstr ""
 
-#: ../../mod/lostpass.php:85
+#: ../../mod/lostpass.php:86
 msgid "Save or copy your new password - and then"
 msgstr ""
 
-#: ../../mod/lostpass.php:86
+#: ../../mod/lostpass.php:87
 msgid "click here to login"
 msgstr ""
 
-#: ../../mod/lostpass.php:87
+#: ../../mod/lostpass.php:88
 msgid ""
 "Your password may be changed from the <em>Settings</em> page after "
 "successful login."
 msgstr ""
 
-#: ../../mod/lostpass.php:118
+#: ../../mod/lostpass.php:119
 msgid "Forgot your Password?"
 msgstr ""
 
-#: ../../mod/lostpass.php:119
+#: ../../mod/lostpass.php:120
 msgid ""
 "Enter your email address and submit to have your password reset. Then check "
 "your email for further instructions."
 msgstr ""
 
-#: ../../mod/lostpass.php:120
+#: ../../mod/lostpass.php:121
 msgid "Nickname or Email: "
 msgstr ""
 
-#: ../../mod/lostpass.php:121
+#: ../../mod/lostpass.php:122
 msgid "Reset"
 msgstr ""
 
-#: ../../mod/settings.php:67
-msgid "Missing some important data!"
+#: ../../mod/settings.php:49 ../../include/nav.php:137
+msgid "Account settings"
 msgstr ""
 
-#: ../../mod/settings.php:70 ../../mod/settings.php:458 ../../mod/admin.php:62
-msgid "Update"
+#: ../../mod/settings.php:54
+msgid "Display settings"
 msgstr ""
 
-#: ../../mod/settings.php:165
-msgid "Failed to connect with email account using the settings provided."
+#: ../../mod/settings.php:60
+msgid "Connector settings"
 msgstr ""
 
-#: ../../mod/settings.php:170
-msgid "Email settings updated."
+#: ../../mod/settings.php:65
+msgid "Plugin settings"
 msgstr ""
 
-#: ../../mod/settings.php:188
-msgid "Passwords do not match. Password unchanged."
+#: ../../mod/settings.php:70
+msgid "Connected apps"
 msgstr ""
 
-#: ../../mod/settings.php:193
-msgid "Empty passwords are not allowed. Password unchanged."
+#: ../../mod/settings.php:75
+msgid "Export personal data"
 msgstr ""
 
-#: ../../mod/settings.php:204
-msgid "Password changed."
+#: ../../mod/settings.php:80
+msgid "Remove account"
 msgstr ""
 
-#: ../../mod/settings.php:206
-msgid "Password update failed. Please try again."
+#: ../../mod/settings.php:88 ../../mod/admin.php:735 ../../mod/admin.php:940
+#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:638
+#: ../../view/theme/diabook/theme.php:768 ../../include/nav.php:137
+msgid "Settings"
 msgstr ""
 
-#: ../../mod/settings.php:260
-msgid " Please use a shorter name."
+#: ../../mod/settings.php:131
+msgid "Missing some important data!"
 msgstr ""
 
-#: ../../mod/settings.php:262
-msgid " Name too short."
+#: ../../mod/settings.php:134 ../../mod/settings.php:579
+msgid "Update"
 msgstr ""
 
-#: ../../mod/settings.php:268
-msgid " Not valid email."
+#: ../../mod/settings.php:239
+msgid "Failed to connect with email account using the settings provided."
 msgstr ""
 
-#: ../../mod/settings.php:270
-msgid " Cannot change to that email."
+#: ../../mod/settings.php:244
+msgid "Email settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:335 ../../addon/facebook/facebook.php:320
-#: ../../addon/impressum/impressum.php:64 ../../addon/piwik/piwik.php:94
-#: ../../addon/twitter/twitter.php:294
-msgid "Settings updated."
+#: ../../mod/settings.php:303
+msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:394 ../../include/nav.php:128
-msgid "Account settings"
+#: ../../mod/settings.php:308
+msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:399
-msgid "Connector settings"
+#: ../../mod/settings.php:319
+msgid "Password changed."
 msgstr ""
 
-#: ../../mod/settings.php:404
-msgid "Plugin settings"
+#: ../../mod/settings.php:321
+msgid "Password update failed. Please try again."
+msgstr ""
+
+#: ../../mod/settings.php:385
+msgid " Please use a shorter name."
 msgstr ""
 
-#: ../../mod/settings.php:409
-msgid "Connections"
+#: ../../mod/settings.php:387
+msgid " Name too short."
 msgstr ""
 
-#: ../../mod/settings.php:414
-msgid "Export personal data"
+#: ../../mod/settings.php:393
+msgid " Not valid email."
+msgstr ""
+
+#: ../../mod/settings.php:395
+msgid " Cannot change to that email."
+msgstr ""
+
+#: ../../mod/settings.php:448
+msgid "Private forum has no privacy permissions. Using default privacy group."
+msgstr ""
+
+#: ../../mod/settings.php:452
+msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr ""
 
-#: ../../mod/settings.php:431 ../../mod/settings.php:457
-#: ../../mod/settings.php:490
+#: ../../mod/settings.php:482 ../../addon/facebook/facebook.php:488
+#: ../../addon/impressum/impressum.php:77
+#: ../../addon/openstreetmap/openstreetmap.php:80
+#: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105
+#: ../../addon/twitter/twitter.php:376
+msgid "Settings updated."
+msgstr ""
+
+#: ../../mod/settings.php:552 ../../mod/settings.php:578
+#: ../../mod/settings.php:614
 msgid "Add application"
 msgstr ""
 
-#: ../../mod/settings.php:435 ../../mod/settings.php:461
-#: ../../addon/statusnet/statusnet.php:480
+#: ../../mod/settings.php:556 ../../mod/settings.php:582
+#: ../../addon/statusnet/statusnet.php:555
 msgid "Consumer Key"
 msgstr ""
 
-#: ../../mod/settings.php:436 ../../mod/settings.php:462
-#: ../../addon/statusnet/statusnet.php:479
+#: ../../mod/settings.php:557 ../../mod/settings.php:583
+#: ../../addon/statusnet/statusnet.php:554
 msgid "Consumer Secret"
 msgstr ""
 
-#: ../../mod/settings.php:437 ../../mod/settings.php:463
+#: ../../mod/settings.php:558 ../../mod/settings.php:584
 msgid "Redirect"
 msgstr ""
 
-#: ../../mod/settings.php:438 ../../mod/settings.php:464
+#: ../../mod/settings.php:559 ../../mod/settings.php:585
 msgid "Icon url"
 msgstr ""
 
-#: ../../mod/settings.php:449
+#: ../../mod/settings.php:570
 msgid "You can't edit this application."
 msgstr ""
 
-#: ../../mod/settings.php:489
+#: ../../mod/settings.php:613
 msgid "Connected Apps"
 msgstr ""
 
-#: ../../mod/settings.php:493
+#: ../../mod/settings.php:617
 msgid "Client key starts with"
 msgstr ""
 
-#: ../../mod/settings.php:494
+#: ../../mod/settings.php:618
 msgid "No name"
 msgstr ""
 
-#: ../../mod/settings.php:495
+#: ../../mod/settings.php:619
 msgid "Remove authorization"
 msgstr ""
 
-#: ../../mod/settings.php:507
+#: ../../mod/settings.php:630
 msgid "No Plugin settings configured"
 msgstr ""
 
-#: ../../mod/settings.php:514 ../../addon/widgets/widgets.php:122
+#: ../../mod/settings.php:638 ../../addon/widgets/widgets.php:123
 msgid "Plugin Settings"
 msgstr ""
 
-#: ../../mod/settings.php:527 ../../mod/settings.php:528
+#: ../../mod/settings.php:650 ../../mod/settings.php:651
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr ""
 
-#: ../../mod/settings.php:527 ../../mod/settings.php:528
+#: ../../mod/settings.php:650 ../../mod/settings.php:651
 msgid "enabled"
 msgstr ""
 
-#: ../../mod/settings.php:527 ../../mod/settings.php:528
+#: ../../mod/settings.php:650 ../../mod/settings.php:651
 msgid "disabled"
 msgstr ""
 
-#: ../../mod/settings.php:528
+#: ../../mod/settings.php:651
 msgid "StatusNet"
 msgstr ""
 
-#: ../../mod/settings.php:554
+#: ../../mod/settings.php:681
 msgid "Connector Settings"
 msgstr ""
 
-#: ../../mod/settings.php:560
+#: ../../mod/settings.php:686
 msgid "Email/Mailbox Setup"
 msgstr ""
 
-#: ../../mod/settings.php:561
+#: ../../mod/settings.php:687
 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:562
+#: ../../mod/settings.php:688
 msgid "Last successful email check:"
 msgstr ""
 
-#: ../../mod/settings.php:563
+#: ../../mod/settings.php:689
 msgid "Email access is disabled on this site."
 msgstr ""
 
-#: ../../mod/settings.php:564
+#: ../../mod/settings.php:690
 msgid "IMAP server name:"
 msgstr ""
 
-#: ../../mod/settings.php:565
+#: ../../mod/settings.php:691
 msgid "IMAP port:"
 msgstr ""
 
-#: ../../mod/settings.php:566
+#: ../../mod/settings.php:692
 msgid "Security:"
 msgstr ""
 
-#: ../../mod/settings.php:566
+#: ../../mod/settings.php:692 ../../mod/settings.php:697
 msgid "None"
 msgstr ""
 
-#: ../../mod/settings.php:567
+#: ../../mod/settings.php:693
 msgid "Email login name:"
 msgstr ""
 
-#: ../../mod/settings.php:568
+#: ../../mod/settings.php:694
 msgid "Email password:"
 msgstr ""
 
-#: ../../mod/settings.php:569
+#: ../../mod/settings.php:695
 msgid "Reply-to address:"
 msgstr ""
 
-#: ../../mod/settings.php:570
+#: ../../mod/settings.php:696
 msgid "Send public posts to all email contacts:"
 msgstr ""
 
-#: ../../mod/settings.php:620 ../../mod/admin.php:126 ../../mod/admin.php:443
+#: ../../mod/settings.php:697
+msgid "Action after import:"
+msgstr ""
+
+#: ../../mod/settings.php:697
+msgid "Mark as seen"
+msgstr ""
+
+#: ../../mod/settings.php:697
+msgid "Move to folder"
+msgstr ""
+
+#: ../../mod/settings.php:698
+msgid "Move to folder:"
+msgstr ""
+
+#: ../../mod/settings.php:758
+msgid "Display Settings"
+msgstr ""
+
+#: ../../mod/settings.php:764
+msgid "Display Theme:"
+msgstr ""
+
+#: ../../mod/settings.php:765
+msgid "Update browser every xx seconds"
+msgstr ""
+
+#: ../../mod/settings.php:765
+msgid "Minimum of 10 seconds, no maximum"
+msgstr ""
+
+#: ../../mod/settings.php:766
+msgid "Number of items to display on the network page:"
+msgstr ""
+
+#: ../../mod/settings.php:766
+msgid "Maximum of 100 items"
+msgstr ""
+
+#: ../../mod/settings.php:767
+msgid "Don't show emoticons"
+msgstr ""
+
+#: ../../mod/settings.php:835 ../../mod/admin.php:180 ../../mod/admin.php:621
 msgid "Normal Account"
 msgstr ""
 
-#: ../../mod/settings.php:621
+#: ../../mod/settings.php:836
 msgid "This account is a normal personal profile"
 msgstr ""
 
-#: ../../mod/settings.php:624 ../../mod/admin.php:127 ../../mod/admin.php:444
+#: ../../mod/settings.php:839 ../../mod/admin.php:181 ../../mod/admin.php:622
 msgid "Soapbox Account"
 msgstr ""
 
-#: ../../mod/settings.php:625
+#: ../../mod/settings.php:840
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr ""
 
-#: ../../mod/settings.php:628 ../../mod/admin.php:128 ../../mod/admin.php:445
+#: ../../mod/settings.php:843 ../../mod/admin.php:182 ../../mod/admin.php:623
 msgid "Community/Celebrity Account"
 msgstr ""
 
-#: ../../mod/settings.php:629
+#: ../../mod/settings.php:844
 msgid "Automatically approve all connection/friend requests as read-write fans"
 msgstr ""
 
-#: ../../mod/settings.php:632 ../../mod/admin.php:129 ../../mod/admin.php:446
+#: ../../mod/settings.php:847 ../../mod/admin.php:183 ../../mod/admin.php:624
 msgid "Automatic Friend Account"
 msgstr ""
 
-#: ../../mod/settings.php:633
+#: ../../mod/settings.php:848
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr ""
 
-#: ../../mod/settings.php:643
+#: ../../mod/settings.php:851
+msgid "Private Forum"
+msgstr ""
+
+#: ../../mod/settings.php:852
+msgid "Private forum - approved members only [Experimental]"
+msgstr ""
+
+#: ../../mod/settings.php:865
 msgid "OpenID:"
 msgstr ""
 
-#: ../../mod/settings.php:643
+#: ../../mod/settings.php:865
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: ../../mod/settings.php:653
+#: ../../mod/settings.php:875
 msgid "Publish your default profile in your local site directory?"
 msgstr ""
 
-#: ../../mod/settings.php:659
+#: ../../mod/settings.php:881
 msgid "Publish your default profile in the global social directory?"
 msgstr ""
 
-#: ../../mod/settings.php:667
+#: ../../mod/settings.php:889
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr ""
 
-#: ../../mod/settings.php:671
+#: ../../mod/settings.php:893
 msgid "Hide your profile details from unknown viewers?"
 msgstr ""
 
-#: ../../mod/settings.php:676
+#: ../../mod/settings.php:898
 msgid "Allow friends to post to your profile page?"
 msgstr ""
 
-#: ../../mod/settings.php:682
+#: ../../mod/settings.php:904
 msgid "Allow friends to tag your posts?"
 msgstr ""
 
-#: ../../mod/settings.php:691
+#: ../../mod/settings.php:910
+msgid "Allow us to suggest you as a potential friend to new members?"
+msgstr ""
+
+#: ../../mod/settings.php:916
+msgid "Permit unknown people to send you private mail?"
+msgstr ""
+
+#: ../../mod/settings.php:927
 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: ../../mod/settings.php:710 ../../mod/profile_photo.php:206
+#: ../../mod/settings.php:933 ../../mod/profile_photo.php:211
 msgid "or"
 msgstr ""
 
-#: ../../mod/settings.php:715
+#: ../../mod/settings.php:938
 msgid "Your Identity Address is"
 msgstr ""
 
-#: ../../mod/settings.php:726
-msgid "Automatically expire posts after days:"
+#: ../../mod/settings.php:949
+msgid "Automatically expire posts after this many days:"
 msgstr ""
 
-#: ../../mod/settings.php:726
+#: ../../mod/settings.php:949
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr ""
 
-#: ../../mod/settings.php:727
+#: ../../mod/settings.php:950
 msgid "Advanced expiration settings"
 msgstr ""
 
-#: ../../mod/settings.php:728
+#: ../../mod/settings.php:951
 msgid "Advanced Expiration"
 msgstr ""
 
-#: ../../mod/settings.php:729
+#: ../../mod/settings.php:952
 msgid "Expire posts:"
 msgstr ""
 
-#: ../../mod/settings.php:730
+#: ../../mod/settings.php:953
 msgid "Expire personal notes:"
 msgstr ""
 
-#: ../../mod/settings.php:731
+#: ../../mod/settings.php:954
 msgid "Expire starred posts:"
 msgstr ""
 
-#: ../../mod/settings.php:732
+#: ../../mod/settings.php:955
 msgid "Expire photos:"
 msgstr ""
 
-#: ../../mod/settings.php:737
+#: ../../mod/settings.php:962
 msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/settings.php:745
+#: ../../mod/settings.php:970
 msgid "Password Settings"
 msgstr ""
 
-#: ../../mod/settings.php:746
+#: ../../mod/settings.php:971
 msgid "New Password:"
 msgstr ""
 
-#: ../../mod/settings.php:747
+#: ../../mod/settings.php:972
 msgid "Confirm:"
 msgstr ""
 
-#: ../../mod/settings.php:747
+#: ../../mod/settings.php:972
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/settings.php:751
+#: ../../mod/settings.php:976
 msgid "Basic Settings"
 msgstr ""
 
-#: ../../mod/settings.php:752 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:977 ../../include/profile_advanced.php:15
 msgid "Full Name:"
 msgstr ""
 
-#: ../../mod/settings.php:753
+#: ../../mod/settings.php:978
 msgid "Email Address:"
 msgstr ""
 
-#: ../../mod/settings.php:754
+#: ../../mod/settings.php:979
 msgid "Your Timezone:"
 msgstr ""
 
-#: ../../mod/settings.php:755
+#: ../../mod/settings.php:980
 msgid "Default Post Location:"
 msgstr ""
 
-#: ../../mod/settings.php:756
+#: ../../mod/settings.php:981
 msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../mod/settings.php:757
-msgid "Display Theme:"
-msgstr ""
-
-#: ../../mod/settings.php:761
+#: ../../mod/settings.php:984
 msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../mod/settings.php:763
+#: ../../mod/settings.php:986
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/settings.php:763
+#: ../../mod/settings.php:986 ../../mod/settings.php:1005
 msgid "(to prevent spam abuse)"
 msgstr ""
 
-#: ../../mod/settings.php:764
+#: ../../mod/settings.php:987
 msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:765
+#: ../../mod/settings.php:988
 msgid "(click to open/close)"
 msgstr ""
 
-#: ../../mod/settings.php:780
+#: ../../mod/settings.php:1005
+msgid "Maximum private messages per day from unknown people:"
+msgstr ""
+
+#: ../../mod/settings.php:1008
 msgid "Notification Settings"
 msgstr ""
 
-#: ../../mod/settings.php:781
+#: ../../mod/settings.php:1009
+msgid "By default post a status message when:"
+msgstr ""
+
+#: ../../mod/settings.php:1010
+msgid "accepting a friend request"
+msgstr ""
+
+#: ../../mod/settings.php:1011
+msgid "joining a forum/community"
+msgstr ""
+
+#: ../../mod/settings.php:1012
+msgid "making an <em>interesting</em> profile change"
+msgstr ""
+
+#: ../../mod/settings.php:1013
 msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../mod/settings.php:782
+#: ../../mod/settings.php:1014
 msgid "You receive an introduction"
 msgstr ""
 
-#: ../../mod/settings.php:783
+#: ../../mod/settings.php:1015
 msgid "Your introductions are confirmed"
 msgstr ""
 
-#: ../../mod/settings.php:784
+#: ../../mod/settings.php:1016
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../mod/settings.php:785
+#: ../../mod/settings.php:1017
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../mod/settings.php:786
+#: ../../mod/settings.php:1018
 msgid "You receive a private message"
 msgstr ""
 
-#: ../../mod/settings.php:790
-msgid "Advanced Page Settings"
+#: ../../mod/settings.php:1019
+msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../mod/manage.php:37
-#, php-format
-msgid "Welcome back %s"
+#: ../../mod/settings.php:1020
+msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../mod/manage.php:87
-msgid "Manage Identities and/or Pages"
+#: ../../mod/settings.php:1023
+msgid "Advanced Page Settings"
 msgstr ""
 
 #: ../../mod/manage.php:90
+msgid "Manage Identities and/or Pages"
+msgstr ""
+
+#: ../../mod/manage.php:93
 msgid ""
-"(Toggle between different identities or community/group pages which share "
-"your account details.)"
+"Toggle between different identities or community/group pages which share "
+"your account details or which you have been granted \"manage\" permissions"
 msgstr ""
 
-#: ../../mod/manage.php:92
+#: ../../mod/manage.php:95
 msgid "Select an identity to manage: "
 msgstr ""
 
-#: ../../mod/network.php:83 ../../mod/search.php:16
+#: ../../mod/network.php:43
+msgid "Search Results For:"
+msgstr ""
+
+#: ../../mod/network.php:82 ../../mod/search.php:16
 msgid "Remove term"
 msgstr ""
 
-#: ../../mod/network.php:92 ../../mod/search.php:13
+#: ../../mod/network.php:91 ../../mod/search.php:13
 msgid "Saved Searches"
 msgstr ""
 
-#: ../../mod/network.php:93 ../../include/group.php:214
+#: ../../mod/network.php:92 ../../include/group.php:244
 msgid "add"
 msgstr ""
 
-#: ../../mod/network.php:157
+#: ../../mod/network.php:171
 msgid "Commented Order"
 msgstr ""
 
-#: ../../mod/network.php:162
+#: ../../mod/network.php:174
+msgid "Sort by Comment Date"
+msgstr ""
+
+#: ../../mod/network.php:177
 msgid "Posted Order"
 msgstr ""
 
-#: ../../mod/network.php:168
+#: ../../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:173
+#: ../../mod/network.php:193
+msgid "Activity Stream - by date"
+msgstr ""
+
+#: ../../mod/network.php:196
 msgid "Starred"
 msgstr ""
 
-#: ../../mod/network.php:178
-msgid "Bookmarks"
+#: ../../mod/network.php:199
+msgid "Favourite Posts"
+msgstr ""
+
+#: ../../mod/network.php:202
+msgid "Shared Links"
+msgstr ""
+
+#: ../../mod/network.php:205
+msgid "Interesting Links"
 msgstr ""
 
-#: ../../mod/network.php:225
+#: ../../mod/network.php:281
 #, php-format
 msgid "Warning: This group contains %s member from an insecure network."
 msgid_plural ""
@@ -1953,44 +2341,107 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/network.php:228
+#: ../../mod/network.php:284
 msgid "Private messages to this group are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/network.php:301
+#: ../../mod/network.php:329
 msgid "No such group"
 msgstr ""
 
-#: ../../mod/network.php:312
+#: ../../mod/network.php:340
 msgid "Group is empty"
 msgstr ""
 
-#: ../../mod/network.php:317
+#: ../../mod/network.php:344
 msgid "Group: "
 msgstr ""
 
-#: ../../mod/network.php:327
+#: ../../mod/network.php:354
 msgid "Contact: "
 msgstr ""
 
-#: ../../mod/network.php:329
+#: ../../mod/network.php:356
 msgid "Private messages to this person are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/network.php:334
+#: ../../mod/network.php:361
 msgid "Invalid contact."
 msgstr ""
 
-#: ../../mod/notes.php:44 ../../boot.php:1307
+#: ../../mod/notes.php:44 ../../boot.php:1509
 msgid "Personal Notes"
 msgstr ""
 
-#: ../../mod/notes.php:63 ../../include/text.php:628
+#: ../../mod/notes.php:63 ../../mod/filer.php:30
+#: ../../addon/facebook/facebook.php:756
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:147
+#: ../../include/text.php:652
 msgid "Save"
 msgstr ""
 
+#: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112
+#, php-format
+msgid "Number of daily wall messages for %s exceeded. Message failed."
+msgstr ""
+
+#: ../../mod/wallmessage.php:56 ../../mod/message.php:65
+msgid "No recipient selected."
+msgstr ""
+
+#: ../../mod/wallmessage.php:59
+msgid "Unable to check your home location."
+msgstr ""
+
+#: ../../mod/wallmessage.php:62 ../../mod/message.php:72
+msgid "Message could not be sent."
+msgstr ""
+
+#: ../../mod/wallmessage.php:65 ../../mod/message.php:75
+msgid "Message collection failure."
+msgstr ""
+
+#: ../../mod/wallmessage.php:68 ../../mod/message.php:78
+msgid "Message sent."
+msgstr ""
+
+#: ../../mod/wallmessage.php:86 ../../mod/wallmessage.php:95
+msgid "No recipient."
+msgstr ""
+
+#: ../../mod/wallmessage.php:124 ../../mod/message.php:171
+#: ../../include/conversation.php:921
+msgid "Please enter a link URL:"
+msgstr ""
+
+#: ../../mod/wallmessage.php:131 ../../mod/message.php:199
+msgid "Send Private Message"
+msgstr ""
+
+#: ../../mod/wallmessage.php:132
+#, php-format
+msgid ""
+"If you wish for %s to respond, please check that the privacy settings on "
+"your site allow private mail from unknown senders."
+msgstr ""
+
+#: ../../mod/wallmessage.php:133 ../../mod/message.php:200
+#: ../../mod/message.php:397
+msgid "To:"
+msgstr ""
+
+#: ../../mod/wallmessage.php:134 ../../mod/message.php:205
+#: ../../mod/message.php:399
+msgid "Subject:"
+msgstr ""
+
+#: ../../mod/wallmessage.php:140 ../../mod/message.php:209
+#: ../../mod/message.php:402 ../../mod/invite.php:113
+msgid "Your message:"
+msgstr ""
+
 #: ../../mod/newmember.php:6
-msgid "Welcome to Friendika"
+msgid "Welcome to Friendica"
 msgstr ""
 
 #: ../../mod/newmember.php:8
@@ -2000,78 +2451,104 @@ msgstr ""
 #: ../../mod/newmember.php:12
 msgid ""
 "We would like to offer some tips and links to help make your experience "
-"enjoyable. Click any item to visit the relevant page."
+"enjoyable. Click any item to visit the relevant page. A link to this page "
+"will be visible from your home page for two weeks after your initial "
+"registration and then will quietly disappear."
 msgstr ""
 
 #: ../../mod/newmember.php:16
 msgid ""
-"On your <em>Settings</em> page -  change your initial password. Also make a "
-"note of your Identity Address. This will be useful in making friends."
+"On your <em>Quick Start</em> page - find a brief introduction to your "
+"profile and network tabs, connect to Facebook, make some new connections, "
+"and find some groups to join."
 msgstr ""
 
 #: ../../mod/newmember.php:18
 msgid ""
+"On your <em>Settings</em> page -  change your initial password. Also make a "
+"note of your Identity Address. This looks just like an email address - and "
+"will be useful in making friends on the free social web."
+msgstr ""
+
+#: ../../mod/newmember.php:20
+msgid ""
 "Review the other settings, particularly the privacy settings. An unpublished "
 "directory listing is like having an unlisted phone number. In general, you "
 "should probably publish your listing - unless all of your friends and "
 "potential friends know exactly how to find you."
 msgstr ""
 
-#: ../../mod/newmember.php:20
+#: ../../mod/newmember.php:22
 msgid ""
 "Upload a profile photo if you have not done so already. Studies have shown "
 "that people with real photos of themselves are ten times more likely to make "
 "friends than people who do not."
 msgstr ""
 
-#: ../../mod/newmember.php:23
+#: ../../mod/newmember.php:25
 msgid ""
 "Authorise the Facebook Connector if you currently have a Facebook account "
 "and we will (optionally) import all your Facebook friends and conversations."
 msgstr ""
 
-#: ../../mod/newmember.php:28
+#: ../../mod/newmember.php:27
+msgid ""
+"<em>If</em> this is your own personal server, installing the Facebook addon "
+"may ease your transition to the free social web."
+msgstr ""
+
+#: ../../mod/newmember.php:32
 msgid ""
-"Enter your email access information on your Settings page if you wish to "
-"import and interact with friends or mailing lists from your email INBOX"
+"Enter your email access information on your Connector Settings page if you "
+"wish to import and interact with friends or mailing lists from your email "
+"INBOX"
 msgstr ""
 
-#: ../../mod/newmember.php:30
+#: ../../mod/newmember.php:34
 msgid ""
 "Edit your <strong>default</strong> profile to your liking. Review the "
 "settings for hiding your list of friends and hiding the profile from unknown "
 "visitors."
 msgstr ""
 
-#: ../../mod/newmember.php:32
+#: ../../mod/newmember.php:36
 msgid ""
 "Set some public keywords for your default profile which describe your "
 "interests. We may be able to find other people with similar interests and "
 "suggest friendships."
 msgstr ""
 
-#: ../../mod/newmember.php:34
+#: ../../mod/newmember.php:38
 msgid ""
 "Your Contacts page is your gateway to managing friendships and connecting "
 "with friends on other networks. Typically you enter their address or site "
-"URL in the <em>Connect</em> dialog."
+"URL in the <em>Add New Contact</em> dialog."
 msgstr ""
 
-#: ../../mod/newmember.php:36
+#: ../../mod/newmember.php:40
 msgid ""
 "The Directory page lets you find other people in this network or other "
 "federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on "
 "their profile page. Provide your own Identity Address if requested."
 msgstr ""
 
-#: ../../mod/newmember.php:38
+#: ../../mod/newmember.php:42
+msgid ""
+"On the side panel of the Contacts page are several tools to find new "
+"friends. We can match people by interest, look up people by name or "
+"interest, and provide suggestions based on network relationships. On a brand "
+"new site, friend suggestions will usually begin to be populated within 24 "
+"hours."
+msgstr ""
+
+#: ../../mod/newmember.php:44
 msgid ""
 "Once you have made some friends, organize them into private conversation "
 "groups from the sidebar of your Contacts page and then you can interact with "
 "each group privately on your Network page."
 msgstr ""
 
-#: ../../mod/newmember.php:40
+#: ../../mod/newmember.php:46
 msgid ""
 "Our <strong>help</strong> pages may be consulted for detail on other program "
 "features and resources."
@@ -2085,56 +2562,52 @@ msgstr ""
 msgid "Item was not found."
 msgstr ""
 
-#: ../../mod/group.php:27
+#: ../../mod/group.php:29
 msgid "Group created."
 msgstr ""
 
-#: ../../mod/group.php:33
+#: ../../mod/group.php:35
 msgid "Could not create group."
 msgstr ""
 
-#: ../../mod/group.php:43 ../../mod/group.php:123
+#: ../../mod/group.php:47 ../../mod/group.php:137
 msgid "Group not found."
 msgstr ""
 
-#: ../../mod/group.php:56
+#: ../../mod/group.php:60
 msgid "Group name changed."
 msgstr ""
 
-#: ../../mod/group.php:67 ../../mod/profperm.php:19 ../../index.php:283
+#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:305
 msgid "Permission denied"
 msgstr ""
 
-#: ../../mod/group.php:82
+#: ../../mod/group.php:90
 msgid "Create a group of contacts/friends."
 msgstr ""
 
-#: ../../mod/group.php:83 ../../mod/group.php:166
+#: ../../mod/group.php:91 ../../mod/group.php:177
 msgid "Group Name: "
 msgstr ""
 
-#: ../../mod/group.php:98
+#: ../../mod/group.php:110
 msgid "Group removed."
 msgstr ""
 
-#: ../../mod/group.php:100
+#: ../../mod/group.php:112
 msgid "Unable to remove group."
 msgstr ""
 
-#: ../../mod/group.php:164 ../../mod/profperm.php:105
-msgid "Click on a contact to add or remove."
-msgstr ""
-
-#: ../../mod/group.php:165
+#: ../../mod/group.php:176
 msgid "Group Editor"
 msgstr ""
 
-#: ../../mod/group.php:179
+#: ../../mod/group.php:189
 msgid "Members"
 msgstr ""
 
-#: ../../mod/group.php:194
-msgid "All Contacts"
+#: ../../mod/group.php:221 ../../mod/profperm.php:105
+msgid "Click on a contact to add or remove."
 msgstr ""
 
 #: ../../mod/profperm.php:25 ../../mod/profperm.php:55
@@ -2145,9 +2618,9 @@ msgstr ""
 msgid "Profile Visibility Editor"
 msgstr ""
 
-#: ../../mod/profperm.php:103 ../../include/profile_advanced.php:7
-#: ../../include/profile_advanced.php:74 ../../include/nav.php:48
-#: ../../boot.php:1289
+#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:123
+#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74
+#: ../../include/nav.php:50 ../../boot.php:1488
 msgid "Profile"
 msgstr ""
 
@@ -2159,65 +2632,71 @@ msgstr ""
 msgid "All Contacts (with secure profile access)"
 msgstr ""
 
-#: ../../mod/viewcontacts.php:25 ../../include/text.php:567
-msgid "View Contacts"
+#: ../../mod/viewcontacts.php:39
+msgid "No contacts."
 msgstr ""
 
-#: ../../mod/viewcontacts.php:40
-msgid "No contacts."
+#: ../../mod/viewcontacts.php:76 ../../include/text.php:589
+msgid "View Contacts"
 msgstr ""
 
-#: ../../mod/register.php:53
+#: ../../mod/register.php:64
 msgid "An invitation is required."
 msgstr ""
 
-#: ../../mod/register.php:58
+#: ../../mod/register.php:69
 msgid "Invitation could not be verified."
 msgstr ""
 
-#: ../../mod/register.php:66
+#: ../../mod/register.php:77
 msgid "Invalid OpenID url"
 msgstr ""
 
-#: ../../mod/register.php:81
+#: ../../mod/register.php:92
 msgid "Please enter the required information."
 msgstr ""
 
-#: ../../mod/register.php:95
+#: ../../mod/register.php:106
 msgid "Please use a shorter name."
 msgstr ""
 
-#: ../../mod/register.php:97
+#: ../../mod/register.php:108
 msgid "Name too short."
 msgstr ""
 
-#: ../../mod/register.php:112
+#: ../../mod/register.php:123
 msgid "That doesn't appear to be your full (First Last) name."
 msgstr ""
 
-#: ../../mod/register.php:117
+#: ../../mod/register.php:128
 msgid "Your email domain is not among those allowed on this site."
 msgstr ""
 
-#: ../../mod/register.php:120
+#: ../../mod/register.php:131
 msgid "Not a valid email address."
 msgstr ""
 
-#: ../../mod/register.php:130
+#: ../../mod/register.php:141
 msgid "Cannot use that email."
 msgstr ""
 
-#: ../../mod/register.php:136
+#: ../../mod/register.php:147
 msgid ""
 "Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
 "must also begin with a letter."
 msgstr ""
 
-#: ../../mod/register.php:142 ../../mod/register.php:243
+#: ../../mod/register.php:153 ../../mod/register.php:243
 msgid "Nickname is already registered. Please choose another."
 msgstr ""
 
-#: ../../mod/register.php:161
+#: ../../mod/register.php:163
+msgid ""
+"Nickname was once registered here and may not be re-used. Please choose "
+"another."
+msgstr ""
+
+#: ../../mod/register.php:179
 msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr ""
 
@@ -2229,117 +2708,125 @@ msgstr ""
 msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
 
-#: ../../mod/register.php:369 ../../mod/regmod.php:52
+#: ../../mod/register.php:365 ../../mod/regmod.php:52
 #, php-format
 msgid "Registration details for %s"
 msgstr ""
 
-#: ../../mod/register.php:377
+#: ../../mod/register.php:373
 msgid ""
 "Registration successful. Please check your email for further instructions."
 msgstr ""
 
-#: ../../mod/register.php:381
+#: ../../mod/register.php:377
 msgid "Failed to send email message. Here is the message that failed."
 msgstr ""
 
-#: ../../mod/register.php:386
+#: ../../mod/register.php:382
 msgid "Your registration can not be processed."
 msgstr ""
 
-#: ../../mod/register.php:423
+#: ../../mod/register.php:419
 #, php-format
 msgid "Registration request at %s"
 msgstr ""
 
-#: ../../mod/register.php:432
+#: ../../mod/register.php:428
 msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: ../../mod/register.php:481
+#: ../../mod/register.php:466
+msgid ""
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
+msgstr ""
+
+#: ../../mod/register.php:492
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
 msgstr ""
 
-#: ../../mod/register.php:482
+#: ../../mod/register.php:493
 msgid ""
 "If you are not familiar with OpenID, please leave that field blank and fill "
 "in the rest of the items."
 msgstr ""
 
-#: ../../mod/register.php:483
+#: ../../mod/register.php:494
 msgid "Your OpenID (optional): "
 msgstr ""
 
-#: ../../mod/register.php:497
+#: ../../mod/register.php:508
 msgid "Include your profile in member directory?"
 msgstr ""
 
-#: ../../mod/register.php:512
+#: ../../mod/register.php:528
 msgid "Membership on this site is by invitation only."
 msgstr ""
 
-#: ../../mod/register.php:513
+#: ../../mod/register.php:529
 msgid "Your invitation ID: "
 msgstr ""
 
-#: ../../mod/register.php:516 ../../mod/admin.php:297
+#: ../../mod/register.php:532 ../../mod/admin.php:405
 msgid "Registration"
 msgstr ""
 
-#: ../../mod/register.php:524
+#: ../../mod/register.php:540
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr ""
 
-#: ../../mod/register.php:525
+#: ../../mod/register.php:541
 msgid "Your Email Address: "
 msgstr ""
 
-#: ../../mod/register.php:526
+#: ../../mod/register.php:542
 msgid ""
 "Choose a profile nickname. This must begin with a text character. Your "
 "profile address on this site will then be '<strong>nickname@$sitename</"
 "strong>'."
 msgstr ""
 
-#: ../../mod/register.php:527
+#: ../../mod/register.php:543
 msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/register.php:530 ../../include/nav.php:77 ../../boot.php:665
+#: ../../mod/register.php:546 ../../include/nav.php:81 ../../boot.php:794
 msgid "Register"
 msgstr ""
 
-#: ../../mod/dirfind.php:23
+#: ../../mod/dirfind.php:26
 msgid "People Search"
 msgstr ""
 
 #: ../../mod/like.php:127 ../../mod/tagger.php:70
-#: ../../addon/facebook/facebook.php:1024
+#: ../../addon/facebook/facebook.php:1572
 #: ../../addon/communityhome/communityhome.php:158
 #: ../../addon/communityhome/communityhome.php:167
-#: ../../include/diaspora.php:1213 ../../include/conversation.php:26
-#: ../../include/conversation.php:35 ../../include/conversation.php:99
-#: ../../include/conversation.php:108
+#: ../../view/theme/diabook/theme.php:560
+#: ../../view/theme/diabook/theme.php:569 ../../include/diaspora.php:1662
+#: ../../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:1028
+#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1576
 #: ../../addon/communityhome/communityhome.php:172
-#: ../../include/diaspora.php:1229 ../../include/conversation.php:43
+#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1678
+#: ../../include/conversation.php:65
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/like.php:146 ../../include/conversation.php:46
+#: ../../mod/like.php:146 ../../include/conversation.php:68
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:111
-#: ../../mod/admin.php:502 ../../mod/display.php:28 ../../mod/display.php:115
-#: ../../include/items.php:2898
+#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:156
+#: ../../mod/admin.php:684 ../../mod/admin.php:883 ../../mod/display.php:37
+#: ../../mod/display.php:142 ../../include/items.php:3096
 msgid "Item not found."
 msgstr ""
 
@@ -2347,238 +2834,212 @@ msgstr ""
 msgid "Access denied."
 msgstr ""
 
+#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:125
+#: ../../include/nav.php:51 ../../boot.php:1494
+msgid "Photos"
+msgstr ""
+
+#: ../../mod/fbrowser.php:86
+msgid "Files"
+msgstr ""
+
 #: ../../mod/regmod.php:61
 msgid "Account approved."
 msgstr ""
 
-#: ../../mod/regmod.php:93
+#: ../../mod/regmod.php:98
 #, php-format
 msgid "Registration revoked for %s"
 msgstr ""
 
-#: ../../mod/regmod.php:105
+#: ../../mod/regmod.php:110
 msgid "Please login."
 msgstr ""
 
-#: ../../mod/item.php:84
+#: ../../mod/item.php:89
 msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../mod/item.php:199
+#: ../../mod/item.php:258
 msgid "Empty post discarded."
 msgstr ""
 
-#: ../../mod/item.php:299 ../../mod/wall_upload.php:81
-#: ../../mod/wall_upload.php:90 ../../mod/wall_upload.php:97
-#: ../../include/message.php:82
+#: ../../mod/item.php:381 ../../mod/wall_upload.php:99
+#: ../../mod/wall_upload.php:108 ../../mod/wall_upload.php:115
+#: ../../include/message.php:144
 msgid "Wall Photos"
 msgstr ""
 
-#: ../../mod/item.php:675 ../../mod/item.php:720 ../../mod/item.php:764
-#: ../../mod/item.php:807 ../../include/items.php:1835
-#: ../../include/items.php:2162 ../../include/items.php:2209
-#: ../../include/items.php:2321 ../../include/items.php:2367
-msgid "noreply"
-msgstr ""
-
-#: ../../mod/item.php:719 ../../mod/item.php:806 ../../include/items.php:2366
-msgid "Administrator@"
-msgstr ""
-
-#: ../../mod/item.php:722 ../../include/items.php:2211
-#: ../../include/items.php:2369
-#, php-format
-msgid "%s commented on an item at %s"
-msgstr ""
-
-#: ../../mod/item.php:809
-#, php-format
-msgid "%s posted to your profile wall at %s"
-msgstr ""
-
-#: ../../mod/item.php:843
+#: ../../mod/item.php:790
 msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/item.php:868
+#: ../../mod/item.php:815
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social network."
 msgstr ""
 
-#: ../../mod/item.php:870
+#: ../../mod/item.php:817
 #, php-format
 msgid "You may visit them online at %s"
 msgstr ""
 
-#: ../../mod/item.php:871
+#: ../../mod/item.php:818
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr ""
 
-#: ../../mod/item.php:873
+#: ../../mod/item.php:820
 #, php-format
 msgid "%s posted an update."
 msgstr ""
 
-#: ../../mod/profile_photo.php:28
+#: ../../mod/profile_photo.php:30
 msgid "Image uploaded but image cropping failed."
 msgstr ""
 
-#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68
-#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:258
+#: ../../mod/profile_photo.php:63 ../../mod/profile_photo.php:70
+#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:264
 #, php-format
 msgid "Image size reduction [%s] failed."
 msgstr ""
 
-#: ../../mod/profile_photo.php:89
+#: ../../mod/profile_photo.php:91
 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
 msgstr ""
 
-#: ../../mod/profile_photo.php:99
+#: ../../mod/profile_photo.php:101
 msgid "Unable to process image"
 msgstr ""
 
-#: ../../mod/profile_photo.php:113 ../../mod/wall_upload.php:56
+#: ../../mod/profile_photo.php:115 ../../mod/wall_upload.php:74
 #, php-format
 msgid "Image exceeds size limit of %d"
 msgstr ""
 
-#: ../../mod/profile_photo.php:203
+#: ../../mod/profile_photo.php:207
 msgid "Upload File:"
 msgstr ""
 
-#: ../../mod/profile_photo.php:204
+#: ../../mod/profile_photo.php:208
 msgid "Upload Profile Photo"
 msgstr ""
 
-#: ../../mod/profile_photo.php:205
+#: ../../mod/profile_photo.php:209
 msgid "Upload"
 msgstr ""
 
-#: ../../mod/profile_photo.php:206
+#: ../../mod/profile_photo.php:211
 msgid "skip this step"
 msgstr ""
 
-#: ../../mod/profile_photo.php:206
+#: ../../mod/profile_photo.php:211
 msgid "select a photo from your photo albums"
 msgstr ""
 
-#: ../../mod/profile_photo.php:219
+#: ../../mod/profile_photo.php:224
 msgid "Crop Image"
 msgstr ""
 
-#: ../../mod/profile_photo.php:220
+#: ../../mod/profile_photo.php:225
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 
-#: ../../mod/profile_photo.php:221
+#: ../../mod/profile_photo.php:227
 msgid "Done Editing"
 msgstr ""
 
-#: ../../mod/profile_photo.php:249
+#: ../../mod/profile_photo.php:255
 msgid "Image uploaded successfully."
 msgstr ""
 
-#: ../../mod/hcard.php:10 ../../mod/profile.php:10 ../../boot.php:817
+#: ../../mod/hcard.php:10
 msgid "No profile"
 msgstr ""
 
-#: ../../mod/removeme.php:42 ../../mod/removeme.php:45
+#: ../../mod/removeme.php:45 ../../mod/removeme.php:48
 msgid "Remove My Account"
 msgstr ""
 
-#: ../../mod/removeme.php:43
+#: ../../mod/removeme.php:46
 msgid ""
 "This will completely remove your account. Once this has been done it is not "
 "recoverable."
 msgstr ""
 
-#: ../../mod/removeme.php:44
+#: ../../mod/removeme.php:47
 msgid "Please enter your password for verification:"
 msgstr ""
 
-#: ../../mod/message.php:23
-msgid "No recipient selected."
+#: ../../mod/message.php:9 ../../include/nav.php:131
+msgid "New Message"
 msgstr ""
 
-#: ../../mod/message.php:26
+#: ../../mod/message.php:69
 msgid "Unable to locate contact information."
 msgstr ""
 
-#: ../../mod/message.php:29
-msgid "Message could not be sent."
-msgstr ""
-
-#: ../../mod/message.php:31
-msgid "Message sent."
-msgstr ""
-
-#: ../../mod/message.php:51
-msgid "Inbox"
-msgstr ""
-
-#: ../../mod/message.php:56
-msgid "Outbox"
-msgstr ""
-
-#: ../../mod/message.php:61
-msgid "New Message"
-msgstr ""
-
-#: ../../mod/message.php:87
+#: ../../mod/message.php:119
 msgid "Message deleted."
 msgstr ""
 
-#: ../../mod/message.php:103
+#: ../../mod/message.php:149
 msgid "Conversation removed."
 msgstr ""
 
-#: ../../mod/message.php:119 ../../include/conversation.php:805
-msgid "Please enter a link URL:"
-msgstr ""
-
-#: ../../mod/message.php:127
-msgid "Send Private Message"
-msgstr ""
-
-#: ../../mod/message.php:128 ../../mod/message.php:261
-msgid "To:"
+#: ../../mod/message.php:245
+msgid "No messages."
 msgstr ""
 
-#: ../../mod/message.php:129 ../../mod/message.php:262
-msgid "Subject:"
+#: ../../mod/message.php:252
+#, php-format
+msgid "Unknown sender - %s"
 msgstr ""
 
-#: ../../mod/message.php:132 ../../mod/message.php:265
-#: ../../mod/invite.php:101
-msgid "Your message:"
+#: ../../mod/message.php:255
+#, php-format
+msgid "You and %s"
 msgstr ""
 
-#: ../../mod/message.php:170
-msgid "No messages."
+#: ../../mod/message.php:258
+#, php-format
+msgid "%s and You"
 msgstr ""
 
-#: ../../mod/message.php:183
+#: ../../mod/message.php:268 ../../mod/message.php:390
 msgid "Delete conversation"
 msgstr ""
 
-#: ../../mod/message.php:186
+#: ../../mod/message.php:271
 msgid "D, d M Y - g:i A"
 msgstr ""
 
-#: ../../mod/message.php:213
+#: ../../mod/message.php:273
+#, php-format
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../mod/message.php:308
 msgid "Message not available."
 msgstr ""
 
-#: ../../mod/message.php:250
+#: ../../mod/message.php:373
 msgid "Delete message"
 msgstr ""
 
-#: ../../mod/message.php:260
+#: ../../mod/message.php:392
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr ""
+
+#: ../../mod/message.php:396
 msgid "Send Reply"
 msgstr ""
 
@@ -2591,457 +3052,707 @@ msgstr ""
 msgid "No friends to display."
 msgstr ""
 
-#: ../../mod/admin.php:59 ../../mod/admin.php:295
+#: ../../mod/admin.php:55
+msgid "Theme settings updated."
+msgstr ""
+
+#: ../../mod/admin.php:96 ../../mod/admin.php:403
 msgid "Site"
 msgstr ""
 
-#: ../../mod/admin.php:60 ../../mod/admin.php:460 ../../mod/admin.php:472
+#: ../../mod/admin.php:97 ../../mod/admin.php:639 ../../mod/admin.php:651
 msgid "Users"
 msgstr ""
 
-#: ../../mod/admin.php:61 ../../mod/admin.php:549 ../../mod/admin.php:586
+#: ../../mod/admin.php:98 ../../mod/admin.php:733 ../../mod/admin.php:775
 msgid "Plugins"
 msgstr ""
 
-#: ../../mod/admin.php:76 ../../mod/admin.php:651
+#: ../../mod/admin.php:99 ../../mod/admin.php:938 ../../mod/admin.php:974
+msgid "Themes"
+msgstr ""
+
+#: ../../mod/admin.php:100
+msgid "DB updates"
+msgstr ""
+
+#: ../../mod/admin.php:101
+msgid "Software Update"
+msgstr ""
+
+#: ../../mod/admin.php:115 ../../mod/admin.php:1061
 msgid "Logs"
 msgstr ""
 
-#: ../../mod/admin.php:81
+#: ../../mod/admin.php:120
 msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: ../../mod/admin.php:144 ../../mod/admin.php:294 ../../mod/admin.php:459
-#: ../../mod/admin.php:548 ../../mod/admin.php:585 ../../mod/admin.php:650
+#: ../../mod/admin.php:195 ../../mod/admin.php:402 ../../mod/admin.php:638
+#: ../../mod/admin.php:732 ../../mod/admin.php:774 ../../mod/admin.php:937
+#: ../../mod/admin.php:973 ../../mod/admin.php:1060
 msgid "Administration"
 msgstr ""
 
-#: ../../mod/admin.php:145
+#: ../../mod/admin.php:196
 msgid "Summary"
 msgstr ""
 
-#: ../../mod/admin.php:146
+#: ../../mod/admin.php:197
 msgid "Registered users"
 msgstr ""
 
-#: ../../mod/admin.php:148
+#: ../../mod/admin.php:199
 msgid "Pending registrations"
 msgstr ""
 
-#: ../../mod/admin.php:149
+#: ../../mod/admin.php:200
 msgid "Version"
 msgstr ""
 
-#: ../../mod/admin.php:151
+#: ../../mod/admin.php:202
 msgid "Active plugins"
 msgstr ""
 
-#: ../../mod/admin.php:243
+#: ../../mod/admin.php:341
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:287
+#: ../../mod/admin.php:389
 msgid "Closed"
 msgstr ""
 
-#: ../../mod/admin.php:288
+#: ../../mod/admin.php:390
 msgid "Requires approval"
 msgstr ""
 
-#: ../../mod/admin.php:289
+#: ../../mod/admin.php:391
 msgid "Open"
 msgstr ""
 
-#: ../../mod/admin.php:298
+#: ../../mod/admin.php:395
+msgid "No SSL policy, links will track page SSL state"
+msgstr ""
+
+#: ../../mod/admin.php:396
+msgid "Force all links to use SSL"
+msgstr ""
+
+#: ../../mod/admin.php:397
+msgid "Self-signed certificate, use SSL for local links only (discouraged)"
+msgstr ""
+
+#: ../../mod/admin.php:406
 msgid "File upload"
 msgstr ""
 
-#: ../../mod/admin.php:299
+#: ../../mod/admin.php:407
 msgid "Policies"
 msgstr ""
 
-#: ../../mod/admin.php:300
+#: ../../mod/admin.php:408
 msgid "Advanced"
 msgstr ""
 
-#: ../../mod/admin.php:304 ../../addon/statusnet/statusnet.php:477
+#: ../../mod/admin.php:412 ../../addon/statusnet/statusnet.php:552
 msgid "Site name"
 msgstr ""
 
-#: ../../mod/admin.php:305
+#: ../../mod/admin.php:413
 msgid "Banner/Logo"
 msgstr ""
 
-#: ../../mod/admin.php:306
+#: ../../mod/admin.php:414
 msgid "System language"
 msgstr ""
 
-#: ../../mod/admin.php:307
+#: ../../mod/admin.php:415
 msgid "System theme"
 msgstr ""
 
-#: ../../mod/admin.php:309
-msgid "Maximum image size"
+#: ../../mod/admin.php:415
+msgid ""
+"Default system theme - may be over-ridden by user profiles - <a href='#' "
+"id='cnftheme'>change theme settings</a>"
 msgstr ""
 
-#: ../../mod/admin.php:311
-msgid "Register policy"
+#: ../../mod/admin.php:416
+msgid "SSL link policy"
 msgstr ""
 
-#: ../../mod/admin.php:312
-msgid "Register text"
+#: ../../mod/admin.php:416
+msgid "Determines whether generated links should be forced to use SSL"
 msgstr ""
 
-#: ../../mod/admin.php:313
-msgid "Accounts abandoned after x days"
+#: ../../mod/admin.php:417
+msgid "Maximum image size"
 msgstr ""
 
-#: ../../mod/admin.php:313
+#: ../../mod/admin.php:417
 msgid ""
-"Will not waste system resources polling external sites for abandonded "
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
+msgstr ""
+
+#: ../../mod/admin.php:419
+msgid "Register policy"
+msgstr ""
+
+#: ../../mod/admin.php:420
+msgid "Register text"
+msgstr ""
+
+#: ../../mod/admin.php:420
+msgid "Will be displayed prominently on the registration page."
+msgstr ""
+
+#: ../../mod/admin.php:421
+msgid "Accounts abandoned after x days"
+msgstr ""
+
+#: ../../mod/admin.php:421
+msgid ""
+"Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: ../../mod/admin.php:314
+#: ../../mod/admin.php:422
 msgid "Allowed friend domains"
 msgstr ""
 
-#: ../../mod/admin.php:315
+#: ../../mod/admin.php:422
+msgid ""
+"Comma separated list of domains which are allowed to establish friendships "
+"with this site. Wildcards are accepted. Empty to allow any domains"
+msgstr ""
+
+#: ../../mod/admin.php:423
 msgid "Allowed email domains"
 msgstr ""
 
-#: ../../mod/admin.php:316
+#: ../../mod/admin.php:423
+msgid ""
+"Comma separated list of domains which are allowed in email addresses for "
+"registrations to this site. Wildcards are accepted. Empty to allow any "
+"domains"
+msgstr ""
+
+#: ../../mod/admin.php:424
 msgid "Block public"
 msgstr ""
 
-#: ../../mod/admin.php:317
+#: ../../mod/admin.php:424
+msgid ""
+"Check to block public access to all otherwise public personal pages on this "
+"site unless you are currently logged in."
+msgstr ""
+
+#: ../../mod/admin.php:425
 msgid "Force publish"
 msgstr ""
 
-#: ../../mod/admin.php:318
+#: ../../mod/admin.php:425
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
+msgstr ""
+
+#: ../../mod/admin.php:426
 msgid "Global directory update URL"
 msgstr ""
 
-#: ../../mod/admin.php:320
+#: ../../mod/admin.php:426
+msgid ""
+"URL to update the global directory. If this is not set, the global directory "
+"is completely unavailable to the application."
+msgstr ""
+
+#: ../../mod/admin.php:428
 msgid "Block multiple registrations"
 msgstr ""
 
-#: ../../mod/admin.php:321
+#: ../../mod/admin.php:428
+msgid "Disallow users to register additional accounts for use as pages."
+msgstr ""
+
+#: ../../mod/admin.php:429
 msgid "OpenID support"
 msgstr ""
 
-#: ../../mod/admin.php:322
-msgid "Gravatar support"
+#: ../../mod/admin.php:429
+msgid "OpenID support for registration and logins."
 msgstr ""
 
-#: ../../mod/admin.php:323
+#: ../../mod/admin.php:430
 msgid "Fullname check"
 msgstr ""
 
-#: ../../mod/admin.php:324
+#: ../../mod/admin.php:430
+msgid ""
+"Force users to register with a space between firstname and lastname in Full "
+"name, as an antispam measure"
+msgstr ""
+
+#: ../../mod/admin.php:431
 msgid "UTF-8 Regular expressions"
 msgstr ""
 
-#: ../../mod/admin.php:325
+#: ../../mod/admin.php:431
+msgid "Use PHP UTF8 regular expressions"
+msgstr ""
+
+#: ../../mod/admin.php:432
 msgid "Show Community Page"
 msgstr ""
 
-#: ../../mod/admin.php:326
+#: ../../mod/admin.php:432
+msgid ""
+"Display a Community page showing all recent public postings on this site."
+msgstr ""
+
+#: ../../mod/admin.php:433
 msgid "Enable OStatus support"
 msgstr ""
 
-#: ../../mod/admin.php:327
+#: ../../mod/admin.php:433
+msgid ""
+"Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All "
+"communications in OStatus are public, so privacy warnings will be "
+"occasionally displayed."
+msgstr ""
+
+#: ../../mod/admin.php:434
 msgid "Enable Diaspora support"
 msgstr ""
 
-#: ../../mod/admin.php:328
-msgid "Only allow Friendika contacts"
+#: ../../mod/admin.php:434
+msgid "Provide built-in Diaspora network compatibility."
+msgstr ""
+
+#: ../../mod/admin.php:435
+msgid "Only allow Friendica contacts"
+msgstr ""
+
+#: ../../mod/admin.php:435
+msgid ""
+"All contacts must use Friendica protocols. All other built-in communication "
+"protocols disabled."
 msgstr ""
 
-#: ../../mod/admin.php:329
+#: ../../mod/admin.php:436
 msgid "Verify SSL"
 msgstr ""
 
-#: ../../mod/admin.php:330
+#: ../../mod/admin.php:436
+msgid ""
+"If you wish, you can turn on strict certificate checking. This will mean you "
+"cannot connect (at all) to self-signed SSL sites."
+msgstr ""
+
+#: ../../mod/admin.php:437
 msgid "Proxy user"
 msgstr ""
 
-#: ../../mod/admin.php:331
+#: ../../mod/admin.php:438
 msgid "Proxy URL"
 msgstr ""
 
-#: ../../mod/admin.php:332
+#: ../../mod/admin.php:439
 msgid "Network timeout"
 msgstr ""
 
-#: ../../mod/admin.php:353
+#: ../../mod/admin.php:439
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+msgstr ""
+
+#: ../../mod/admin.php:440
+msgid "Delivery interval"
+msgstr ""
+
+#: ../../mod/admin.php:440
+msgid ""
+"Delay background delivery processes by this many seconds to reduce system "
+"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
+"for large dedicated servers."
+msgstr ""
+
+#: ../../mod/admin.php:441
+msgid "Poll interval"
+msgstr ""
+
+#: ../../mod/admin.php:441
+msgid ""
+"Delay background polling processes by this many seconds to reduce system "
+"load. If 0, use delivery interval."
+msgstr ""
+
+#: ../../mod/admin.php:442
+msgid "Maximum Load Average"
+msgstr ""
+
+#: ../../mod/admin.php:442
+msgid ""
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
+msgstr ""
+
+#: ../../mod/admin.php:456
+msgid "Update has been marked successful"
+msgstr ""
+
+#: ../../mod/admin.php:466
+#, php-format
+msgid "Executing %s failed. Check system logs."
+msgstr ""
+
+#: ../../mod/admin.php:469
+#, php-format
+msgid "Update %s was successfully applied."
+msgstr ""
+
+#: ../../mod/admin.php:473
+#, php-format
+msgid "Update %s did not return a status. Unknown if it succeeded."
+msgstr ""
+
+#: ../../mod/admin.php:476
+#, php-format
+msgid "Update function %s could not be found."
+msgstr ""
+
+#: ../../mod/admin.php:491
+msgid "No failed updates."
+msgstr ""
+
+#: ../../mod/admin.php:495
+msgid "Failed Updates"
+msgstr ""
+
+#: ../../mod/admin.php:496
+msgid ""
+"This does not include updates prior to 1139, which did not return a status."
+msgstr ""
+
+#: ../../mod/admin.php:497
+msgid "Mark success (if update was manually applied)"
+msgstr ""
+
+#: ../../mod/admin.php:498
+msgid "Attempt to execute this update step automatically"
+msgstr ""
+
+#: ../../mod/admin.php:523
 #, php-format
-msgid "%s user blocked"
+msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:360
+#: ../../mod/admin.php:530
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:394
+#: ../../mod/admin.php:569
 #, php-format
 msgid "User '%s' deleted"
 msgstr ""
 
-#: ../../mod/admin.php:401
+#: ../../mod/admin.php:577
 #, php-format
 msgid "User '%s' unblocked"
 msgstr ""
 
-#: ../../mod/admin.php:401
+#: ../../mod/admin.php:577
 #, php-format
 msgid "User '%s' blocked"
 msgstr ""
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:641
 msgid "select all"
 msgstr ""
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:642
 msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:643
 msgid "Request date"
 msgstr ""
 
-#: ../../mod/admin.php:464 ../../mod/admin.php:473
-#: ../../include/contact_selectors.php:78
+#: ../../mod/admin.php:643 ../../mod/admin.php:652
+#: ../../include/contact_selectors.php:79
 msgid "Email"
 msgstr ""
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:644
 msgid "No registrations."
 msgstr ""
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:646
 msgid "Deny"
 msgstr ""
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:652
 msgid "Register date"
 msgstr ""
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:652
 msgid "Last login"
 msgstr ""
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:652
 msgid "Last item"
 msgstr ""
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:652
 msgid "Account"
 msgstr ""
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:654
 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:476
+#: ../../mod/admin.php:655
 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:512
+#: ../../mod/admin.php:696
 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../mod/admin.php:516
+#: ../../mod/admin.php:700
 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../mod/admin.php:526
+#: ../../mod/admin.php:710 ../../mod/admin.php:908
 msgid "Disable"
 msgstr ""
 
-#: ../../mod/admin.php:528
+#: ../../mod/admin.php:712 ../../mod/admin.php:910
 msgid "Enable"
 msgstr ""
 
-#: ../../mod/admin.php:550
+#: ../../mod/admin.php:734 ../../mod/admin.php:939
 msgid "Toggle"
 msgstr ""
 
-#: ../../mod/admin.php:551 ../../include/nav.php:128
-msgid "Settings"
+#: ../../mod/admin.php:742 ../../mod/admin.php:949
+msgid "Author: "
+msgstr ""
+
+#: ../../mod/admin.php:743 ../../mod/admin.php:950
+msgid "Maintainer: "
+msgstr ""
+
+#: ../../mod/admin.php:872
+msgid "No themes found."
+msgstr ""
+
+#: ../../mod/admin.php:931
+msgid "Screenshot"
+msgstr ""
+
+#: ../../mod/admin.php:979
+msgid "[Experimental]"
 msgstr ""
 
-#: ../../mod/admin.php:613
+#: ../../mod/admin.php:980
+msgid "[Unsupported]"
+msgstr ""
+
+#: ../../mod/admin.php:1007
 msgid "Log settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:653
+#: ../../mod/admin.php:1063
 msgid "Clear"
 msgstr ""
 
-#: ../../mod/admin.php:659
+#: ../../mod/admin.php:1069
 msgid "Debugging"
 msgstr ""
 
-#: ../../mod/admin.php:660
+#: ../../mod/admin.php:1070
 msgid "Log file"
 msgstr ""
 
-#: ../../mod/admin.php:660
-msgid "Must be writable by web server. Relative to your Friendika index.php."
+#: ../../mod/admin.php:1070
+msgid ""
+"Must be writable by web server. Relative to your Friendica top-level "
+"directory."
 msgstr ""
 
-#: ../../mod/admin.php:661
+#: ../../mod/admin.php:1071
 msgid "Log level"
 msgstr ""
 
-#: ../../mod/admin.php:702
+#: ../../mod/admin.php:1121
 msgid "Close"
 msgstr ""
 
-#: ../../mod/admin.php:708
+#: ../../mod/admin.php:1127
 msgid "FTP Host"
 msgstr ""
 
-#: ../../mod/admin.php:709
+#: ../../mod/admin.php:1128
 msgid "FTP Path"
 msgstr ""
 
-#: ../../mod/admin.php:710
+#: ../../mod/admin.php:1129
 msgid "FTP User"
 msgstr ""
 
-#: ../../mod/admin.php:711
+#: ../../mod/admin.php:1130
 msgid "FTP Password"
 msgstr ""
 
-#: ../../mod/profile.php:105 ../../mod/display.php:66
+#: ../../mod/profile.php:21 ../../boot.php:959
+msgid "Requested profile is not available."
+msgstr ""
+
+#: ../../mod/profile.php:126 ../../mod/display.php:75
 msgid "Access to this profile has been restricted."
 msgstr ""
 
-#: ../../mod/profile.php:127
+#: ../../mod/profile.php:151
 msgid "Tips for New Members"
 msgstr ""
 
-#: ../../mod/ping.php:146
+#: ../../mod/ping.php:177
 msgid "{0} wants to be your friend"
 msgstr ""
 
-#: ../../mod/ping.php:151
+#: ../../mod/ping.php:182
 msgid "{0} sent you a message"
 msgstr ""
 
-#: ../../mod/ping.php:156
+#: ../../mod/ping.php:187
 msgid "{0} requested registration"
 msgstr ""
 
-#: ../../mod/ping.php:162
+#: ../../mod/ping.php:193
 #, php-format
 msgid "{0} commented %s's post"
 msgstr ""
 
-#: ../../mod/ping.php:167
+#: ../../mod/ping.php:198
 #, php-format
 msgid "{0} liked %s's post"
 msgstr ""
 
-#: ../../mod/ping.php:172
+#: ../../mod/ping.php:203
 #, php-format
 msgid "{0} disliked %s's post"
 msgstr ""
 
-#: ../../mod/ping.php:177
+#: ../../mod/ping.php:208
 #, php-format
 msgid "{0} is now friends with %s"
 msgstr ""
 
-#: ../../mod/ping.php:182
+#: ../../mod/ping.php:213
 msgid "{0} posted"
 msgstr ""
 
-#: ../../mod/ping.php:187
+#: ../../mod/ping.php:218
 #, php-format
 msgid "{0} tagged %s's post with #%s"
 msgstr ""
 
-#: ../../mod/openid.php:63 ../../mod/openid.php:123 ../../include/auth.php:122
-#: ../../include/auth.php:147 ../../include/auth.php:201
-msgid "Login failed."
+#: ../../mod/ping.php:224
+msgid "{0} mentioned you in a post"
 msgstr ""
 
-#: ../../mod/openid.php:79 ../../include/auth.php:217
-msgid "Welcome "
+#: ../../mod/nogroup.php:58
+msgid "Contacts who are not members of a group"
 msgstr ""
 
-#: ../../mod/openid.php:80 ../../include/auth.php:218
-msgid "Please upload a profile photo."
+#: ../../mod/openid.php:24
+msgid "OpenID protocol error. No ID returned."
 msgstr ""
 
-#: ../../mod/openid.php:83 ../../include/auth.php:221
-msgid "Welcome back "
+#: ../../mod/openid.php:53
+msgid ""
+"Account not found and OpenID registration is not permitted on this site."
 msgstr ""
 
-#: ../../mod/follow.php:39
+#: ../../mod/openid.php:93 ../../include/auth.php:90
+#: ../../include/auth.php:153
+msgid "Login failed."
+msgstr ""
+
+#: ../../mod/follow.php:30
+msgid "Connect URL missing."
+msgstr ""
+
+#: ../../mod/follow.php:56
 msgid ""
 "This site is not configured to allow communications with other networks."
 msgstr ""
 
-#: ../../mod/follow.php:40 ../../mod/follow.php:50
+#: ../../mod/follow.php:57 ../../mod/follow.php:72
 msgid "No compatible communication protocols or feeds were discovered."
 msgstr ""
 
-#: ../../mod/follow.php:48
+#: ../../mod/follow.php:70
 msgid "The profile address specified does not provide adequate information."
 msgstr ""
 
-#: ../../mod/follow.php:52
+#: ../../mod/follow.php:74
 msgid "An author or name was not found."
 msgstr ""
 
-#: ../../mod/follow.php:54
+#: ../../mod/follow.php:76
 msgid "No browser URL could be matched to this address."
 msgstr ""
 
-#: ../../mod/follow.php:61
+#: ../../mod/follow.php:78
+msgid ""
+"Unable to match @-style Identity Address with a known protocol or email "
+"contact."
+msgstr ""
+
+#: ../../mod/follow.php:79
+msgid "Use mailto: in front of address to force email check."
+msgstr ""
+
+#: ../../mod/follow.php:85
 msgid ""
 "The profile address specified belongs to a network which has been disabled "
 "on this site."
 msgstr ""
 
-#: ../../mod/follow.php:66
+#: ../../mod/follow.php:90
 msgid ""
 "Limited profile. This person will be unable to receive direct/personal "
 "notifications from you."
 msgstr ""
 
-#: ../../mod/follow.php:133
+#: ../../mod/follow.php:161
 msgid "Unable to retrieve contact information."
 msgstr ""
 
-#: ../../mod/follow.php:179
+#: ../../mod/follow.php:216
 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:108
+#: ../../mod/display.php:135
 msgid "Item has been removed."
 msgstr ""
 
@@ -3053,269 +3764,369 @@ msgstr ""
 msgid "No installed applications."
 msgstr ""
 
-#: ../../mod/search.php:83
-msgid "Search This Site"
+#: ../../mod/search.php:83 ../../include/text.php:650 ../../include/nav.php:91
+msgid "Search"
 msgstr ""
 
-#: ../../mod/profiles.php:21 ../../mod/profiles.php:239
-#: ../../mod/profiles.php:344 ../../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 ""
 
-#: ../../mod/profiles.php:28
+#: ../../mod/profiles.php:31
 msgid "Profile Name is required."
 msgstr ""
 
-#: ../../mod/profiles.php:198
+#: ../../mod/profiles.php:145
+msgid "Marital Status"
+msgstr ""
+
+#: ../../mod/profiles.php:149
+msgid "Romantic Partner"
+msgstr ""
+
+#: ../../mod/profiles.php:153
+msgid "Work/Employment"
+msgstr ""
+
+#: ../../mod/profiles.php:156
+msgid "Religion"
+msgstr ""
+
+#: ../../mod/profiles.php:160
+msgid "Political Views"
+msgstr ""
+
+#: ../../mod/profiles.php:164
+msgid "Gender"
+msgstr ""
+
+#: ../../mod/profiles.php:168
+msgid "Sexual Preference"
+msgstr ""
+
+#: ../../mod/profiles.php:172
+msgid "Homepage"
+msgstr ""
+
+#: ../../mod/profiles.php:176
+msgid "Interests"
+msgstr ""
+
+#: ../../mod/profiles.php:181
+msgid "Location"
+msgstr ""
+
+#: ../../mod/profiles.php:253
 msgid "Profile updated."
 msgstr ""
 
-#: ../../mod/profiles.php:256
+#: ../../mod/profiles.php:320
+msgid " and "
+msgstr ""
+
+#: ../../mod/profiles.php:328
+msgid "public profile"
+msgstr ""
+
+#: ../../mod/profiles.php:331
+#, php-format
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+msgstr ""
+
+#: ../../mod/profiles.php:332
+#, php-format
+msgid " - Visit %1$s's %2$s"
+msgstr ""
+
+#: ../../mod/profiles.php:335
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
+msgstr ""
+
+#: ../../mod/profiles.php:394
 msgid "Profile deleted."
 msgstr ""
 
-#: ../../mod/profiles.php:272 ../../mod/profiles.php:303
+#: ../../mod/profiles.php:412 ../../mod/profiles.php:446
 msgid "Profile-"
 msgstr ""
 
-#: ../../mod/profiles.php:291 ../../mod/profiles.php:330
+#: ../../mod/profiles.php:431 ../../mod/profiles.php:473
 msgid "New profile created."
 msgstr ""
 
-#: ../../mod/profiles.php:309
+#: ../../mod/profiles.php:452
 msgid "Profile unavailable to clone."
 msgstr ""
 
-#: ../../mod/profiles.php:356
+#: ../../mod/profiles.php:510
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr ""
 
-#: ../../mod/profiles.php:374
+#: ../../mod/profiles.php:533
 msgid "Edit Profile Details"
 msgstr ""
 
-#: ../../mod/profiles.php:376
+#: ../../mod/profiles.php:535
 msgid "View this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:377
+#: ../../mod/profiles.php:536
 msgid "Create a new profile using these settings"
 msgstr ""
 
-#: ../../mod/profiles.php:378
+#: ../../mod/profiles.php:537
 msgid "Clone this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:379
+#: ../../mod/profiles.php:538
 msgid "Delete this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:380
+#: ../../mod/profiles.php:539
 msgid "Profile Name:"
 msgstr ""
 
-#: ../../mod/profiles.php:381
+#: ../../mod/profiles.php:540
 msgid "Your Full Name:"
 msgstr ""
 
-#: ../../mod/profiles.php:382
+#: ../../mod/profiles.php:541
 msgid "Title/Description:"
 msgstr ""
 
-#: ../../mod/profiles.php:383
+#: ../../mod/profiles.php:542
 msgid "Your Gender:"
 msgstr ""
 
-#: ../../mod/profiles.php:384
+#: ../../mod/profiles.php:543
 #, php-format
 msgid "Birthday (%s):"
 msgstr ""
 
-#: ../../mod/profiles.php:385
+#: ../../mod/profiles.php:544
 msgid "Street Address:"
 msgstr ""
 
-#: ../../mod/profiles.php:386
+#: ../../mod/profiles.php:545
 msgid "Locality/City:"
 msgstr ""
 
-#: ../../mod/profiles.php:387
+#: ../../mod/profiles.php:546
 msgid "Postal/Zip Code:"
 msgstr ""
 
-#: ../../mod/profiles.php:388
+#: ../../mod/profiles.php:547
 msgid "Country:"
 msgstr ""
 
-#: ../../mod/profiles.php:389
+#: ../../mod/profiles.php:548
 msgid "Region/State:"
 msgstr ""
 
-#: ../../mod/profiles.php:390
+#: ../../mod/profiles.php:549
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr ""
 
-#: ../../mod/profiles.php:391
+#: ../../mod/profiles.php:550
 msgid "Who: (if applicable)"
 msgstr ""
 
-#: ../../mod/profiles.php:392
+#: ../../mod/profiles.php:551
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: ../../mod/profiles.php:393 ../../include/profile_advanced.php:43
+#: ../../mod/profiles.php:552 ../../include/profile_advanced.php:43
 msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../mod/profiles.php:394
+#: ../../mod/profiles.php:553
 msgid "Homepage URL:"
 msgstr ""
 
-#: ../../mod/profiles.php:395 ../../include/profile_advanced.php:47
+#: ../../mod/profiles.php:554 ../../include/profile_advanced.php:49
 msgid "Political Views:"
 msgstr ""
 
-#: ../../mod/profiles.php:396
+#: ../../mod/profiles.php:555
 msgid "Religious Views:"
 msgstr ""
 
-#: ../../mod/profiles.php:397
+#: ../../mod/profiles.php:556
 msgid "Public Keywords:"
 msgstr ""
 
-#: ../../mod/profiles.php:398
+#: ../../mod/profiles.php:557
 msgid "Private Keywords:"
 msgstr ""
 
-#: ../../mod/profiles.php:399
+#: ../../mod/profiles.php:558
 msgid "Example: fishing photography software"
 msgstr ""
 
-#: ../../mod/profiles.php:400
+#: ../../mod/profiles.php:559
 msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr ""
 
-#: ../../mod/profiles.php:401
+#: ../../mod/profiles.php:560
 msgid "(Used for searching profiles, never shown to others)"
 msgstr ""
 
-#: ../../mod/profiles.php:402
+#: ../../mod/profiles.php:561
 msgid "Tell us about yourself..."
 msgstr ""
 
-#: ../../mod/profiles.php:403
+#: ../../mod/profiles.php:562
 msgid "Hobbies/Interests"
 msgstr ""
 
-#: ../../mod/profiles.php:404
+#: ../../mod/profiles.php:563
 msgid "Contact information and Social Networks"
 msgstr ""
 
-#: ../../mod/profiles.php:405
+#: ../../mod/profiles.php:564
 msgid "Musical interests"
 msgstr ""
 
-#: ../../mod/profiles.php:406
+#: ../../mod/profiles.php:565
 msgid "Books, literature"
 msgstr ""
 
-#: ../../mod/profiles.php:407
+#: ../../mod/profiles.php:566
 msgid "Television"
 msgstr ""
 
-#: ../../mod/profiles.php:408
+#: ../../mod/profiles.php:567
 msgid "Film/dance/culture/entertainment"
 msgstr ""
 
-#: ../../mod/profiles.php:409
+#: ../../mod/profiles.php:568
 msgid "Love/romance"
 msgstr ""
 
-#: ../../mod/profiles.php:410
+#: ../../mod/profiles.php:569
 msgid "Work/employment"
 msgstr ""
 
-#: ../../mod/profiles.php:411
+#: ../../mod/profiles.php:570
 msgid "School/education"
 msgstr ""
 
-#: ../../mod/profiles.php:416
+#: ../../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:426 ../../mod/directory.php:122
+#: ../../mod/profiles.php:585 ../../mod/directory.php:111
 msgid "Age: "
 msgstr ""
 
-#: ../../mod/profiles.php:461
+#: ../../mod/profiles.php:620
 msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/profiles.php:462 ../../boot.php:908
+#: ../../mod/profiles.php:621 ../../boot.php:1068
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/profiles.php:463 ../../boot.php:909
+#: ../../mod/profiles.php:622 ../../boot.php:1069
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/profiles.php:473 ../../boot.php:919
+#: ../../mod/profiles.php:633 ../../boot.php:1079
 msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/profiles.php:475 ../../boot.php:922
+#: ../../mod/profiles.php:635 ../../boot.php:1082
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../mod/profiles.php:476 ../../boot.php:923
+#: ../../mod/profiles.php:636 ../../boot.php:1083
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../mod/tagger.php:103 ../../include/conversation.php:116
+#: ../../mod/filer.php:29 ../../include/conversation.php:925
+msgid "Save to Folder:"
+msgstr ""
+
+#: ../../mod/filer.php:29
+msgid "- select -"
+msgstr ""
+
+#: ../../mod/tagger.php:103 ../../include/conversation.php:138
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
 
-#: ../../mod/suggest.php:36 ../../include/contact_widgets.php:35
-msgid "Friend Suggestions"
+#: ../../mod/delegate.php:95
+msgid "No potential page delegates located."
+msgstr ""
+
+#: ../../mod/delegate.php:121
+msgid "Delegate Page Management"
 msgstr ""
 
-#: ../../mod/suggest.php:42
+#: ../../mod/delegate.php:123
 msgid ""
-"No suggestions. This works best when you have more than one contact/friend."
+"Delegates are able to manage all aspects of this account/page except for "
+"basic account settings. Please do not delegate your personal account to "
+"anybody that you do not trust completely."
 msgstr ""
 
-#: ../../mod/suggest.php:55
-msgid "Ignore/Hide"
+#: ../../mod/delegate.php:124
+msgid "Existing Page Managers"
 msgstr ""
 
-#: ../../mod/directory.php:49
-msgid "Global Directory"
+#: ../../mod/delegate.php:126
+msgid "Existing Page Delegates"
 msgstr ""
 
-#: ../../mod/directory.php:55
-msgid "Normal site view"
+#: ../../mod/delegate.php:128
+msgid "Potential Delegates"
+msgstr ""
+
+#: ../../mod/delegate.php:131
+msgid "Add"
+msgstr ""
+
+#: ../../mod/delegate.php:132
+msgid "No entries."
+msgstr ""
+
+#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:621
+#: ../../include/contact_widgets.php:34
+msgid "Friend Suggestions"
+msgstr ""
+
+#: ../../mod/suggest.php:44
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
+msgstr ""
+
+#: ../../mod/suggest.php:61
+msgid "Ignore/Hide"
 msgstr ""
 
-#: ../../mod/directory.php:57
-msgid "Admin - View all site entries"
+#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:619
+msgid "Global Directory"
 msgstr ""
 
-#: ../../mod/directory.php:63
+#: ../../mod/directory.php:55
 msgid "Find on this site"
 msgstr ""
 
-#: ../../mod/directory.php:66
+#: ../../mod/directory.php:58
 msgid "Site Directory"
 msgstr ""
 
-#: ../../mod/directory.php:125
+#: ../../mod/directory.php:114
 msgid "Gender: "
 msgstr ""
 
-#: ../../mod/directory.php:151
+#: ../../mod/directory.php:140
 msgid "No entries (some entries may be hidden)."
 msgstr ""
 
@@ -3325,8 +4136,7 @@ msgid "%s : Not a valid email address."
 msgstr ""
 
 #: ../../mod/invite.php:59
-#, php-format
-msgid "Please join my network on %s"
+msgid "Please join us on Friendica"
 msgstr ""
 
 #: ../../mod/invite.php:69
@@ -3345,173 +4155,229 @@ msgstr[1] ""
 msgid "You have no more invitations available"
 msgstr ""
 
-#: ../../mod/invite.php:99
-msgid "Send invitations"
-msgstr ""
-
 #: ../../mod/invite.php:100
-msgid "Enter email addresses, one per line:"
+#, php-format
+msgid ""
+"Visit %s for a list of public sites that you can join. Friendica members on "
+"other sites can all connect with each other, as well as with members of many "
+"other social networks."
 msgstr ""
 
 #: ../../mod/invite.php:102
 #, php-format
-msgid "Please join my social network on %s"
+msgid ""
+"To accept this invitation, please visit and register at %s or any other "
+"public Friendica website."
 msgstr ""
 
 #: ../../mod/invite.php:103
-msgid "To accept this invitation, please visit:"
+#, php-format
+msgid ""
+"Friendica sites all inter-connect to create a huge privacy-enhanced social "
+"web that is owned and controlled by its members. They can also connect with "
+"many traditional social networks. See %s for a list of alternate Friendica "
+"sites you can join."
+msgstr ""
+
+#: ../../mod/invite.php:106
+msgid ""
+"Our apologies. This system is not currently configured to connect with other "
+"public sites or invite members."
+msgstr ""
+
+#: ../../mod/invite.php:111
+msgid "Send invitations"
+msgstr ""
+
+#: ../../mod/invite.php:112
+msgid "Enter email addresses, one per line:"
+msgstr ""
+
+#: ../../mod/invite.php:114
+msgid ""
+"You are cordially invited to join me and other close friends on Friendica - "
+"and help us to create a better social web."
 msgstr ""
 
-#: ../../mod/invite.php:104
+#: ../../mod/invite.php:116
 msgid "You will need to supply this invitation code: $invite_code"
 msgstr ""
 
-#: ../../mod/invite.php:104
+#: ../../mod/invite.php:116
 msgid ""
 "Once you have registered, please connect with me via my profile page at:"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:234
+#: ../../mod/invite.php:118
+msgid ""
+"For more information about the Friendica project and why we feel it is "
+"important, please visit http://friendica.com"
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:119
+msgid ""
+"This may occasionally happen if contact was requested by both persons and it "
+"has already been approved."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:235
 msgid "Response from remote site was not understood."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:243
+#: ../../mod/dfrn_confirm.php:244
 msgid "Unexpected response from remote site: "
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:251
+#: ../../mod/dfrn_confirm.php:252
 msgid "Confirmation completed successfully."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:253 ../../mod/dfrn_confirm.php:267
-#: ../../mod/dfrn_confirm.php:274
+#: ../../mod/dfrn_confirm.php:254 ../../mod/dfrn_confirm.php:268
+#: ../../mod/dfrn_confirm.php:275
 msgid "Remote site reported: "
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:265
+#: ../../mod/dfrn_confirm.php:266
 msgid "Temporary failure. Please wait and try again."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:272
+#: ../../mod/dfrn_confirm.php:273
 msgid "Introduction failed or was revoked."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:409
+#: ../../mod/dfrn_confirm.php:418
 msgid "Unable to set contact photo."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:459 ../../include/diaspora.php:479
-#: ../../include/conversation.php:79
+#: ../../mod/dfrn_confirm.php:475 ../../include/diaspora.php:507
+#: ../../include/conversation.php:101
 #, php-format
 msgid "%1$s is now friends with %2$s"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:530
+#: ../../mod/dfrn_confirm.php:557
 #, php-format
 msgid "No user record found for '%s' "
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:540
+#: ../../mod/dfrn_confirm.php:567
 msgid "Our site encryption key is apparently messed up."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:551
+#: ../../mod/dfrn_confirm.php:578
 msgid "Empty site URL was provided or URL could not be decrypted by us."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:572
+#: ../../mod/dfrn_confirm.php:599
 msgid "Contact record was not found for you on our site."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:586
+#: ../../mod/dfrn_confirm.php:613
 #, php-format
 msgid "Site public key not available in contact record for URL %s."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:606
+#: ../../mod/dfrn_confirm.php:633
 msgid ""
 "The ID provided by your system is a duplicate on our system. It should work "
 "if you try again."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:617
+#: ../../mod/dfrn_confirm.php:644
 msgid "Unable to set your contact credentials on our system."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:671
+#: ../../mod/dfrn_confirm.php:709
 msgid "Unable to update your contact profile details on our system"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:701
+#: ../../mod/dfrn_confirm.php:743
 #, php-format
 msgid "Connection accepted at %s"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:337
+#: ../../mod/dfrn_confirm.php:792
+#, php-format
+msgid "%1$s has joined %2$s"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:509
 msgid "Facebook disabled"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:342
+#: ../../addon/facebook/facebook.php:514
 msgid "Updating contacts"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:351
+#: ../../addon/facebook/facebook.php:537
 msgid "Facebook API key is missing."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:358
+#: ../../addon/facebook/facebook.php:544
 msgid "Facebook Connect"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:364
+#: ../../addon/facebook/facebook.php:550
 msgid "Install Facebook connector for this account."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:371
+#: ../../addon/facebook/facebook.php:557
 msgid "Remove Facebook connector"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:376
+#: ../../addon/facebook/facebook.php:562
 msgid ""
 "Re-authenticate [This is necessary whenever your Facebook password is "
 "changed.]"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:383
+#: ../../addon/facebook/facebook.php:569
 msgid "Post to Facebook by default"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:387
+#: ../../addon/facebook/facebook.php:575
+msgid ""
+"Facebook friend linking has been disabled on this site. The following "
+"settings will have no effect."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:579
+msgid ""
+"Facebook friend linking has been disabled on this site. If you disable it, "
+"you will be unable to re-enable it."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:582
 msgid "Link all your Facebook friends and conversations on this website"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:389
+#: ../../addon/facebook/facebook.php:584
 msgid ""
 "Facebook conversations consist of your <em>profile wall</em> and your friend "
 "<em>stream</em>."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:390
+#: ../../addon/facebook/facebook.php:585
 msgid "On this website, your Facebook friend stream is only visible to you."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:391
+#: ../../addon/facebook/facebook.php:586
 msgid ""
 "The following settings determine the privacy of your Facebook profile wall "
 "on this website."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:395
+#: ../../addon/facebook/facebook.php:590
 msgid ""
 "On this website your Facebook profile wall conversations will only be "
 "visible to you"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:400
+#: ../../addon/facebook/facebook.php:595
 msgid "Do not import your Facebook profile wall conversations"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:402
+#: ../../addon/facebook/facebook.php:597
 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 "
@@ -3519,40 +4385,152 @@ msgid ""
 "who may see the conversations."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:469
-#: ../../include/contact_selectors.php:78
+#: ../../addon/facebook/facebook.php:602
+msgid "Comma separated applications to ignore"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:686
+msgid "Problems with Facebook Real-Time Updates"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:714
+#: ../../include/contact_selectors.php:81
 msgid "Facebook"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:470
+#: ../../addon/facebook/facebook.php:715
 msgid "Facebook Connector Settings"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:484
-msgid "Post to Facebook"
+#: ../../addon/facebook/facebook.php:730
+msgid "Facebook API Key"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:561
+#: ../../addon/facebook/facebook.php:740
 msgid ""
-"Post to Facebook cancelled because of multi-network access permission "
-"conflict."
+"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:745
+msgid ""
+"Error: the given API Key seems to be incorrect (the application access token "
+"could not be retrieved)."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:624
-msgid "Image: "
+#: ../../addon/facebook/facebook.php:747
+msgid "The given API Key seems to work correctly."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:700
-msgid "View on Friendika"
+#: ../../addon/facebook/facebook.php:749
+msgid ""
+"The correctness of the API Key could not be detected. Somthing strange's "
+"going on."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:724
-msgid "Facebook post failed. Queued for retry."
+#: ../../addon/facebook/facebook.php:752
+msgid "App-ID / API-Key"
 msgstr ""
 
-#: ../../addon/widgets/widget_like.php:58
+#: ../../addon/facebook/facebook.php:753
+msgid "Application secret"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:754
 #, php-format
-msgid "%d person likes this"
+msgid "Polling Interval in minutes (minimum %1$s minutes)"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:755
+msgid ""
+"Synchronize comments (no comments on Facebook are missed, at the cost of "
+"increased system load)"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:759
+msgid "Real-Time Updates"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:763
+msgid "Real-Time Updates are activated."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:764
+msgid "Deactivate Real-Time Updates"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:766
+msgid "Real-Time Updates not activated."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:766
+msgid "Activate Real-Time Updates"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:785
+msgid "The new values have been saved."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:809
+msgid "Post to Facebook"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:907
+msgid ""
+"Post to Facebook cancelled because of multi-network access permission "
+"conflict."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:1127
+msgid "View on Friendica"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:1160
+msgid "Facebook post failed. Queued for retry."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:1200
+msgid "Your Facebook connection became invalid. Please Re-authenticate."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:1201
+msgid "Facebook connection became invalid"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:1202
+#, php-format
+msgid ""
+"Hi %1$s,\n"
+"\n"
+"The connection between your accounts on %2$s and Facebook became invalid. "
+"This usually happens after you change your Facebook-password. To enable the "
+"connection again, you have to %3$sre-authenticate the Facebook-connector%4$s."
+msgstr ""
+
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:144
+msgid "Lifetime of the cache (in hours)"
+msgstr ""
+
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:149
+msgid "Cache Statistics"
+msgstr ""
+
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:152
+msgid "Number of items"
+msgstr ""
+
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:154
+msgid "Size of the cache"
+msgstr ""
+
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:156
+msgid "Delete the whole cache"
+msgstr ""
+
+#: ../../addon/widgets/widget_like.php:58
+#, php-format
+msgid "%d person likes this"
 msgid_plural "%d people like this"
 msgstr[0] ""
 msgstr[1] ""
@@ -3564,73 +4542,186 @@ msgid_plural "%d people don't like this"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../addon/widgets/widgets.php:55
+#: ../../addon/widgets/widget_friendheader.php:40
+msgid "Get added to this list!"
+msgstr ""
+
+#: ../../addon/widgets/widgets.php:56
 msgid "Generate new key"
 msgstr ""
 
-#: ../../addon/widgets/widgets.php:58
+#: ../../addon/widgets/widgets.php:59
 msgid "Widgets key"
 msgstr ""
 
-#: ../../addon/widgets/widgets.php:60
+#: ../../addon/widgets/widgets.php:61
 msgid "Widgets available"
 msgstr ""
 
 #: ../../addon/widgets/widget_friends.php:40
-msgid "Connect on Friendika!"
+msgid "Connect on Friendica!"
+msgstr ""
+
+#: ../../addon/yourls/yourls.php:55
+msgid "YourLS Settings"
+msgstr ""
+
+#: ../../addon/yourls/yourls.php:57
+msgid "URL: http://"
+msgstr ""
+
+#: ../../addon/yourls/yourls.php:62
+msgid "Username:"
+msgstr ""
+
+#: ../../addon/yourls/yourls.php:67
+msgid "Password:"
+msgstr ""
+
+#: ../../addon/yourls/yourls.php:72
+msgid "Use SSL "
+msgstr ""
+
+#: ../../addon/yourls/yourls.php:92
+msgid "yourls Settings saved."
+msgstr ""
+
+#: ../../addon/ljpost/ljpost.php:39
+msgid "Post to LiveJournal"
+msgstr ""
+
+#: ../../addon/ljpost/ljpost.php:70
+msgid "LiveJournal Post Settings"
+msgstr ""
+
+#: ../../addon/ljpost/ljpost.php:72
+msgid "Enable LiveJournal Post Plugin"
+msgstr ""
+
+#: ../../addon/ljpost/ljpost.php:77
+msgid "LiveJournal username"
+msgstr ""
+
+#: ../../addon/ljpost/ljpost.php:82
+msgid "LiveJournal password"
+msgstr ""
+
+#: ../../addon/ljpost/ljpost.php:87
+msgid "Post to LiveJournal by default"
 msgstr ""
 
 #: ../../addon/nsfw/nsfw.php:47
-msgid "\"Not Safe For Work\" Settings"
+msgid "Not Safe For Work (General Purpose Content Filter) settings"
 msgstr ""
 
 #: ../../addon/nsfw/nsfw.php:49
-msgid "Comma separated words to treat as NSFW"
+msgid ""
+"This plugin looks in posts for the words/text you specify below, and "
+"collapses any content containing those keywords so it is not displayed at "
+"inappropriate times, such as sexual innuendo that may be improper in a work "
+"setting. It is polite and recommended to tag any content containing nudity "
+"with #NSFW.  This filter can also match any other word/text you specify, and "
+"can thereby be used as a general purpose content filter."
+msgstr ""
+
+#: ../../addon/nsfw/nsfw.php:50
+msgid "Enable Content filter"
+msgstr ""
+
+#: ../../addon/nsfw/nsfw.php:53
+msgid "Comma separated list of keywords to hide"
+msgstr ""
+
+#: ../../addon/nsfw/nsfw.php:58
+msgid "Use /expression/ to provide regular expressions"
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:66
+#: ../../addon/nsfw/nsfw.php:74
 msgid "NSFW Settings saved."
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:102
+#: ../../addon/nsfw/nsfw.php:121
 #, php-format
 msgid "%s - Click to open/close"
 msgstr ""
 
+#: ../../addon/page/page.php:48
+msgid "Forums"
+msgstr ""
+
+#: ../../addon/page/page.php:63 ../../addon/showmore/showmore.php:87
+#: ../../include/contact_widgets.php:188 ../../include/conversation.php:469
+#: ../../boot.php:517
+msgid "show more"
+msgstr ""
+
+#: ../../addon/planets/planets.php:150
+msgid "Planets Settings"
+msgstr ""
+
+#: ../../addon/planets/planets.php:152
+msgid "Enable Planets Plugin"
+msgstr ""
+
 #: ../../addon/communityhome/communityhome.php:28
-#: ../../addon/communityhome/communityhome.php:34 ../../include/nav.php:62
-#: ../../boot.php:682
+#: ../../addon/communityhome/communityhome.php:34
+#: ../../addon/communityhome/twillingham/communityhome.php:28
+#: ../../addon/communityhome/twillingham/communityhome.php:34
+#: ../../include/nav.php:64 ../../boot.php:815
 msgid "Login"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:29
+#: ../../addon/communityhome/twillingham/communityhome.php:29
 msgid "OpenID"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:38
-msgid "Last users"
+#: ../../addon/communityhome/twillingham/communityhome.php:38
+msgid "Latest users"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:81
+#: ../../addon/communityhome/twillingham/communityhome.php:81
 msgid "Most active users"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:98
-msgid "Last photos"
+msgid "Latest photos"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:133
-msgid "Last likes"
+msgid "Latest likes"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:155
-#: ../../include/conversation.php:23 ../../include/conversation.php:96
+#: ../../view/theme/diabook/theme.php:557 ../../include/text.php:1303
+#: ../../include/conversation.php:45 ../../include/conversation.php:118
 msgid "event"
 msgstr ""
 
-#: ../../addon/membersince/membersince.php:17
+#: ../../addon/uhremotestorage/uhremotestorage.php:84
 #, php-format
-msgid " - Member since: %s"
+msgid ""
+"Allow to use your friendica id (%s) to connecto to external unhosted-enabled "
+"storage (like ownCloud). See <a href=\"http://www.w3.org/community/unhosted/"
+"wiki/RemoteStorage#WebFinger\">RemoteStorage WebFinger</a>"
+msgstr ""
+
+#: ../../addon/uhremotestorage/uhremotestorage.php:85
+msgid "Template URL (with {category})"
+msgstr ""
+
+#: ../../addon/uhremotestorage/uhremotestorage.php:86
+msgid "OAuth end-point"
+msgstr ""
+
+#: ../../addon/uhremotestorage/uhremotestorage.php:87
+msgid "Api"
+msgstr ""
+
+#: ../../addon/membersince/membersince.php:18
+msgid "Member since:"
 msgstr ""
 
 #: ../../addon/tictac/tictac.php:20
@@ -3687,14 +4778,110 @@ msgstr ""
 msgid "I won!"
 msgstr ""
 
-#: ../../addon/randplace/randplace.php:170
+#: ../../addon/randplace/randplace.php:169
 msgid "Randplace Settings"
 msgstr ""
 
-#: ../../addon/randplace/randplace.php:172
+#: ../../addon/randplace/randplace.php:171
 msgid "Enable Randplace Plugin"
 msgstr ""
 
+#: ../../addon/dwpost/dwpost.php:39
+msgid "Post to Dreamwidth"
+msgstr ""
+
+#: ../../addon/dwpost/dwpost.php:70
+msgid "Dreamwidth Post Settings"
+msgstr ""
+
+#: ../../addon/dwpost/dwpost.php:72
+msgid "Enable dreamwidth Post Plugin"
+msgstr ""
+
+#: ../../addon/dwpost/dwpost.php:77
+msgid "dreamwidth username"
+msgstr ""
+
+#: ../../addon/dwpost/dwpost.php:82
+msgid "dreamwidth password"
+msgstr ""
+
+#: ../../addon/dwpost/dwpost.php:87
+msgid "Post to dreamwidth by default"
+msgstr ""
+
+#: ../../addon/drpost/drpost.php:35
+msgid "Post to Drupal"
+msgstr ""
+
+#: ../../addon/drpost/drpost.php:72
+msgid "Drupal Post Settings"
+msgstr ""
+
+#: ../../addon/drpost/drpost.php:74
+msgid "Enable Drupal Post Plugin"
+msgstr ""
+
+#: ../../addon/drpost/drpost.php:79
+msgid "Drupal username"
+msgstr ""
+
+#: ../../addon/drpost/drpost.php:84
+msgid "Drupal password"
+msgstr ""
+
+#: ../../addon/drpost/drpost.php:89
+msgid "Post Type - article,page,or blog"
+msgstr ""
+
+#: ../../addon/drpost/drpost.php:94
+msgid "Drupal site URL"
+msgstr ""
+
+#: ../../addon/drpost/drpost.php:99
+msgid "Drupal site uses clean URLS"
+msgstr ""
+
+#: ../../addon/drpost/drpost.php:104
+msgid "Post to Drupal by default"
+msgstr ""
+
+#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:198
+#: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:192
+msgid "Post from Friendica"
+msgstr ""
+
+#: ../../addon/geonames/geonames.php:143
+msgid "Geonames settings updated."
+msgstr ""
+
+#: ../../addon/geonames/geonames.php:179
+msgid "Geonames Settings"
+msgstr ""
+
+#: ../../addon/geonames/geonames.php:181
+msgid "Enable Geonames Plugin"
+msgstr ""
+
+#: ../../addon/public_server/public_server.php:126
+#: ../../addon/testdrive/testdrive.php:88
+#, php-format
+msgid "Your account on %s will expire in a few days."
+msgstr ""
+
+#: ../../addon/public_server/public_server.php:127
+msgid "Your Friendica account is about to expire."
+msgstr ""
+
+#: ../../addon/public_server/public_server.php:128
+#, php-format
+msgid ""
+"Hi %1$s,\n"
+"\n"
+"Your account on %2$s will expire in less than five days. You may keep your "
+"account by logging in at least once every 30 days"
+msgstr ""
+
 #: ../../addon/js_upload/js_upload.php:43
 msgid "Upload a file"
 msgstr ""
@@ -3707,132 +4894,365 @@ msgstr ""
 msgid "Failed"
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:294
+#: ../../addon/js_upload/js_upload.php:297
 msgid "No files were uploaded."
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:300
+#: ../../addon/js_upload/js_upload.php:303
 msgid "Uploaded file is empty"
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:323
+#: ../../addon/js_upload/js_upload.php:326
 msgid "File has an invalid extension, it should be one of "
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:334
+#: ../../addon/js_upload/js_upload.php:337
 msgid "Upload was cancelled, or server error encountered"
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:25
+#: ../../addon/oembed.old/oembed.php:30
+msgid "OEmbed settings updated"
+msgstr ""
+
+#: ../../addon/oembed.old/oembed.php:43
+msgid "Use OEmbed for YouTube videos"
+msgstr ""
+
+#: ../../addon/oembed.old/oembed.php:71
+msgid "URL to embed:"
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:36
 msgid "Impressum"
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:38
-#: ../../addon/impressum/impressum.php:40
-#: ../../addon/impressum/impressum.php:70
+#: ../../addon/impressum/impressum.php:49
+#: ../../addon/impressum/impressum.php:51
+#: ../../addon/impressum/impressum.php:83
 msgid "Site Owner"
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:38
-#: ../../addon/impressum/impressum.php:74
+#: ../../addon/impressum/impressum.php:49
+#: ../../addon/impressum/impressum.php:87
 msgid "Email Address"
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:43
-#: ../../addon/impressum/impressum.php:72
+#: ../../addon/impressum/impressum.php:54
+#: ../../addon/impressum/impressum.php:85
 msgid "Postal Address"
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:49
-msgid ""
-"The impressum addon needs to be configured!<br />Please add at least the "
-"<tt>owner</tt> variable to your config file. For other variables please "
-"refer to the README file of the addon."
+#: ../../addon/impressum/impressum.php:60
+msgid ""
+"The impressum addon needs to be configured!<br />Please add at least the "
+"<tt>owner</tt> variable to your config file. For other variables please "
+"refer to the README file of the addon."
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:83
+msgid "The page operators name."
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:84
+msgid "Site Owners Profile"
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:84
+msgid "Profile address of the operator."
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:85
+msgid "How to contact the operator via snail mail. You can use BBCode here."
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:86
+msgid "Notes"
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:86
+msgid ""
+"Additional notes that are displayed beneath the contact information. You can "
+"use BBCode here."
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:87
+msgid "How to contact the operator via email. (will be displayed obfuscated)"
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:88
+msgid "Footer note"
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:88
+msgid "Text for the footer. You can use BBCode here."
+msgstr ""
+
+#: ../../addon/buglink/buglink.php:15
+msgid "Report Bug"
+msgstr ""
+
+#: ../../addon/blockem/blockem.php:51
+msgid "\"Blockem\" Settings"
+msgstr ""
+
+#: ../../addon/blockem/blockem.php:53
+msgid "Comma separated profile URLS to block"
+msgstr ""
+
+#: ../../addon/blockem/blockem.php:70
+msgid "BLOCKEM Settings saved."
+msgstr ""
+
+#: ../../addon/blockem/blockem.php:105
+#, php-format
+msgid "Blocked %s - Click to open/close"
+msgstr ""
+
+#: ../../addon/blockem/blockem.php:160
+msgid "Unblock Author"
+msgstr ""
+
+#: ../../addon/blockem/blockem.php:162
+msgid "Block Author"
+msgstr ""
+
+#: ../../addon/blockem/blockem.php:194
+msgid "blockem settings updated"
+msgstr ""
+
+#: ../../addon/qcomment/qcomment.php:51
+msgid ":-)"
+msgstr ""
+
+#: ../../addon/qcomment/qcomment.php:51
+msgid ":-("
+msgstr ""
+
+#: ../../addon/qcomment/qcomment.php:51
+msgid "lol"
+msgstr ""
+
+#: ../../addon/qcomment/qcomment.php:54
+msgid "Quick Comment Settings"
+msgstr ""
+
+#: ../../addon/qcomment/qcomment.php:56
+msgid ""
+"Quick comments are found near comment boxes, sometimes hidden. Click them to "
+"provide simple replies."
+msgstr ""
+
+#: ../../addon/qcomment/qcomment.php:57
+msgid "Enter quick comments, one per line"
+msgstr ""
+
+#: ../../addon/qcomment/qcomment.php:75
+msgid "Quick Comment settings saved."
+msgstr ""
+
+#: ../../addon/openstreetmap/openstreetmap.php:71
+msgid "Tile Server URL"
+msgstr ""
+
+#: ../../addon/openstreetmap/openstreetmap.php:71
+msgid ""
+"A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank"
+"\">public tile servers</a>"
+msgstr ""
+
+#: ../../addon/openstreetmap/openstreetmap.php:72
+msgid "Default zoom"
+msgstr ""
+
+#: ../../addon/openstreetmap/openstreetmap.php:72
+msgid "The default zoom level. (1:world, 18:highest)"
+msgstr ""
+
+#: ../../addon/mathjax/mathjax.php:37
+msgid ""
+"The MathJax addon renders mathematical formulae written using the LaTeX "
+"syntax surrounded by the usual $$ or an eqnarray block in the postings of "
+"your wall,network tab and private mail."
+msgstr ""
+
+#: ../../addon/mathjax/mathjax.php:38
+msgid "Use the MathJax renderer"
+msgstr ""
+
+#: ../../addon/mathjax/mathjax.php:74
+msgid "MathJax Base URL"
+msgstr ""
+
+#: ../../addon/mathjax/mathjax.php:74
+msgid ""
+"The URL for the javascript file that should be included to use MathJax. Can "
+"be either the MathJax CDN or another installation of MathJax."
+msgstr ""
+
+#: ../../addon/editplain/editplain.php:46
+msgid "Editplain settings updated."
+msgstr ""
+
+#: ../../addon/editplain/editplain.php:76
+msgid "Editplain Settings"
+msgstr ""
+
+#: ../../addon/editplain/editplain.php:78
+msgid "Disable richtext status editor"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:71
+msgid "generic profile image"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:72
+msgid "random geometric pattern"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:73
+msgid "monster face"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:74
+msgid "computer generated face"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:75
+msgid "retro arcade style face"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:87
+msgid "Default avatar image"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:87
+msgid "Select default avatar image if none was found at Gravatar. See README"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:88
+msgid "Rating of images"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:88
+msgid "Select the appropriate avatar rating for your site. See README"
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:102
+msgid "Gravatar settings updated."
+msgstr ""
+
+#: ../../addon/testdrive/testdrive.php:89
+msgid "Your Friendica test account is about to expire."
+msgstr ""
+
+#: ../../addon/testdrive/testdrive.php:90
+#, php-format
+msgid ""
+"Hi %1$s,\n"
+"\n"
+"Your test account on %2$s will expire in less than five days. We hope you "
+"enjoyed this test drive and use this opportunity to find a permanent "
+"Friendica website for your integrated social communications. A list of "
+"public sites is available at http://dir.friendica.com/siteinfo - and for "
+"more information on setting up your own Friendica server please see the "
+"Friendica project website at http://friendica.com."
+msgstr ""
+
+#: ../../addon/pageheader/pageheader.php:50
+msgid "\"pageheader\" Settings"
+msgstr ""
+
+#: ../../addon/pageheader/pageheader.php:68
+msgid "pageheader Settings saved."
+msgstr ""
+
+#: ../../addon/ijpost/ijpost.php:39
+msgid "Post to Insanejournal"
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:71
-msgid "Site Owners Profile"
+#: ../../addon/ijpost/ijpost.php:70
+msgid "InsaneJournal Post Settings"
 msgstr ""
 
-#: ../../addon/impressum/impressum.php:73
-msgid "Notes"
+#: ../../addon/ijpost/ijpost.php:72
+msgid "Enable InsaneJournal Post Plugin"
 msgstr ""
 
-#: ../../addon/buglink/buglink.php:15
-msgid "Report Bug"
+#: ../../addon/ijpost/ijpost.php:77
+msgid "InsaneJournal username"
 msgstr ""
 
-#: ../../addon/oembed/oembed.php:30
-msgid "OEmbed settings updated"
+#: ../../addon/ijpost/ijpost.php:82
+msgid "InsaneJournal password"
 msgstr ""
 
-#: ../../addon/oembed/oembed.php:43
-msgid "Use OEmbed for YouTube videos"
+#: ../../addon/ijpost/ijpost.php:87
+msgid "Post to InsaneJournal by default"
 msgstr ""
 
-#: ../../addon/oembed/oembed.php:71
-msgid "URL to embed:"
+#: ../../addon/viewsrc/viewsrc.php:37
+msgid "View Source"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:141
+#: ../../addon/statusnet/statusnet.php:134
 msgid "Post to StatusNet"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:183
+#: ../../addon/statusnet/statusnet.php:176
 msgid ""
 "Please contact your site administrator.<br />The provided API URL is not "
 "valid."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:211
+#: ../../addon/statusnet/statusnet.php:204
 msgid "We could not contact the StatusNet API with the Path you entered."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:238
+#: ../../addon/statusnet/statusnet.php:232
 msgid "StatusNet settings updated."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:261
+#: ../../addon/statusnet/statusnet.php:257
 msgid "StatusNet Posting Settings"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:275
+#: ../../addon/statusnet/statusnet.php:271
 msgid "Globally Available StatusNet OAuthKeys"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:276
+#: ../../addon/statusnet/statusnet.php:272
 msgid ""
 "There are preconfigured OAuth key pairs for some StatusNet servers "
 "available. If you are useing one of them, please use these credentials. If "
 "not feel free to connect to any other StatusNet instance (see below)."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:284
+#: ../../addon/statusnet/statusnet.php:280
 msgid "Provide your own OAuth Credentials"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:285
+#: ../../addon/statusnet/statusnet.php:281
 msgid ""
-"No consumer key pair for StatusNet found. Register your Friendika Account as "
+"No consumer key pair for StatusNet found. Register your Friendica Account as "
 "an desktop client on your StatusNet account, copy the consumer key pair here "
 "and enter the API base root.<br />Before you register your own OAuth key "
-"pair ask the administrator if there is already a key pair for this Friendika "
+"pair ask the administrator if there is already a key pair for this Friendica "
 "installation at your favorited StatusNet installation."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:287
+#: ../../addon/statusnet/statusnet.php:283
 msgid "OAuth Consumer Key"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:290
+#: ../../addon/statusnet/statusnet.php:286
 msgid "OAuth Consumer Secret"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:293
+#: ../../addon/statusnet/statusnet.php:289
 msgid "Base API Path (remember the trailing /)"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:314
+#: ../../addon/statusnet/statusnet.php:310
 msgid ""
 "To connect to your StatusNet account click the button below to get a "
 "security code from StatusNet which you have to copy into the input box below "
@@ -3840,117 +5260,183 @@ msgid ""
 "to StatusNet."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:315
+#: ../../addon/statusnet/statusnet.php:311
 msgid "Log in with StatusNet"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:317
+#: ../../addon/statusnet/statusnet.php:313
 msgid "Copy the security code from StatusNet here"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:323
+#: ../../addon/statusnet/statusnet.php:319
 msgid "Cancel Connection Process"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:325
+#: ../../addon/statusnet/statusnet.php:321
 msgid "Current StatusNet API is"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:326
+#: ../../addon/statusnet/statusnet.php:322
 msgid "Cancel StatusNet Connection"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:337 ../../addon/twitter/twitter.php:188
+#: ../../addon/statusnet/statusnet.php:333 ../../addon/twitter/twitter.php:189
 msgid "Currently connected to: "
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:338
+#: ../../addon/statusnet/statusnet.php:334
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated StatusNet account. You can choose to do so by default (here) or "
 "for every posting separately in the posting options when writing the entry."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:340
+#: ../../addon/statusnet/statusnet.php:336
+msgid ""
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to StatusNet will lead the visitor to a blank page "
+"informing the visitor that the access to your profile has been restricted."
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:339
 msgid "Allow posting to StatusNet"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:343
+#: ../../addon/statusnet/statusnet.php:342
 msgid "Send public postings to StatusNet by default"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:348 ../../addon/twitter/twitter.php:199
+#: ../../addon/statusnet/statusnet.php:345
+msgid "Send linked #-tags and @-names to StatusNet"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:350 ../../addon/twitter/twitter.php:206
 msgid "Clear OAuth configuration"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:478
+#: ../../addon/statusnet/statusnet.php:553
 msgid "API URL"
 msgstr ""
 
-#: ../../addon/tumblr/tumblr.php:35
+#: ../../addon/tumblr/tumblr.php:36
 msgid "Post to Tumblr"
 msgstr ""
 
-#: ../../addon/tumblr/tumblr.php:66
+#: ../../addon/tumblr/tumblr.php:67
 msgid "Tumblr Post Settings"
 msgstr ""
 
-#: ../../addon/tumblr/tumblr.php:68
+#: ../../addon/tumblr/tumblr.php:69
 msgid "Enable Tumblr Post Plugin"
 msgstr ""
 
-#: ../../addon/tumblr/tumblr.php:73
+#: ../../addon/tumblr/tumblr.php:74
 msgid "Tumblr login"
 msgstr ""
 
-#: ../../addon/tumblr/tumblr.php:78
+#: ../../addon/tumblr/tumblr.php:79
 msgid "Tumblr password"
 msgstr ""
 
-#: ../../addon/tumblr/tumblr.php:83
+#: ../../addon/tumblr/tumblr.php:84
 msgid "Post to Tumblr by default"
 msgstr ""
 
-#: ../../addon/tumblr/tumblr.php:174 ../../addon/wppost/wppost.php:171
-#: ../../addon/posterous/posterous.php:172
-msgid "Post from Friendica"
+#: ../../addon/numfriends/numfriends.php:46
+msgid "Numfriends settings updated."
+msgstr ""
+
+#: ../../addon/numfriends/numfriends.php:77
+msgid "Numfriends Settings"
+msgstr ""
+
+#: ../../addon/numfriends/numfriends.php:79
+msgid "How many contacts to display on profile sidebar"
+msgstr ""
+
+#: ../../addon/gnot/gnot.php:48
+msgid "Gnot settings updated."
+msgstr ""
+
+#: ../../addon/gnot/gnot.php:79
+msgid "Gnot Settings"
+msgstr ""
+
+#: ../../addon/gnot/gnot.php:81
+msgid ""
+"Allows threading of email comment notifications on Gmail and anonymising the "
+"subject line."
+msgstr ""
+
+#: ../../addon/gnot/gnot.php:82
+msgid "Enable this plugin/addon?"
+msgstr ""
+
+#: ../../addon/gnot/gnot.php:97
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%d"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:41
+#: ../../addon/wppost/wppost.php:42
 msgid "Post to Wordpress"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:73
+#: ../../addon/wppost/wppost.php:76
 msgid "WordPress Post Settings"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:75
+#: ../../addon/wppost/wppost.php:78
 msgid "Enable WordPress Post Plugin"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:80
+#: ../../addon/wppost/wppost.php:83
 msgid "WordPress username"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:85
+#: ../../addon/wppost/wppost.php:88
 msgid "WordPress password"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:90
+#: ../../addon/wppost/wppost.php:93
 msgid "WordPress API URL"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:95
+#: ../../addon/wppost/wppost.php:98
 msgid "Post to WordPress by default"
 msgstr ""
 
-#: ../../addon/piwik/piwik.php:70
+#: ../../addon/wppost/wppost.php:102
+msgid "Provide a backlink to the Friendica post"
+msgstr ""
+
+#: ../../addon/wppost/wppost.php:204
+msgid "Read the original post and comment stream on Friendica"
+msgstr ""
+
+#: ../../addon/showmore/showmore.php:38
+msgid "\"Show more\" Settings"
+msgstr ""
+
+#: ../../addon/showmore/showmore.php:41
+msgid "Enable Show More"
+msgstr ""
+
+#: ../../addon/showmore/showmore.php:44
+msgid "Cutting posts after how much characters"
+msgstr ""
+
+#: ../../addon/showmore/showmore.php:65
+msgid "Show More Settings saved."
+msgstr ""
+
+#: ../../addon/piwik/piwik.php:79
 msgid ""
 "This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
 "analytics tool."
 msgstr ""
 
-#: ../../addon/piwik/piwik.php:73
+#: ../../addon/piwik/piwik.php:82
 #, php-format
 msgid ""
 "If you do not want that your visits are logged this way you <a href='%s'>can "
@@ -3958,101 +5444,395 @@ msgid ""
 "(opt-out)."
 msgstr ""
 
-#: ../../addon/piwik/piwik.php:82
+#: ../../addon/piwik/piwik.php:90
 msgid "Piwik Base URL"
 msgstr ""
 
-#: ../../addon/piwik/piwik.php:83
+#: ../../addon/piwik/piwik.php:90
+msgid ""
+"Absolute path to your Piwik installation. (without protocol (http/s), with "
+"trailing slash)"
+msgstr ""
+
+#: ../../addon/piwik/piwik.php:91
 msgid "Site ID"
 msgstr ""
 
-#: ../../addon/piwik/piwik.php:84
+#: ../../addon/piwik/piwik.php:92
 msgid "Show opt-out cookie link?"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:78
+#: ../../addon/piwik/piwik.php:93
+msgid "Asynchronous tracking"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:73
 msgid "Post to Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:123
+#: ../../addon/twitter/twitter.php:122
 msgid "Twitter settings updated."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:145
+#: ../../addon/twitter/twitter.php:146
 msgid "Twitter Posting Settings"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:152
+#: ../../addon/twitter/twitter.php:153
 msgid ""
 "No consumer key pair for Twitter found. Please contact your site "
 "administrator."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:171
+#: ../../addon/twitter/twitter.php:172
 msgid ""
-"At this Friendika instance the Twitter plugin was enabled but you have not "
+"At this Friendica instance the Twitter plugin was enabled but you have not "
 "yet connected your account to your Twitter account. To do so click the "
 "button below to get a PIN from Twitter which you have to copy into the input "
 "box below and submit the form. Only your <strong>public</strong> posts will "
 "be posted to Twitter."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:172
+#: ../../addon/twitter/twitter.php:173
 msgid "Log in with Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:174
+#: ../../addon/twitter/twitter.php:175
 msgid "Copy the PIN from Twitter here"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:189
+#: ../../addon/twitter/twitter.php:190
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated Twitter account. You can choose to do so by default (here) or for "
 "every posting separately in the posting options when writing the entry."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:191
+#: ../../addon/twitter/twitter.php:192
+msgid ""
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to Twitter will lead the visitor to a blank page informing "
+"the visitor that the access to your profile has been restricted."
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:195
 msgid "Allow posting to Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:194
+#: ../../addon/twitter/twitter.php:198
 msgid "Send public postings to Twitter by default"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:301
+#: ../../addon/twitter/twitter.php:201
+msgid "Send linked #-tags and @-names to Twitter"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:383
 msgid "Consumer key"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:302
+#: ../../addon/twitter/twitter.php:384
 msgid "Consumer secret"
 msgstr ""
 
-#: ../../addon/posterous/posterous.php:35
+#: ../../addon/irc/irc.php:44
+msgid "IRC Settings"
+msgstr ""
+
+#: ../../addon/irc/irc.php:46
+msgid "Channel(s) to auto connect (comma separated)"
+msgstr ""
+
+#: ../../addon/irc/irc.php:51
+msgid "Popular Channels (comma separated)"
+msgstr ""
+
+#: ../../addon/irc/irc.php:69
+msgid "IRC settings saved."
+msgstr ""
+
+#: ../../addon/irc/irc.php:74
+msgid "IRC Chatroom"
+msgstr ""
+
+#: ../../addon/irc/irc.php:96
+msgid "Popular Channels"
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:42
+msgid "Post to blogger"
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:74
+msgid "Blogger Post Settings"
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:76
+msgid "Enable Blogger Post Plugin"
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:81
+msgid "Blogger username"
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:86
+msgid "Blogger password"
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:91
+msgid "Blogger API URL"
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:96
+msgid "Post to Blogger by default"
+msgstr ""
+
+#: ../../addon/posterous/posterous.php:37
 msgid "Post to Posterous"
 msgstr ""
 
-#: ../../addon/posterous/posterous.php:66
+#: ../../addon/posterous/posterous.php:70
 msgid "Posterous Post Settings"
 msgstr ""
 
-#: ../../addon/posterous/posterous.php:68
+#: ../../addon/posterous/posterous.php:72
 msgid "Enable Posterous Post Plugin"
 msgstr ""
 
-#: ../../addon/posterous/posterous.php:73
+#: ../../addon/posterous/posterous.php:77
 msgid "Posterous login"
 msgstr ""
 
-#: ../../addon/posterous/posterous.php:78
+#: ../../addon/posterous/posterous.php:82
 msgid "Posterous password"
 msgstr ""
 
-#: ../../addon/posterous/posterous.php:83
+#: ../../addon/posterous/posterous.php:87
+msgid "Posterous site ID"
+msgstr ""
+
+#: ../../addon/posterous/posterous.php:92
+msgid "Posterous API token"
+msgstr ""
+
+#: ../../addon/posterous/posterous.php:97
 msgid "Post to Posterous by default"
 msgstr ""
 
-#: ../../include/profile_advanced.php:17 ../../boot.php:944
+#: ../../view/theme/cleanzero/config.php:82
+#: ../../view/theme/diabook/config.php:192
+#: ../../view/theme/quattro/config.php:54 ../../view/theme/dispy/config.php:72
+msgid "Theme settings"
+msgstr ""
+
+#: ../../view/theme/cleanzero/config.php:83
+msgid "Set resize level for images in posts and comments (width and height)"
+msgstr ""
+
+#: ../../view/theme/cleanzero/config.php:84
+#: ../../view/theme/diabook/config.php:193
+#: ../../view/theme/dispy/config.php:73
+msgid "Set font-size for posts and comments"
+msgstr ""
+
+#: ../../view/theme/cleanzero/config.php:85
+msgid "Set theme width"
+msgstr ""
+
+#: ../../view/theme/cleanzero/config.php:86
+#: ../../view/theme/quattro/config.php:56
+msgid "Color scheme"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:122 ../../include/nav.php:49
+#: ../../include/nav.php:115
+msgid "Your posts and conversations"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:123 ../../include/nav.php:50
+msgid "Your profile page"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:124
+msgid "Your contacts"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:125 ../../include/nav.php:51
+msgid "Your photos"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:126 ../../include/nav.php:52
+msgid "Your events"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:127 ../../include/nav.php:53
+msgid "Personal notes"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:127 ../../include/nav.php:53
+msgid "Your personal photos"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:129
+#: ../../view/theme/diabook/theme.php:638
+#: ../../view/theme/diabook/theme.php:742
+#: ../../view/theme/diabook/config.php:201
+msgid "Community Pages"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:485
+#: ../../view/theme/diabook/theme.php:744
+#: ../../view/theme/diabook/config.php:203
+msgid "Community Profiles"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:506
+#: ../../view/theme/diabook/theme.php:749
+#: ../../view/theme/diabook/config.php:208
+msgid "Last users"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:535
+#: ../../view/theme/diabook/theme.php:751
+#: ../../view/theme/diabook/config.php:210
+msgid "Last likes"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:580
+#: ../../view/theme/diabook/theme.php:750
+#: ../../view/theme/diabook/config.php:209
+msgid "Last photos"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:617
+#: ../../view/theme/diabook/theme.php:747
+#: ../../view/theme/diabook/config.php:206
+msgid "Find Friends"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:618
+msgid "Local Directory"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:620 ../../include/contact_widgets.php:35
+msgid "Similar Interests"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:622 ../../include/contact_widgets.php:37
+msgid "Invite Friends"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:673
+#: ../../view/theme/diabook/theme.php:743
+#: ../../view/theme/diabook/config.php:202
+msgid "Earth Layers"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:678
+msgid "Set zoomfactor for Earth Layers"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:679
+#: ../../view/theme/diabook/config.php:199
+msgid "Set longitude (X) for Earth Layers"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:680
+#: ../../view/theme/diabook/config.php:200
+msgid "Set latitude (Y) for Earth Layers"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:693
+#: ../../view/theme/diabook/theme.php:745
+#: ../../view/theme/diabook/config.php:204
+msgid "Help or @NewHere ?"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:700
+#: ../../view/theme/diabook/theme.php:746
+#: ../../view/theme/diabook/config.php:205
+msgid "Connect Services"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:707
+#: ../../view/theme/diabook/theme.php:748
+msgid "Last Tweets"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:710
+#: ../../view/theme/diabook/config.php:197
+msgid "Set twitter search term"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:730
+#: ../../view/theme/diabook/theme.php:731
+#: ../../view/theme/diabook/theme.php:732
+#: ../../view/theme/diabook/theme.php:733
+#: ../../view/theme/diabook/theme.php:734
+#: ../../view/theme/diabook/theme.php:735
+#: ../../view/theme/diabook/theme.php:736
+#: ../../view/theme/diabook/theme.php:737
+#: ../../view/theme/diabook/theme.php:738
+#: ../../view/theme/diabook/theme.php:739 ../../include/acl_selectors.php:288
+msgid "don't show"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:730
+#: ../../view/theme/diabook/theme.php:731
+#: ../../view/theme/diabook/theme.php:732
+#: ../../view/theme/diabook/theme.php:733
+#: ../../view/theme/diabook/theme.php:734
+#: ../../view/theme/diabook/theme.php:735
+#: ../../view/theme/diabook/theme.php:736
+#: ../../view/theme/diabook/theme.php:737
+#: ../../view/theme/diabook/theme.php:738
+#: ../../view/theme/diabook/theme.php:739 ../../include/acl_selectors.php:287
+msgid "show"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:740
+msgid "Show/hide boxes at right-hand column:"
+msgstr ""
+
+#: ../../view/theme/diabook/config.php:194
+#: ../../view/theme/dispy/config.php:74
+msgid "Set line-height for posts and comments"
+msgstr ""
+
+#: ../../view/theme/diabook/config.php:195
+msgid "Set resolution for middle column"
+msgstr ""
+
+#: ../../view/theme/diabook/config.php:196
+msgid "Set color scheme"
+msgstr ""
+
+#: ../../view/theme/diabook/config.php:198
+msgid "Set zoomfactor for Earth Layer"
+msgstr ""
+
+#: ../../view/theme/diabook/config.php:207
+msgid "Last tweets"
+msgstr ""
+
+#: ../../view/theme/quattro/config.php:55
+msgid "Alignment"
+msgstr ""
+
+#: ../../view/theme/quattro/config.php:55
+msgid "Left"
+msgstr ""
+
+#: ../../view/theme/quattro/config.php:55
+msgid "Center"
+msgstr ""
+
+#: ../../view/theme/dispy/config.php:75
+msgid "Set colour scheme"
+msgstr ""
+
+#: ../../include/profile_advanced.php:17 ../../boot.php:1104
 msgid "Gender:"
 msgstr ""
 
@@ -4064,8 +5844,8 @@ msgstr ""
 msgid "j F"
 msgstr ""
 
-#: ../../include/profile_advanced.php:30 ../../include/datetime.php:421
-#: ../../include/items.php:1280
+#: ../../include/profile_advanced.php:30 ../../include/datetime.php:448
+#: ../../include/items.php:1419
 msgid "Birthday:"
 msgstr ""
 
@@ -4073,55 +5853,59 @@ msgstr ""
 msgid "Age:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:37 ../../boot.php:947
+#: ../../include/profile_advanced.php:37 ../../boot.php:1107
 msgid "Status:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:45 ../../boot.php:949
+#: ../../include/profile_advanced.php:45 ../../boot.php:1109
 msgid "Homepage:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:49
-msgid "Religion:"
+#: ../../include/profile_advanced.php:47
+msgid "Tags:"
 msgstr ""
 
 #: ../../include/profile_advanced.php:51
-msgid "About:"
+msgid "Religion:"
 msgstr ""
 
 #: ../../include/profile_advanced.php:53
-msgid "Hobbies/Interests:"
+msgid "About:"
 msgstr ""
 
 #: ../../include/profile_advanced.php:55
-msgid "Contact information and Social Networks:"
+msgid "Hobbies/Interests:"
 msgstr ""
 
 #: ../../include/profile_advanced.php:57
-msgid "Musical interests:"
+msgid "Contact information and Social Networks:"
 msgstr ""
 
 #: ../../include/profile_advanced.php:59
-msgid "Books, literature:"
+msgid "Musical interests:"
 msgstr ""
 
 #: ../../include/profile_advanced.php:61
-msgid "Television:"
+msgid "Books, literature:"
 msgstr ""
 
 #: ../../include/profile_advanced.php:63
-msgid "Film/dance/culture/entertainment:"
+msgid "Television:"
 msgstr ""
 
 #: ../../include/profile_advanced.php:65
-msgid "Love/Romance:"
+msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
 #: ../../include/profile_advanced.php:67
-msgid "Work/employment:"
+msgid "Love/Romance:"
 msgstr ""
 
 #: ../../include/profile_advanced.php:69
+msgid "Work/employment:"
+msgstr ""
+
+#: ../../include/profile_advanced.php:71
 msgid "School/education:"
 msgstr ""
 
@@ -4173,7 +5957,7 @@ msgstr ""
 msgid "Monthly"
 msgstr ""
 
-#: ../../include/contact_selectors.php:78
+#: ../../include/contact_selectors.php:77
 msgid "OStatus"
 msgstr ""
 
@@ -4181,10 +5965,22 @@ msgstr ""
 msgid "RSS/Atom"
 msgstr ""
 
-#: ../../include/contact_selectors.php:78
+#: ../../include/contact_selectors.php:82
 msgid "Zot!"
 msgstr ""
 
+#: ../../include/contact_selectors.php:83
+msgid "LinkedIn"
+msgstr ""
+
+#: ../../include/contact_selectors.php:84
+msgid "XMPP/IM"
+msgstr ""
+
+#: ../../include/contact_selectors.php:85
+msgid "MySpace"
+msgstr ""
+
 #: ../../include/profile_selectors.php:6
 msgid "Male"
 msgstr ""
@@ -4241,311 +6037,372 @@ 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:37
+msgid "Infatuated"
+msgstr ""
+
+#: ../../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: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:37
 msgid "Happy"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Not Looking"
+#: ../../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:37
 msgid "Widowed"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37
 msgid "Uncertain"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Complicated"
+#: ../../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 ""
 
-#: ../../include/event.php:17 ../../include/bb2diaspora.php:233
+#: ../../include/event.php:17 ../../include/bb2diaspora.php:244
 msgid "Starts:"
 msgstr ""
 
-#: ../../include/event.php:27 ../../include/bb2diaspora.php:241
+#: ../../include/event.php:27 ../../include/bb2diaspora.php:252
 msgid "Finishes:"
 msgstr ""
 
-#: ../../include/delivery.php:415 ../../include/notifier.php:628
+#: ../../include/delivery.php:455 ../../include/notifier.php:659
 msgid "(no subject)"
 msgstr ""
 
-#: ../../include/text.php:232
+#: ../../include/delivery.php:462 ../../include/enotify.php:23
+#: ../../include/notifier.php:666
+msgid "noreply"
+msgstr ""
+
+#: ../../include/text.php:243
 msgid "prev"
 msgstr ""
 
-#: ../../include/text.php:234
+#: ../../include/text.php:245
 msgid "first"
 msgstr ""
 
-#: ../../include/text.php:263
+#: ../../include/text.php:274
 msgid "last"
 msgstr ""
 
-#: ../../include/text.php:266
+#: ../../include/text.php:277
 msgid "next"
 msgstr ""
 
-#: ../../include/text.php:546
+#: ../../include/text.php:568
 msgid "No contacts"
 msgstr ""
 
-#: ../../include/text.php:555
+#: ../../include/text.php:577
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/text.php:626 ../../include/nav.php:87
-msgid "Search"
-msgstr ""
-
-#: ../../include/text.php:709
+#: ../../include/text.php:831
 msgid "Monday"
 msgstr ""
 
-#: ../../include/text.php:709
+#: ../../include/text.php:831
 msgid "Tuesday"
 msgstr ""
 
-#: ../../include/text.php:709
+#: ../../include/text.php:831
 msgid "Wednesday"
 msgstr ""
 
-#: ../../include/text.php:709
+#: ../../include/text.php:831
 msgid "Thursday"
 msgstr ""
 
-#: ../../include/text.php:709
+#: ../../include/text.php:831
 msgid "Friday"
 msgstr ""
 
-#: ../../include/text.php:709
+#: ../../include/text.php:831
 msgid "Saturday"
 msgstr ""
 
-#: ../../include/text.php:709
+#: ../../include/text.php:831
 msgid "Sunday"
 msgstr ""
 
-#: ../../include/text.php:713
+#: ../../include/text.php:835
 msgid "January"
 msgstr ""
 
-#: ../../include/text.php:713
+#: ../../include/text.php:835
 msgid "February"
 msgstr ""
 
-#: ../../include/text.php:713
+#: ../../include/text.php:835
 msgid "March"
 msgstr ""
 
-#: ../../include/text.php:713
+#: ../../include/text.php:835
 msgid "April"
 msgstr ""
 
-#: ../../include/text.php:713
+#: ../../include/text.php:835
 msgid "May"
 msgstr ""
 
-#: ../../include/text.php:713
+#: ../../include/text.php:835
 msgid "June"
 msgstr ""
 
-#: ../../include/text.php:713
+#: ../../include/text.php:835
 msgid "July"
 msgstr ""
 
-#: ../../include/text.php:713
+#: ../../include/text.php:835
 msgid "August"
 msgstr ""
 
-#: ../../include/text.php:713
+#: ../../include/text.php:835
 msgid "September"
 msgstr ""
 
-#: ../../include/text.php:713
+#: ../../include/text.php:835
 msgid "October"
 msgstr ""
 
-#: ../../include/text.php:713
+#: ../../include/text.php:835
 msgid "November"
 msgstr ""
 
-#: ../../include/text.php:713
+#: ../../include/text.php:835
 msgid "December"
 msgstr ""
 
-#: ../../include/text.php:783
+#: ../../include/text.php:919
 msgid "bytes"
 msgstr ""
 
-#: ../../include/text.php:875
-msgid "Select an alternate language"
+#: ../../include/text.php:934 ../../include/text.php:949
+msgid "remove"
+msgstr ""
+
+#: ../../include/text.php:934 ../../include/text.php:949
+msgid "[remove]"
+msgstr ""
+
+#: ../../include/text.php:937
+msgid "Categories:"
+msgstr ""
+
+#: ../../include/text.php:952
+msgid "Filed under:"
 msgstr ""
 
-#: ../../include/text.php:887
+#: ../../include/text.php:968 ../../include/text.php:980
+msgid "Click to open/close"
+msgstr ""
+
+#: ../../include/text.php:1085
 msgid "default"
 msgstr ""
 
-#: ../../include/diaspora.php:546
+#: ../../include/text.php:1097
+msgid "Select an alternate language"
+msgstr ""
+
+#: ../../include/text.php:1307
+msgid "activity"
+msgstr ""
+
+#: ../../include/text.php:1309
+msgid "comment"
+msgstr ""
+
+#: ../../include/text.php:1310
+msgid "post"
+msgstr ""
+
+#: ../../include/text.php:1465
+msgid "Item filed"
+msgstr ""
+
+#: ../../include/diaspora.php:590
 msgid "Sharing notification from Diaspora network"
 msgstr ""
 
-#: ../../include/diaspora.php:1529
+#: ../../include/diaspora.php:1977
 msgid "Attachments:"
 msgstr ""
 
-#: ../../include/diaspora.php:1712
+#: ../../include/diaspora.php:2160
 #, php-format
 msgid "[Relayed] Comment authored by %s from network %s"
 msgstr ""
 
-#: ../../include/oembed.php:128
+#: ../../include/network.php:824
+msgid "view full size"
+msgstr ""
+
+#: ../../include/oembed.php:132
 msgid "Embedded content"
 msgstr ""
 
-#: ../../include/oembed.php:137
+#: ../../include/oembed.php:141
 msgid "Embedding disabled"
 msgstr ""
 
@@ -4556,143 +6413,143 @@ msgid ""
 "not what you intended, please create another group with a different name."
 msgstr ""
 
-#: ../../include/group.php:168
+#: ../../include/group.php:176
+msgid "Default privacy group for new contacts"
+msgstr ""
+
+#: ../../include/group.php:195
 msgid "Everybody"
 msgstr ""
 
-#: ../../include/group.php:190
+#: ../../include/group.php:218
 msgid "edit"
 msgstr ""
 
-#: ../../include/group.php:211
+#: ../../include/group.php:239
 msgid "Groups"
 msgstr ""
 
-#: ../../include/group.php:212
-msgid "Create a new group"
-msgstr ""
-
-#: ../../include/nav.php:44 ../../boot.php:681
-msgid "Logout"
-msgstr ""
-
-#: ../../include/nav.php:44
-msgid "End this session"
-msgstr ""
-
-#: ../../include/nav.php:47 ../../boot.php:1284
-msgid "Status"
-msgstr ""
-
-#: ../../include/nav.php:47 ../../include/nav.php:111
-msgid "Your posts and conversations"
-msgstr ""
-
-#: ../../include/nav.php:48
-msgid "Your profile page"
+#: ../../include/group.php:240
+msgid "Edit group"
 msgstr ""
 
-#: ../../include/nav.php:49 ../../boot.php:1294
-msgid "Photos"
+#: ../../include/group.php:241
+msgid "Create a new group"
 msgstr ""
 
-#: ../../include/nav.php:49
-msgid "Your photos"
+#: ../../include/group.php:242
+msgid "Contacts not in any group"
 msgstr ""
 
-#: ../../include/nav.php:50
-msgid "Your events"
+#: ../../include/nav.php:46 ../../boot.php:814
+msgid "Logout"
 msgstr ""
 
-#: ../../include/nav.php:51
-msgid "Personal notes"
+#: ../../include/nav.php:46
+msgid "End this session"
 msgstr ""
 
-#: ../../include/nav.php:51
-msgid "Your personal photos"
+#: ../../include/nav.php:49 ../../boot.php:1482
+msgid "Status"
 msgstr ""
 
-#: ../../include/nav.php:62
+#: ../../include/nav.php:64
 msgid "Sign in"
 msgstr ""
 
-#: ../../include/nav.php:73
+#: ../../include/nav.php:77
 msgid "Home Page"
 msgstr ""
 
-#: ../../include/nav.php:77
+#: ../../include/nav.php:81
 msgid "Create an account"
 msgstr ""
 
-#: ../../include/nav.php:82
+#: ../../include/nav.php:86
 msgid "Help and documentation"
 msgstr ""
 
-#: ../../include/nav.php:85
+#: ../../include/nav.php:89
 msgid "Apps"
 msgstr ""
 
-#: ../../include/nav.php:85
+#: ../../include/nav.php:89
 msgid "Addon applications, utilities, games"
 msgstr ""
 
-#: ../../include/nav.php:87
+#: ../../include/nav.php:91
 msgid "Search site content"
 msgstr ""
 
-#: ../../include/nav.php:97
+#: ../../include/nav.php:101
 msgid "Conversations on this site"
 msgstr ""
 
-#: ../../include/nav.php:99
+#: ../../include/nav.php:103
 msgid "Directory"
 msgstr ""
 
-#: ../../include/nav.php:99
+#: ../../include/nav.php:103
 msgid "People directory"
 msgstr ""
 
-#: ../../include/nav.php:109
+#: ../../include/nav.php:113
 msgid "Conversations from your friends"
 msgstr ""
 
-#: ../../include/nav.php:117
+#: ../../include/nav.php:121
 msgid "Friend Requests"
 msgstr ""
 
-#: ../../include/nav.php:122
+#: ../../include/nav.php:123
+msgid "See all notifications"
+msgstr ""
+
+#: ../../include/nav.php:124
+msgid "Mark all system notifications seen"
+msgstr ""
+
+#: ../../include/nav.php:128
 msgid "Private mail"
 msgstr ""
 
-#: ../../include/nav.php:125
+#: ../../include/nav.php:129
+msgid "Inbox"
+msgstr ""
+
+#: ../../include/nav.php:130
+msgid "Outbox"
+msgstr ""
+
+#: ../../include/nav.php:134
 msgid "Manage"
 msgstr ""
 
-#: ../../include/nav.php:125
+#: ../../include/nav.php:134
 msgid "Manage other pages"
 msgstr ""
 
-#: ../../include/nav.php:129 ../../boot.php:902
+#: ../../include/nav.php:138 ../../boot.php:1062
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/nav.php:129 ../../boot.php:902
+#: ../../include/nav.php:138 ../../boot.php:1062
 msgid "Manage/edit profiles"
 msgstr ""
 
-#: ../../include/nav.php:130
+#: ../../include/nav.php:139
 msgid "Manage/edit friends and contacts"
 msgstr ""
 
-#: ../../include/nav.php:137
+#: ../../include/nav.php:146
 msgid "Admin"
 msgstr ""
 
-#: ../../include/nav.php:137
+#: ../../include/nav.php:146
 msgid "Site setup and configuration"
 msgstr ""
 
-#: ../../include/nav.php:160
+#: ../../include/nav.php:169
 msgid "Nothing new here"
 msgstr ""
 
@@ -4708,405 +6565,731 @@ msgstr ""
 msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr ""
 
-#: ../../include/contact_widgets.php:9 ../../boot.php:892
-msgid "Connect"
-msgstr ""
-
-#: ../../include/contact_widgets.php:18
-msgid "Invite Friends"
-msgstr ""
-
-#: ../../include/contact_widgets.php:24
+#: ../../include/contact_widgets.php:23
 #, php-format
 msgid "%d invitation available"
 msgid_plural "%d invitations available"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/contact_widgets.php:30
+#: ../../include/contact_widgets.php:29
 msgid "Find People"
 msgstr ""
 
-#: ../../include/contact_widgets.php:31
+#: ../../include/contact_widgets.php:30
 msgid "Enter name or interest"
 msgstr ""
 
-#: ../../include/contact_widgets.php:32
+#: ../../include/contact_widgets.php:31
 msgid "Connect/Follow"
 msgstr ""
 
-#: ../../include/contact_widgets.php:33
+#: ../../include/contact_widgets.php:32
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr ""
 
 #: ../../include/contact_widgets.php:36
-msgid "Similar Interests"
+msgid "Random Profile"
+msgstr ""
+
+#: ../../include/contact_widgets.php:68
+msgid "Networks"
+msgstr ""
+
+#: ../../include/contact_widgets.php:71
+msgid "All Networks"
+msgstr ""
+
+#: ../../include/contact_widgets.php:98
+msgid "Saved Folders"
+msgstr ""
+
+#: ../../include/contact_widgets.php:101 ../../include/contact_widgets.php:129
+msgid "Everything"
+msgstr ""
+
+#: ../../include/contact_widgets.php:126
+msgid "Categories"
 msgstr ""
 
-#: ../../include/auth.php:27
+#: ../../include/auth.php:29
 msgid "Logged out."
 msgstr ""
 
-#: ../../include/datetime.php:44 ../../include/datetime.php:46
+#: ../../include/auth.php:106
+msgid ""
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
+msgstr ""
+
+#: ../../include/auth.php:106
+msgid "The error message was:"
+msgstr ""
+
+#: ../../include/datetime.php:43 ../../include/datetime.php:45
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../../include/datetime.php:105 ../../include/datetime.php:237
+#: ../../include/datetime.php:131 ../../include/datetime.php:263
 msgid "year"
 msgstr ""
 
-#: ../../include/datetime.php:110 ../../include/datetime.php:238
+#: ../../include/datetime.php:136 ../../include/datetime.php:264
 msgid "month"
 msgstr ""
 
-#: ../../include/datetime.php:115 ../../include/datetime.php:240
+#: ../../include/datetime.php:141 ../../include/datetime.php:266
 msgid "day"
 msgstr ""
 
-#: ../../include/datetime.php:228
+#: ../../include/datetime.php:254
 msgid "never"
 msgstr ""
 
-#: ../../include/datetime.php:234
+#: ../../include/datetime.php:260
 msgid "less than a second ago"
 msgstr ""
 
-#: ../../include/datetime.php:237
+#: ../../include/datetime.php:263
 msgid "years"
 msgstr ""
 
-#: ../../include/datetime.php:238
+#: ../../include/datetime.php:264
 msgid "months"
 msgstr ""
 
-#: ../../include/datetime.php:239
+#: ../../include/datetime.php:265
 msgid "week"
 msgstr ""
 
-#: ../../include/datetime.php:239
+#: ../../include/datetime.php:265
 msgid "weeks"
 msgstr ""
 
-#: ../../include/datetime.php:240
+#: ../../include/datetime.php:266
 msgid "days"
 msgstr ""
 
-#: ../../include/datetime.php:241
+#: ../../include/datetime.php:267
 msgid "hour"
 msgstr ""
 
-#: ../../include/datetime.php:241
+#: ../../include/datetime.php:267
 msgid "hours"
 msgstr ""
 
-#: ../../include/datetime.php:242
+#: ../../include/datetime.php:268
 msgid "minute"
 msgstr ""
 
-#: ../../include/datetime.php:242
+#: ../../include/datetime.php:268
 msgid "minutes"
 msgstr ""
 
-#: ../../include/datetime.php:243
+#: ../../include/datetime.php:269
 msgid "second"
 msgstr ""
 
-#: ../../include/datetime.php:243
+#: ../../include/datetime.php:269
 msgid "seconds"
 msgstr ""
 
-#: ../../include/datetime.php:250
-msgid " ago"
+#: ../../include/datetime.php:277
+#, php-format
+msgid "%1$d %2$s ago"
 msgstr ""
 
-#: ../../include/poller.php:457
+#: ../../include/onepoll.php:406
 msgid "From: "
 msgstr ""
 
-#: ../../include/bbcode.php:147
+#: ../../include/bbcode.php:203 ../../include/bbcode.php:223
+msgid "$1 wrote:"
+msgstr ""
+
+#: ../../include/bbcode.php:238 ../../include/bbcode.php:307
 msgid "Image/photo"
 msgstr ""
 
-#: ../../include/dba.php:31
+#: ../../include/dba.php:41
 #, php-format
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: ../../include/message.php:13
+#: ../../include/message.php:15 ../../include/message.php:171
 msgid "[no subject]"
 msgstr ""
 
-#: ../../include/acl_selectors.php:279
+#: ../../include/acl_selectors.php:286
 msgid "Visible to everybody"
 msgstr ""
 
-#: ../../include/acl_selectors.php:280
-msgid "show"
+#: ../../include/enotify.php:14
+msgid "Friendica Notification"
 msgstr ""
 
-#: ../../include/acl_selectors.php:281
-msgid "don't show"
+#: ../../include/enotify.php:17
+msgid "Thank You,"
+msgstr ""
+
+#: ../../include/enotify.php:19
+#, php-format
+msgid "%s Administrator"
+msgstr ""
+
+#: ../../include/enotify.php:35
+#, php-format
+msgid "%s <!item_type!>"
+msgstr ""
+
+#: ../../include/enotify.php:39
+#, php-format
+msgid "[Friendica:Notify] New mail received at %s"
+msgstr ""
+
+#: ../../include/enotify.php:41
+#, php-format
+msgid "%s sent you a new private message at %s."
+msgstr ""
+
+#: ../../include/enotify.php:42
+#, php-format
+msgid "%s sent you %s."
+msgstr ""
+
+#: ../../include/enotify.php:42
+msgid "a private message"
+msgstr ""
+
+#: ../../include/enotify.php:43
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
+msgstr ""
+
+#: ../../include/enotify.php:73
+#, php-format
+msgid "%s's"
+msgstr ""
+
+#: ../../include/enotify.php:77
+msgid "your"
+msgstr ""
+
+#: ../../include/enotify.php:84
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%d by %s"
+msgstr ""
+
+#: ../../include/enotify.php:85
+#, php-format
+msgid "%s commented on an item/conversation you have been following."
+msgstr ""
+
+#: ../../include/enotify.php:86
+#, php-format
+msgid "%s commented on %s."
+msgstr ""
+
+#: ../../include/enotify.php:88 ../../include/enotify.php:101
+#: ../../include/enotify.php:112 ../../include/enotify.php:123
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
+msgstr ""
+
+#: ../../include/enotify.php:95
+#, php-format
+msgid "[Friendica:Notify] %s posted to your profile wall"
+msgstr ""
+
+#: ../../include/enotify.php:97
+#, php-format
+msgid "%s posted to your profile wall at %s"
+msgstr ""
+
+#: ../../include/enotify.php:99
+#, php-format
+msgid "%s posted to %s"
+msgstr ""
+
+#: ../../include/enotify.php:99
+msgid "your profile wall."
+msgstr ""
+
+#: ../../include/enotify.php:108
+#, php-format
+msgid "[Friendica:Notify] %s tagged you"
+msgstr ""
+
+#: ../../include/enotify.php:109
+#, php-format
+msgid "%s tagged you at %s"
+msgstr ""
+
+#: ../../include/enotify.php:110
+#, php-format
+msgid "%s %s."
+msgstr ""
+
+#: ../../include/enotify.php:110
+msgid "tagged you"
+msgstr ""
+
+#: ../../include/enotify.php:119
+#, php-format
+msgid "[Friendica:Notify] %s tagged your post"
+msgstr ""
+
+#: ../../include/enotify.php:120
+#, php-format
+msgid "%s tagged your post at %s"
+msgstr ""
+
+#: ../../include/enotify.php:121
+#, php-format
+msgid "%s tagged %s"
+msgstr ""
+
+#: ../../include/enotify.php:121
+msgid "your post"
+msgstr ""
+
+#: ../../include/enotify.php:130
+msgid "[Friendica:Notify] Introduction received"
+msgstr ""
+
+#: ../../include/enotify.php:131
+#, php-format
+msgid "You've received an introduction from '%s' at %s"
+msgstr ""
+
+#: ../../include/enotify.php:132
+#, php-format
+msgid "You've received %s from %s."
+msgstr ""
+
+#: ../../include/enotify.php:132
+msgid "an introduction"
+msgstr ""
+
+#: ../../include/enotify.php:133 ../../include/enotify.php:150
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr ""
+
+#: ../../include/enotify.php:135
+#, php-format
+msgid "Please visit %s to approve or reject the introduction."
+msgstr ""
+
+#: ../../include/enotify.php:142
+msgid "[Friendica:Notify] Friend suggestion received"
+msgstr ""
+
+#: ../../include/enotify.php:143
+#, php-format
+msgid "You've received a friend suggestion from '%s' at %s"
+msgstr ""
+
+#: ../../include/enotify.php:144
+#, php-format
+msgid "You've received %s for %s from %s."
+msgstr ""
+
+#: ../../include/enotify.php:145
+msgid "a friend suggestion"
+msgstr ""
+
+#: ../../include/enotify.php:148
+msgid "Name:"
+msgstr ""
+
+#: ../../include/enotify.php:149
+msgid "Photo:"
 msgstr ""
 
-#: ../../include/items.php:1895
-msgid "New mail received at "
+#: ../../include/enotify.php:152
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: ../../include/items.php:2532
+#: ../../include/items.php:2736
 msgid "A new person is sharing with you at "
 msgstr ""
 
-#: ../../include/items.php:2532
+#: ../../include/items.php:2736
 msgid "You have a new follower at "
 msgstr ""
 
-#: ../../include/bb2diaspora.php:51
-msgid "view full size"
+#: ../../include/bb2diaspora.php:102 ../../include/bb2diaspora.php:112
+#: ../../include/bb2diaspora.php:113
+msgid "image/photo"
 msgstr ""
 
 #: ../../include/bb2diaspora.php:102
-msgid "image/photo"
+msgid "link"
+msgstr ""
+
+#: ../../include/security.php:21
+msgid "Welcome "
+msgstr ""
+
+#: ../../include/security.php:22
+msgid "Please upload a profile photo."
+msgstr ""
+
+#: ../../include/security.php:25
+msgid "Welcome back "
+msgstr ""
+
+#: ../../include/security.php:329
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
 msgstr ""
 
-#: ../../include/Contact.php:125 ../../include/conversation.php:713
-msgid "View status"
+#: ../../include/Contact.php:111
+msgid "stopped following"
+msgstr ""
+
+#: ../../include/Contact.php:203 ../../include/conversation.php:820
+msgid "View Status"
+msgstr ""
+
+#: ../../include/Contact.php:204 ../../include/conversation.php:821
+msgid "View Profile"
 msgstr ""
 
-#: ../../include/Contact.php:126 ../../include/conversation.php:714
-msgid "View profile"
+#: ../../include/Contact.php:205 ../../include/conversation.php:822
+msgid "View Photos"
 msgstr ""
 
-#: ../../include/Contact.php:127 ../../include/conversation.php:715
-msgid "View photos"
+#: ../../include/Contact.php:206 ../../include/Contact.php:219
+#: ../../include/conversation.php:823
+msgid "Network Posts"
 msgstr ""
 
-#: ../../include/Contact.php:128 ../../include/Contact.php:141
-#: ../../include/conversation.php:716
-msgid "View recent"
+#: ../../include/Contact.php:207 ../../include/Contact.php:219
+#: ../../include/conversation.php:824
+msgid "Edit Contact"
 msgstr ""
 
-#: ../../include/Contact.php:130 ../../include/Contact.php:141
-#: ../../include/conversation.php:718
+#: ../../include/Contact.php:208 ../../include/Contact.php:219
+#: ../../include/conversation.php:825
 msgid "Send PM"
 msgstr ""
 
-#: ../../include/conversation.php:247 ../../include/conversation.php:498
+#: ../../include/conversation.php:163
+msgid "post/item"
+msgstr ""
+
+#: ../../include/conversation.php:164
+#, php-format
+msgid "%1$s marked %2$s's %3$s as favorite"
+msgstr ""
+
+#: ../../include/conversation.php:320 ../../include/conversation.php:586
 msgid "Select"
 msgstr ""
 
-#: ../../include/conversation.php:262 ../../include/conversation.php:588
-#: ../../include/conversation.php:589
+#: ../../include/conversation.php:337 ../../include/conversation.php:679
+#: ../../include/conversation.php:680
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 
-#: ../../include/conversation.php:271 ../../include/conversation.php:600
+#: ../../include/conversation.php:347 ../../include/conversation.php:691
 #, php-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../../include/conversation.php:287
+#: ../../include/conversation.php:362
 msgid "View in context"
 msgstr ""
 
-#: ../../include/conversation.php:398
+#: ../../include/conversation.php:468
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:401 ../../boot.php:421
-msgid "show more"
-msgstr ""
-
-#: ../../include/conversation.php:461
+#: ../../include/conversation.php:532
 msgid "like"
 msgstr ""
 
-#: ../../include/conversation.php:462
+#: ../../include/conversation.php:533
 msgid "dislike"
 msgstr ""
 
-#: ../../include/conversation.php:464
+#: ../../include/conversation.php:535
 msgid "Share this"
 msgstr ""
 
-#: ../../include/conversation.php:464
+#: ../../include/conversation.php:535
 msgid "share"
 msgstr ""
 
-#: ../../include/conversation.php:508
+#: ../../include/conversation.php:559
+msgid "Bold"
+msgstr ""
+
+#: ../../include/conversation.php:560
+msgid "Italic"
+msgstr ""
+
+#: ../../include/conversation.php:561
+msgid "Underline"
+msgstr ""
+
+#: ../../include/conversation.php:562
+msgid "Quote"
+msgstr ""
+
+#: ../../include/conversation.php:563
+msgid "Code"
+msgstr ""
+
+#: ../../include/conversation.php:564
+msgid "Image"
+msgstr ""
+
+#: ../../include/conversation.php:565
+msgid "Link"
+msgstr ""
+
+#: ../../include/conversation.php:566
+msgid "Video"
+msgstr ""
+
+#: ../../include/conversation.php:599
 msgid "add star"
 msgstr ""
 
-#: ../../include/conversation.php:509
+#: ../../include/conversation.php:600
 msgid "remove star"
 msgstr ""
 
-#: ../../include/conversation.php:510
+#: ../../include/conversation.php:601
 msgid "toggle star status"
 msgstr ""
 
-#: ../../include/conversation.php:513
+#: ../../include/conversation.php:604
 msgid "starred"
 msgstr ""
 
-#: ../../include/conversation.php:514
+#: ../../include/conversation.php:605
 msgid "add tag"
 msgstr ""
 
-#: ../../include/conversation.php:590
+#: ../../include/conversation.php:609
+msgid "save to folder"
+msgstr ""
+
+#: ../../include/conversation.php:681
 msgid "to"
 msgstr ""
 
-#: ../../include/conversation.php:591
+#: ../../include/conversation.php:682
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../include/conversation.php:592
+#: ../../include/conversation.php:683
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../include/conversation.php:638
+#: ../../include/conversation.php:728
 msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/conversation.php:768
+#: ../../include/conversation.php:879
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: ../../include/conversation.php:768
+#: ../../include/conversation.php:879
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/conversation.php:772
+#: ../../include/conversation.php:883
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""
 
-#: ../../include/conversation.php:774
+#: ../../include/conversation.php:885
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:780
+#: ../../include/conversation.php:891
 msgid "and"
 msgstr ""
 
-#: ../../include/conversation.php:783
+#: ../../include/conversation.php:894
 #, php-format
 msgid ", and %d other people"
 msgstr ""
 
-#: ../../include/conversation.php:784
+#: ../../include/conversation.php:895
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../include/conversation.php:784
+#: ../../include/conversation.php:895
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:804
+#: ../../include/conversation.php:920
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: ../../include/conversation.php:806
+#: ../../include/conversation.php:922
 msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:807
+#: ../../include/conversation.php:923
 msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:808
+#: ../../include/conversation.php:924
 msgid "Tag term:"
 msgstr ""
 
-#: ../../include/conversation.php:809
+#: ../../include/conversation.php:926
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/conversation.php:810
-msgid "Enter a title for this item"
+#: ../../include/conversation.php:969
+msgid "upload photo"
+msgstr ""
+
+#: ../../include/conversation.php:971
+msgid "attach file"
+msgstr ""
+
+#: ../../include/conversation.php:973
+msgid "web link"
 msgstr ""
 
-#: ../../include/conversation.php:856
+#: ../../include/conversation.php:974
 msgid "Insert video link"
 msgstr ""
 
-#: ../../include/conversation.php:857
+#: ../../include/conversation.php:975
+msgid "video link"
+msgstr ""
+
+#: ../../include/conversation.php:976
 msgid "Insert audio link"
 msgstr ""
 
-#: ../../include/conversation.php:860
-msgid "Set title"
+#: ../../include/conversation.php:977
+msgid "audio link"
+msgstr ""
+
+#: ../../include/conversation.php:979
+msgid "set location"
 msgstr ""
 
-#: ../../boot.php:419
+#: ../../include/conversation.php:981
+msgid "clear location"
+msgstr ""
+
+#: ../../include/conversation.php:988
+msgid "permissions"
+msgstr ""
+
+#: ../../boot.php:515
 msgid "Delete this item?"
 msgstr ""
 
-#: ../../boot.php:422
+#: ../../boot.php:518
 msgid "show fewer"
 msgstr ""
 
-#: ../../boot.php:664
+#: ../../boot.php:691
+#, php-format
+msgid "Update %s failed. See error logs."
+msgstr ""
+
+#: ../../boot.php:693
+#, php-format
+msgid "Update Error at %s"
+msgstr ""
+
+#: ../../boot.php:793
 msgid "Create a New Account"
 msgstr ""
 
-#: ../../boot.php:684
+#: ../../boot.php:817
 msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../boot.php:685
+#: ../../boot.php:818
 msgid "Password: "
 msgstr ""
 
-#: ../../boot.php:688
-msgid "OpenID: "
+#: ../../boot.php:821
+msgid "Or login using OpenID: "
 msgstr ""
 
-#: ../../boot.php:694
+#: ../../boot.php:827
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:841
+#: ../../boot.php:994
 msgid "Edit profile"
 msgstr ""
 
-#: ../../boot.php:1008 ../../boot.php:1070
+#: ../../boot.php:1054
+msgid "Message"
+msgstr ""
+
+#: ../../boot.php:1170 ../../boot.php:1246
 msgid "g A l F d"
 msgstr ""
 
-#: ../../boot.php:1009 ../../boot.php:1071
+#: ../../boot.php:1171 ../../boot.php:1247
 msgid "F d"
 msgstr ""
 
-#: ../../boot.php:1032
+#: ../../boot.php:1216 ../../boot.php:1287
+msgid "[today]"
+msgstr ""
+
+#: ../../boot.php:1228
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../boot.php:1033
+#: ../../boot.php:1229
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../boot.php:1049 ../../boot.php:1113
-msgid "[today]"
+#: ../../boot.php:1280
+msgid "[No description]"
 msgstr ""
 
-#: ../../boot.php:1094
+#: ../../boot.php:1298
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../boot.php:1095
+#: ../../boot.php:1299
 msgid "Events this week:"
 msgstr ""
 
-#: ../../boot.php:1107
-msgid "[No description]"
+#: ../../boot.php:1485
+msgid "Status Messages and Posts"
+msgstr ""
+
+#: ../../boot.php:1491
+msgid "Profile Details"
+msgstr ""
+
+#: ../../boot.php:1506
+msgid "Events and Calendar"
+msgstr ""
+
+#: ../../boot.php:1512
+msgid "Only You Can See This"
 msgstr ""