rev update

[friendica.git] / util / messages.po

diff --git a/util/messages.po b/util/messages.po
old mode 100755 (executable)
new mode 100644 (file)
index 1f25756..6567477
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
 #, fuzzy
 msgid ""
 msgstr ""

-"Project-Id-Version: 2.3.1262\n"
+"Project-Id-Version: 3.0.1348\n"

 "Report-Msgid-Bugs-To: \n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2012-02-24 22:44-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"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -34,25 +34,28 @@ msgstr ""
 msgid "Contact update failed."
 msgstr ""
 
 msgid "Contact update failed."
 msgstr ""
 

-#: ../../mod/crepair.php:115 ../../mod/wall_attach.php:43
-#: ../../mod/fsuggest.php:78 ../../mod/events.php:110 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/photos.php:129 ../../mod/photos.php:865
+#: ../../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/editpost.php:10 ../../mod/install.php:171

-#: ../../mod/notifications.php:62 ../../mod/contacts.php:125
-#: ../../mod/settings.php:49 ../../mod/settings.php:404
-#: ../../mod/settings.php:409 ../../mod/manage.php:86 ../../mod/network.php:6
-#: ../../mod/notes.php:20 ../../mod/attach.php:33 ../../mod/group.php:19
-#: ../../mod/viewcontacts.php:22 ../../mod/register.php:36
-#: ../../mod/regmod.php:111 ../../mod/item.php:124 ../../mod/item.php:140
-#: ../../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:46 ../../mod/allfriends.php:9
-#: ../../mod/wall_upload.php:42 ../../mod/follow.php:8 ../../mod/common.php:9
-#: ../../mod/display.php:130 ../../mod/profiles.php:7
-#: ../../mod/profiles.php:229 ../../mod/delegate.php:6
+#: ../../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/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81

-#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:332
-#: ../../include/items.php:2968 ../../index.php:288
+#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:503
+#: ../../include/items.php:3214 ../../index.php:306

 msgid "Permission denied."
 msgstr ""
 
 msgid "Permission denied."
 msgstr ""
 


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

-#: ../../mod/crepair.php:148 ../../mod/settings.php:455
-#: ../../mod/settings.php:481 ../../mod/admin.php:480 ../../mod/admin.php:489
+#: ../../mod/crepair.php:148 ../../mod/settings.php:555
+#: ../../mod/settings.php:581 ../../mod/admin.php:643 ../../mod/admin.php:652

 msgid "Name"
 msgstr ""
 
 msgid "Name"
 msgstr ""
 


@@ -119,37 +122,46 @@ msgid "New photo from this URL"
 msgstr ""
 
 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
 msgstr ""
 
 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107

-#: ../../mod/events.php:400 ../../mod/photos.php:900 ../../mod/photos.php:958
-#: ../../mod/photos.php:1182 ../../mod/photos.php:1222
-#: ../../mod/photos.php:1262 ../../mod/photos.php:1293
+#: ../../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/install.php:251 ../../mod/install.php:289

-#: ../../mod/localtime.php:45 ../../mod/contacts.php:319
-#: ../../mod/settings.php:453 ../../mod/settings.php:592
-#: ../../mod/settings.php:786 ../../mod/manage.php:109 ../../mod/group.php:84
-#: ../../mod/group.php:167 ../../mod/admin.php:312 ../../mod/admin.php:477
-#: ../../mod/admin.php:603 ../../mod/admin.php:769 ../../mod/admin.php:847
-#: ../../mod/profiles.php:375 ../../mod/invite.php:106
-#: ../../addon/facebook/facebook.php:411 ../../addon/yourls/yourls.php:76
-#: ../../addon/nsfw/nsfw.php:57
+#: ../../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/uhremotestorage/uhremotestorage.php:89

-#: ../../addon/randplace/randplace.php:179 ../../addon/drpost/drpost.php:110
-#: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41
-#: ../../addon/impressum/impressum.php:69 ../../addon/blockem/blockem.php:57
-#: ../../addon/qcomment/qcomment.php:60
+#: ../../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/openstreetmap/openstreetmap.php:70

-#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:94
-#: ../../addon/pageheader/pageheader.php:52
-#: ../../addon/statusnet/statusnet.php:273
-#: ../../addon/statusnet/statusnet.php:287
-#: ../../addon/statusnet/statusnet.php:313
-#: ../../addon/statusnet/statusnet.php:320
-#: ../../addon/statusnet/statusnet.php:345
-#: ../../addon/statusnet/statusnet.php:532 ../../addon/tumblr/tumblr.php:90
-#: ../../addon/numfriends/numfriends.php:85 ../../addon/wppost/wppost.php:102
-#: ../../addon/showmore/showmore.php:48 ../../addon/piwik/piwik.php:89
-#: ../../addon/twitter/twitter.php:175 ../../addon/twitter/twitter.php:201
-#: ../../addon/twitter/twitter.php:355 ../../addon/posterous/posterous.php:90
-#: ../../include/conversation.php:542
+#: ../../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 ""
 
 msgid "Submit"
 msgstr ""
 


@@ -157,24 +169,24 @@ msgstr ""
 msgid "Help:"
 msgstr ""
 
 msgid "Help:"
 msgstr ""
 

-#: ../../mod/help.php:34 ../../include/nav.php:82
+#: ../../mod/help.php:34 ../../include/nav.php:86

 msgid "Help"
 msgstr ""
 
 msgid "Help"
 msgstr ""
 

-#: ../../mod/help.php:38 ../../index.php:221
+#: ../../mod/help.php:38 ../../index.php:225

 msgid "Not Found"
 msgstr ""
 
 msgid "Not Found"
 msgstr ""
 

-#: ../../mod/help.php:41 ../../index.php:224
+#: ../../mod/help.php:41 ../../index.php:228

 msgid "Page not found."
 msgstr ""
 
 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 ""
 
 #, php-format
 msgid "File exceeds size limit of %d"
 msgstr ""
 

-#: ../../mod/wall_attach.php:85 ../../mod/wall_attach.php:96
+#: ../../mod/wall_attach.php:86 ../../mod/wall_attach.php:97

 msgid "File upload failed."
 msgstr ""
 
 msgid "File upload failed."
 msgstr ""
 


@@ -191,83 +203,84 @@ msgstr ""
 msgid "Suggest a friend for %s"
 msgstr ""
 
 msgid "Suggest a friend for %s"
 msgstr ""
 

-#: ../../mod/events.php:62
+#: ../../mod/events.php:65

 msgid "Event description and start time are required."
 msgstr ""
 
 msgid "Event description and start time are required."
 msgstr ""
 

-#: ../../mod/events.php:230
+#: ../../mod/events.php:258

 msgid "l, F j"
 msgstr ""
 
 msgid "l, F j"
 msgstr ""
 

-#: ../../mod/events.php:252
+#: ../../mod/events.php:280

 msgid "Edit event"
 msgstr ""
 
 msgid "Edit event"
 msgstr ""
 

-#: ../../mod/events.php:272 ../../include/text.php:964
+#: ../../mod/events.php:300 ../../include/text.php:1054

 msgid "link to source"
 msgstr ""
 
 msgid "link to source"
 msgstr ""
 

-#: ../../mod/events.php:296 ../../include/nav.php:50 ../../boot.php:1349
+#: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:126
+#: ../../include/nav.php:52 ../../boot.php:1503

 msgid "Events"
 msgstr ""
 
 msgid "Events"
 msgstr ""
 

-#: ../../mod/events.php:297
+#: ../../mod/events.php:325

 msgid "Create New Event"
 msgstr ""
 
 msgid "Create New Event"
 msgstr ""
 

-#: ../../mod/events.php:298
+#: ../../mod/events.php:326

 msgid "Previous"
 msgstr ""
 
 msgid "Previous"
 msgstr ""
 

-#: ../../mod/events.php:299 ../../mod/install.php:210
+#: ../../mod/events.php:327 ../../mod/install.php:210

 msgid "Next"
 msgstr ""
 
 msgid "Next"
 msgstr ""
 

-#: ../../mod/events.php:371
+#: ../../mod/events.php:399

 msgid "hour:minute"
 msgstr ""
 
 msgid "hour:minute"
 msgstr ""
 

-#: ../../mod/events.php:380
+#: ../../mod/events.php:408

 msgid "Event details"
 msgstr ""
 
 msgid "Event details"
 msgstr ""
 

-#: ../../mod/events.php:381
+#: ../../mod/events.php:409

 #, php-format
 msgid "Format is %s %s. Starting date and Description are required."
 msgstr ""
 
 #, php-format
 msgid "Format is %s %s. Starting date and Description are required."
 msgstr ""
 

-#: ../../mod/events.php:383
+#: ../../mod/events.php:411

 msgid "Event Starts:"
 msgstr ""
 
 msgid "Event Starts:"
 msgstr ""
 

-#: ../../mod/events.php:386
+#: ../../mod/events.php:414

 msgid "Finish date/time is not known or not relevant"
 msgstr ""
 
 msgid "Finish date/time is not known or not relevant"
 msgstr ""
 

-#: ../../mod/events.php:388
+#: ../../mod/events.php:416

 msgid "Event Finishes:"
 msgstr ""
 
 msgid "Event Finishes:"
 msgstr ""
 

-#: ../../mod/events.php:391
+#: ../../mod/events.php:419

 msgid "Adjust for viewer timezone"
 msgstr ""
 
 msgid "Adjust for viewer timezone"
 msgstr ""
 

-#: ../../mod/events.php:393
+#: ../../mod/events.php:421

 msgid "Description:"
 msgstr ""
 
 msgid "Description:"
 msgstr ""
 

-#: ../../mod/events.php:395 ../../include/event.php:37
-#: ../../include/bb2diaspora.php:290 ../../boot.php:980
+#: ../../mod/events.php:423 ../../include/event.php:37
+#: ../../include/bb2diaspora.php:260 ../../boot.php:1102

 msgid "Location:"
 msgstr ""
 
 msgid "Location:"
 msgstr ""
 

-#: ../../mod/events.php:397
+#: ../../mod/events.php:425

 msgid "Share this event"
 msgstr ""
 
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
 msgid "Share this event"
 msgstr ""
 
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94

-#: ../../mod/dfrn_request.php:686 ../../mod/settings.php:454
-#: ../../mod/settings.php:480 ../../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 ""
 
 msgid "Cancel"
 msgstr ""
 


@@ -287,7 +300,7 @@ msgstr ""
 msgid "Remove"
 msgstr ""
 
 msgid "Remove"
 msgstr ""
 

-#: ../../mod/dfrn_poll.php:91 ../../mod/dfrn_poll.php:517
+#: ../../mod/dfrn_poll.php:94 ../../mod/dfrn_poll.php:522

 #, php-format
 msgid "%s welcomes %s"
 msgstr ""
 #, php-format
 msgid "%s welcomes %s"
 msgstr ""


@@ -310,69 +323,71 @@ msgid ""
 "and/or create new posts for you?"
 msgstr ""
 
 "and/or create new posts for you?"
 msgstr ""
 

-#: ../../mod/api.php:105 ../../mod/dfrn_request.php:676
-#: ../../mod/settings.php:681 ../../mod/settings.php:687
-#: ../../mod/settings.php:695 ../../mod/settings.php:699
-#: ../../mod/settings.php:704 ../../mod/settings.php:710
-#: ../../mod/settings.php:716 ../../mod/settings.php:776
-#: ../../mod/settings.php:777 ../../mod/settings.php:778
-#: ../../mod/settings.php:779 ../../mod/register.php:524
-#: ../../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 ""
 
 msgid "Yes"
 msgstr ""
 

-#: ../../mod/api.php:106 ../../mod/dfrn_request.php:677
-#: ../../mod/settings.php:681 ../../mod/settings.php:687
-#: ../../mod/settings.php:695 ../../mod/settings.php:699
-#: ../../mod/settings.php:704 ../../mod/settings.php:710
-#: ../../mod/settings.php:716 ../../mod/settings.php:776
-#: ../../mod/settings.php:777 ../../mod/settings.php:778
-#: ../../mod/settings.php:779 ../../mod/register.php:525
-#: ../../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 ""
 
 msgid "No"
 msgstr ""
 

-#: ../../mod/photos.php:42
+#: ../../mod/photos.php:43 ../../boot.php:1497

 msgid "Photo Albums"
 msgstr ""
 
 msgid "Photo Albums"
 msgstr ""
 

-#: ../../mod/photos.php:50 ../../mod/photos.php:150 ../../mod/photos.php:879
-#: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1371
-#: ../../mod/photos.php:1383 ../../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 ""
 
 msgid "Contact Photos"
 msgstr ""
 

-#: ../../mod/photos.php:57 ../../mod/photos.php:975 ../../mod/photos.php:1413
+#: ../../mod/photos.php:58 ../../mod/photos.php:975 ../../mod/photos.php:1424

 msgid "Upload New Photos"
 msgstr ""
 
 msgid "Upload New Photos"
 msgstr ""
 

-#: ../../mod/photos.php:68 ../../mod/settings.php:11
+#: ../../mod/photos.php:69 ../../mod/settings.php:20

 msgid "everybody"
 msgstr ""
 
 msgid "everybody"
 msgstr ""
 

-#: ../../mod/photos.php:139
+#: ../../mod/photos.php:140

 msgid "Contact information unavailable"
 msgstr ""
 
 msgid "Contact information unavailable"
 msgstr ""
 

-#: ../../mod/photos.php:150 ../../mod/photos.php:597 ../../mod/photos.php:950
-#: ../../mod/photos.php:965 ../../mod/register.php:327
-#: ../../mod/register.php:334 ../../mod/register.php:341
-#: ../../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
 #: ../../addon/communityhome/communityhome.php:111

+#: ../../view/theme/diabook/theme.php:594

 msgid "Profile Photos"
 msgstr ""
 
 msgid "Profile Photos"
 msgstr ""
 

-#: ../../mod/photos.php:160
+#: ../../mod/photos.php:161

 msgid "Album not found."
 msgstr ""
 
 msgid "Album not found."
 msgstr ""
 

-#: ../../mod/photos.php:178 ../../mod/photos.php:959
+#: ../../mod/photos.php:179 ../../mod/photos.php:959

 msgid "Delete Album"
 msgstr ""
 
 msgid "Delete Album"
 msgstr ""
 

-#: ../../mod/photos.php:241 ../../mod/photos.php:1183
+#: ../../mod/photos.php:242 ../../mod/photos.php:1194

 msgid "Delete Photo"
 msgstr ""
 
 msgid "Delete Photo"
 msgstr ""
 


@@ -382,7 +397,8 @@ msgstr ""
 
 #: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70
 #: ../../addon/communityhome/communityhome.php:163
 
 #: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70
 #: ../../addon/communityhome/communityhome.php:163

-#: ../../include/diaspora.php:1600 ../../include/conversation.php:53
+#: ../../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 ""
 #: ../../include/conversation.php:126
 msgid "photo"
 msgstr ""


@@ -399,19 +415,19 @@ msgstr ""
 msgid "Image file is empty."
 msgstr ""
 
 msgid "Image file is empty."
 msgstr ""
 

-#: ../../mod/photos.php:653 ../../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 ""
 
 msgid "Unable to process image."
 msgstr ""
 

-#: ../../mod/photos.php:673 ../../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:759 ../../mod/community.php:16
 msgid "Image upload failed."
 msgstr ""
 
 #: ../../mod/photos.php:759 ../../mod/community.php:16

-#: ../../mod/dfrn_request.php:625 ../../mod/viewcontacts.php:17
-#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:33
+#: ../../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 ""
 
 msgid "Public access denied."
 msgstr ""
 


@@ -439,7 +455,7 @@ msgstr ""
 msgid "Do not show a status post for this upload"
 msgstr ""
 
 msgid "Do not show a status post for this upload"
 msgstr ""
 

-#: ../../mod/photos.php:914 ../../mod/photos.php:1178
+#: ../../mod/photos.php:914 ../../mod/photos.php:1189

 msgid "Permissions"
 msgstr ""
 
 msgid "Permissions"
 msgstr ""
 


@@ -447,7 +463,7 @@ msgstr ""
 msgid "Edit Album"
 msgstr ""
 
 msgid "Edit Album"
 msgstr ""
 

-#: ../../mod/photos.php:984 ../../mod/photos.php:1396
+#: ../../mod/photos.php:984 ../../mod/photos.php:1407

 msgid "View Photo"
 msgstr ""
 
 msgid "View Photo"
 msgstr ""
 


@@ -471,84 +487,84 @@ msgstr ""
 msgid "Use as profile photo"
 msgstr ""
 
 msgid "Use as profile photo"
 msgstr ""
 

-#: ../../mod/photos.php:1078 ../../include/conversation.php:472
+#: ../../mod/photos.php:1078 ../../include/conversation.php:483

 msgid "Private Message"
 msgstr ""
 
 msgid "Private Message"
 msgstr ""
 

-#: ../../mod/photos.php:1089
+#: ../../mod/photos.php:1100

 msgid "View Full Size"
 msgstr ""
 
 msgid "View Full Size"
 msgstr ""
 

-#: ../../mod/photos.php:1157
+#: ../../mod/photos.php:1168

 msgid "Tags: "
 msgstr ""
 
 msgid "Tags: "
 msgstr ""
 

-#: ../../mod/photos.php:1160
+#: ../../mod/photos.php:1171

 msgid "[Remove any tag]"
 msgstr ""
 
 msgid "[Remove any tag]"
 msgstr ""
 

-#: ../../mod/photos.php:1171
+#: ../../mod/photos.php:1182

 msgid "New album name"
 msgstr ""
 
 msgid "New album name"
 msgstr ""
 

-#: ../../mod/photos.php:1174
+#: ../../mod/photos.php:1185

 msgid "Caption"
 msgstr ""
 
 msgid "Caption"
 msgstr ""
 

-#: ../../mod/photos.php:1176
+#: ../../mod/photos.php:1187

 msgid "Add a Tag"
 msgstr ""
 
 msgid "Add a Tag"
 msgstr ""
 

-#: ../../mod/photos.php:1180
+#: ../../mod/photos.php:1191

 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 

-#: ../../mod/photos.php:1200 ../../include/conversation.php:519
+#: ../../mod/photos.php:1211 ../../include/conversation.php:532

 msgid "I like this (toggle)"
 msgstr ""
 
 msgid "I like this (toggle)"
 msgstr ""
 

-#: ../../mod/photos.php:1201 ../../include/conversation.php:520
+#: ../../mod/photos.php:1212 ../../include/conversation.php:533

 msgid "I don't like this (toggle)"
 msgstr ""
 
 msgid "I don't like this (toggle)"
 msgstr ""
 

-#: ../../mod/photos.php:1202 ../../include/conversation.php:914
+#: ../../mod/photos.php:1213 ../../include/conversation.php:967

 msgid "Share"
 msgstr ""
 
 msgid "Share"
 msgstr ""
 

-#: ../../mod/photos.php:1203 ../../mod/editpost.php:104
-#: ../../mod/message.php:155 ../../mod/message.php:296
-#: ../../include/conversation.php:343 ../../include/conversation.php:677
-#: ../../include/conversation.php:931
+#: ../../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 ""
 
 msgid "Please wait"
 msgstr ""
 

-#: ../../mod/photos.php:1219 ../../mod/photos.php:1259
-#: ../../mod/photos.php:1290 ../../include/conversation.php:539
+#: ../../mod/photos.php:1230 ../../mod/photos.php:1270
+#: ../../mod/photos.php:1301 ../../include/conversation.php:555

 msgid "This is you"
 msgstr ""
 
 msgid "This is you"
 msgstr ""
 

-#: ../../mod/photos.php:1221 ../../mod/photos.php:1261
-#: ../../mod/photos.php:1292 ../../include/conversation.php:541
-#: ../../boot.php:447
+#: ../../mod/photos.php:1232 ../../mod/photos.php:1272
+#: ../../mod/photos.php:1303 ../../include/conversation.php:557
+#: ../../boot.php:516

 msgid "Comment"
 msgstr ""
 
 msgid "Comment"
 msgstr ""
 

-#: ../../mod/photos.php:1223 ../../mod/editpost.php:123
-#: ../../include/conversation.php:543 ../../include/conversation.php:949
+#: ../../mod/photos.php:1234 ../../mod/editpost.php:125
+#: ../../include/conversation.php:567 ../../include/conversation.php:1004

 msgid "Preview"
 msgstr ""
 
 msgid "Preview"
 msgstr ""
 

-#: ../../mod/photos.php:1320 ../../mod/settings.php:513
-#: ../../mod/group.php:154 ../../mod/admin.php:484
-#: ../../include/conversation.php:302 ../../include/conversation.php:563
+#: ../../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 ""
 
 msgid "Delete"
 msgstr ""
 

-#: ../../mod/photos.php:1402
+#: ../../mod/photos.php:1413

 msgid "View Album"
 msgstr ""
 
 msgid "View Album"
 msgstr ""
 

-#: ../../mod/photos.php:1411
+#: ../../mod/photos.php:1422

 msgid "Recent Photos"
 msgstr ""
 
 msgid "Recent Photos"
 msgstr ""
 


@@ -556,43 +572,44 @@ msgstr ""
 msgid "Not available."
 msgstr ""
 
 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 ""
 
 msgid "Community"
 msgstr ""
 

-#: ../../mod/community.php:60 ../../mod/search.php:118
+#: ../../mod/community.php:61 ../../mod/search.php:138

 msgid "No results."
 msgstr ""
 
 msgid "No results."
 msgstr ""
 

-#: ../../mod/friendica.php:43
+#: ../../mod/friendica.php:55

 msgid "This is Friendica, version"
 msgstr ""
 
 msgid "This is Friendica, version"
 msgstr ""
 

-#: ../../mod/friendica.php:44
+#: ../../mod/friendica.php:56

 msgid "running at web location"
 msgstr ""
 
 msgid "running at web location"
 msgstr ""
 

-#: ../../mod/friendica.php:46
+#: ../../mod/friendica.php:58

 msgid ""
 "Please visit <a href=\"http://friendica.com\">Friendica.com</a> to learn "
 "more about the Friendica project."
 msgstr ""
 
 msgid ""
 "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 ""
 
 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 ""
 
 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 ""
 
 msgstr ""
 

-#: ../../mod/friendica.php:62
+#: ../../mod/friendica.php:88

 msgid "No installed plugins/addons/apps"
 msgstr ""
 
 msgid "No installed plugins/addons/apps"
 msgstr ""
 


@@ -604,26 +621,28 @@ msgstr ""
 msgid "Edit post"
 msgstr ""
 
 msgid "Edit post"
 msgstr ""
 

-#: ../../mod/editpost.php:80 ../../include/conversation.php:900
+#: ../../mod/editpost.php:80 ../../include/conversation.php:953

 msgid "Post to Email"
 msgstr ""
 
 msgid "Post to Email"
 msgstr ""
 

-#: ../../mod/editpost.php:95 ../../mod/settings.php:512
-#: ../../include/conversation.php:550
+#: ../../mod/editpost.php:95 ../../mod/settings.php:615
+#: ../../include/conversation.php:574

 msgid "Edit"
 msgstr ""
 
 msgid "Edit"
 msgstr ""
 

-#: ../../mod/editpost.php:96 ../../mod/message.php:153
-#: ../../mod/message.php:294 ../../include/conversation.php:915
+#: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143
+#: ../../mod/message.php:212 ../../mod/message.php:406
+#: ../../include/conversation.php:968

 msgid "Upload photo"
 msgstr ""
 
 msgid "Upload photo"
 msgstr ""
 

-#: ../../mod/editpost.php:97 ../../include/conversation.php:917
+#: ../../mod/editpost.php:97 ../../include/conversation.php:970

 msgid "Attach file"
 msgstr ""
 
 msgid "Attach file"
 msgstr ""
 

-#: ../../mod/editpost.php:98 ../../mod/message.php:154
-#: ../../mod/message.php:295 ../../include/conversation.php:919
+#: ../../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 ""
 
 msgid "Insert web link"
 msgstr ""
 


@@ -639,201 +658,220 @@ msgstr ""
 msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
 msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 

-#: ../../mod/editpost.php:102 ../../include/conversation.php:925
+#: ../../mod/editpost.php:102 ../../include/conversation.php:978

 msgid "Set your location"
 msgstr ""
 
 msgid "Set your location"
 msgstr ""
 

-#: ../../mod/editpost.php:103 ../../include/conversation.php:927
+#: ../../mod/editpost.php:103 ../../include/conversation.php:980

 msgid "Clear browser location"
 msgstr ""
 
 msgid "Clear browser location"
 msgstr ""
 

-#: ../../mod/editpost.php:105 ../../include/conversation.php:932
+#: ../../mod/editpost.php:105 ../../include/conversation.php:987

 msgid "Permission settings"
 msgstr ""
 
 msgid "Permission settings"
 msgstr ""
 

-#: ../../mod/editpost.php:113 ../../include/conversation.php:941
+#: ../../mod/editpost.php:113 ../../include/conversation.php:996

 msgid "CC: email addresses"
 msgstr ""
 
 msgid "CC: email addresses"
 msgstr ""
 

-#: ../../mod/editpost.php:114 ../../include/conversation.php:942
+#: ../../mod/editpost.php:114 ../../include/conversation.php:997

 msgid "Public post"
 msgstr ""
 
 msgid "Public post"
 msgstr ""
 

-#: ../../mod/editpost.php:117 ../../include/conversation.php:930
+#: ../../mod/editpost.php:117 ../../include/conversation.php:983

 msgid "Set title"
 msgstr ""
 
 msgid "Set title"
 msgstr ""
 

-#: ../../mod/editpost.php:118 ../../include/conversation.php:944
+#: ../../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 ""
 
 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 ""
 
 msgid "This introduction has already been accepted."
 msgstr ""
 

-#: ../../mod/dfrn_request.php:116 ../../mod/dfrn_request.php:381
+#: ../../mod/dfrn_request.php:117 ../../mod/dfrn_request.php:495

 msgid "Profile location is not valid or does not contain profile information."
 msgstr ""
 
 msgid "Profile location is not valid or does not contain profile information."
 msgstr ""
 

-#: ../../mod/dfrn_request.php:121 ../../mod/dfrn_request.php:386
+#: ../../mod/dfrn_request.php:122 ../../mod/dfrn_request.php:500

 msgid "Warning: profile location has no identifiable owner name."
 msgstr ""
 
 msgid "Warning: profile location has no identifiable owner name."
 msgstr ""
 

-#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:388
+#: ../../mod/dfrn_request.php:124 ../../mod/dfrn_request.php:502

 msgid "Warning: profile location has no profile photo."
 msgstr ""
 
 msgid "Warning: profile location has no profile photo."
 msgstr ""
 

-#: ../../mod/dfrn_request.php:126 ../../mod/dfrn_request.php:391
+#: ../../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] ""
 
 #, 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 ""
 
 msgid "Introduction complete."
 msgstr ""
 

-#: ../../mod/dfrn_request.php:191
+#: ../../mod/dfrn_request.php:192

 msgid "Unrecoverable protocol error."
 msgstr ""
 
 msgid "Unrecoverable protocol error."
 msgstr ""
 

-#: ../../mod/dfrn_request.php:219
+#: ../../mod/dfrn_request.php:220

 msgid "Profile unavailable."
 msgstr ""
 
 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 ""
 
 #, 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 ""
 
 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 ""
 
 msgid "Friends are advised to please try again in 24 hours."
 msgstr ""
 

-#: ../../mod/dfrn_request.php:306
+#: ../../mod/dfrn_request.php:309

 msgid "Invalid locator"
 msgstr ""
 
 msgid "Invalid locator"
 msgstr ""
 

-#: ../../mod/dfrn_request.php:326
+#: ../../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 ""
 
 msgid "Unable to resolve your name at the provided location."
 msgstr ""
 

-#: ../../mod/dfrn_request.php:339
+#: ../../mod/dfrn_request.php:453

 msgid "You have already introduced yourself here."
 msgstr ""
 
 msgid "You have already introduced yourself here."
 msgstr ""
 

-#: ../../mod/dfrn_request.php:343
+#: ../../mod/dfrn_request.php:457

 #, php-format
 msgid "Apparently you are already friends with %s."
 msgstr ""
 
 #, php-format
 msgid "Apparently you are already friends with %s."
 msgstr ""
 

-#: ../../mod/dfrn_request.php:364
+#: ../../mod/dfrn_request.php:478

 msgid "Invalid profile URL."
 msgstr ""
 
 msgid "Invalid profile URL."
 msgstr ""
 

-#: ../../mod/dfrn_request.php:370 ../../mod/follow.php:20
+#: ../../mod/dfrn_request.php:484 ../../mod/follow.php:23

 msgid "Disallowed profile URL."
 msgstr ""
 
 msgid "Disallowed profile URL."
 msgstr ""
 

-#: ../../mod/dfrn_request.php:439 ../../mod/contacts.php:102
+#: ../../mod/dfrn_request.php:553 ../../mod/contacts.php:102

 msgid "Failed to update contact record."
 msgstr ""
 
 msgid "Failed to update contact record."
 msgstr ""
 

-#: ../../mod/dfrn_request.php:460
+#: ../../mod/dfrn_request.php:574

 msgid "Your introduction has been sent."
 msgstr ""
 
 msgid "Your introduction has been sent."
 msgstr ""
 

-#: ../../mod/dfrn_request.php:513
+#: ../../mod/dfrn_request.php:627

 msgid "Please login to confirm introduction."
 msgstr ""
 
 msgid "Please login to confirm introduction."
 msgstr ""
 

-#: ../../mod/dfrn_request.php:527
+#: ../../mod/dfrn_request.php:641

 msgid ""
 "Incorrect identity currently logged in. Please login to <strong>this</"
 "strong> profile."
 msgstr ""
 
 msgid ""
 "Incorrect identity currently logged in. Please login to <strong>this</"
 "strong> profile."
 msgstr ""
 

-#: ../../mod/dfrn_request.php:539
+#: ../../mod/dfrn_request.php:653

 #, php-format
 msgid "Welcome home %s."
 msgstr ""
 
 #, php-format
 msgid "Welcome home %s."
 msgstr ""
 

-#: ../../mod/dfrn_request.php:540
+#: ../../mod/dfrn_request.php:654

 #, php-format
 msgid "Please confirm your introduction/connection request to %s."
 msgstr ""
 
 #, php-format
 msgid "Please confirm your introduction/connection request to %s."
 msgstr ""
 

-#: ../../mod/dfrn_request.php:541
+#: ../../mod/dfrn_request.php:655

 msgid "Confirm"
 msgstr ""
 
 msgid "Confirm"
 msgstr ""
 

-#: ../../mod/dfrn_request.php:582 ../../include/items.php:2504
+#: ../../mod/dfrn_request.php:696 ../../include/items.php:2729

 msgid "[Name Withheld]"
 msgstr ""
 
 msgid "[Name Withheld]"
 msgstr ""
 

-#: ../../mod/dfrn_request.php:666
-#, php-format
+#: ../../mod/dfrn_request.php:789

 msgid ""
 msgid ""

-"Diaspora members: Please do not use this form. Instead, enter \"%s\" into "
-"your Diaspora search bar."
+"Please enter your 'Identity Address' from one of the following supported "
+"communications networks:"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:805
+msgid "<strike>Connect as an email follower</strike> (Coming soon)"

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/dfrn_request.php:669
+#: ../../mod/dfrn_request.php:807

 msgid ""
 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 ""
 
 msgstr ""
 

-#: ../../mod/dfrn_request.php:672
+#: ../../mod/dfrn_request.php:810

 msgid "Friend/Connection Request"
 msgstr ""
 
 msgid "Friend/Connection Request"
 msgstr ""
 

-#: ../../mod/dfrn_request.php:673
+#: ../../mod/dfrn_request.php:811

 msgid ""
 "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
 "testuser@identi.ca"
 msgstr ""
 
 msgid ""
 "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
 "testuser@identi.ca"
 msgstr ""
 

-#: ../../mod/dfrn_request.php:674
+#: ../../mod/dfrn_request.php:812

 msgid "Please answer the following:"
 msgstr ""
 
 msgid "Please answer the following:"
 msgstr ""
 

-#: ../../mod/dfrn_request.php:675
+#: ../../mod/dfrn_request.php:813

 #, php-format
 msgid "Does %s know you?"
 msgstr ""
 
 #, php-format
 msgid "Does %s know you?"
 msgstr ""
 

-#: ../../mod/dfrn_request.php:678
+#: ../../mod/dfrn_request.php:816

 msgid "Add a personal note:"
 msgstr ""
 
 msgid "Add a personal note:"
 msgstr ""
 

-#: ../../mod/dfrn_request.php:680 ../../include/contact_selectors.php:76
+#: ../../mod/dfrn_request.php:818 ../../include/contact_selectors.php:76

 msgid "Friendica"
 msgstr ""
 
 msgid "Friendica"
 msgstr ""
 

-#: ../../mod/dfrn_request.php:681
+#: ../../mod/dfrn_request.php:819

 msgid "StatusNet/Federated Social Web"
 msgstr ""
 
 msgid "StatusNet/Federated Social Web"
 msgstr ""
 

-#: ../../mod/dfrn_request.php:682 ../../mod/settings.php:548
+#: ../../mod/dfrn_request.php:820 ../../mod/settings.php:650

 #: ../../include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr ""
 
 #: ../../include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr ""
 

-#: ../../mod/dfrn_request.php:683
-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 ""
 
 msgstr ""
 

-#: ../../mod/dfrn_request.php:684
+#: ../../mod/dfrn_request.php:822

 msgid "Your Identity Address:"
 msgstr ""
 
 msgid "Your Identity Address:"
 msgstr ""
 

-#: ../../mod/dfrn_request.php:685
+#: ../../mod/dfrn_request.php:825

 msgid "Submit Request"
 msgstr ""
 
 msgid "Submit Request"
 msgstr ""
 


@@ -973,7 +1011,7 @@ msgid "This is required for message delivery to work."
 msgstr ""
 
 #: ../../mod/install.php:343
 msgstr ""
 
 #: ../../mod/install.php:343

-msgid "PHP \"register_argc_argv\""
+msgid "PHP register_argc_argv"

 msgstr ""
 
 #: ../../mod/install.php:364
 msgstr ""
 
 #: ../../mod/install.php:364


@@ -1013,7 +1051,7 @@ msgid "mb_string PHP module"
 msgstr ""
 
 #: ../../mod/install.php:383 ../../mod/install.php:385
 msgstr ""
 
 #: ../../mod/install.php:383 ../../mod/install.php:385

-msgid "Apace mod_rewrite module"
+msgid "Apache mod_rewrite module"

 msgstr ""
 
 #: ../../mod/install.php:383
 msgstr ""
 
 #: ../../mod/install.php:383


@@ -1082,7 +1120,7 @@ msgid "Errors encountered creating database tables."
 msgstr ""
 
 #: ../../mod/localtime.php:12 ../../include/event.php:11
 msgstr ""
 
 #: ../../mod/localtime.php:12 ../../include/event.php:11

-#: ../../include/bb2diaspora.php:268
+#: ../../include/bb2diaspora.php:238

 msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
 msgid "l F d, Y \\@ g:i A"
 msgstr ""
 


@@ -1128,11 +1166,11 @@ msgid "is interested in:"
 msgstr ""
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
 msgstr ""
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59

-#: ../../include/contact_widgets.php:9 ../../boot.php:930
+#: ../../include/contact_widgets.php:9 ../../boot.php:1046

 msgid "Connect"
 msgstr ""
 
 msgid "Connect"
 msgstr ""
 

-#: ../../mod/match.php:65 ../../mod/dirfind.php:57
+#: ../../mod/match.php:65 ../../mod/dirfind.php:60

 msgid "No matches"
 msgstr ""
 
 msgid "No matches"
 msgstr ""
 


@@ -1153,184 +1191,184 @@ msgstr ""
 msgid "Invalid request identifier."
 msgstr ""
 
 msgid "Invalid request identifier."
 msgstr ""
 

-#: ../../mod/notifications.php:35 ../../mod/notifications.php:157
-#: ../../mod/notifications.php:203
+#: ../../mod/notifications.php:35 ../../mod/notifications.php:161
+#: ../../mod/notifications.php:207

 msgid "Discard"
 msgstr ""
 
 msgid "Discard"
 msgstr ""
 

-#: ../../mod/notifications.php:47 ../../mod/notifications.php:156
-#: ../../mod/notifications.php:202 ../../mod/contacts.php:302
-#: ../../mod/contacts.php:345
+#: ../../mod/notifications.php:51 ../../mod/notifications.php:160
+#: ../../mod/notifications.php:206 ../../mod/contacts.php:296
+#: ../../mod/contacts.php:348

 msgid "Ignore"
 msgstr ""
 
 msgid "Ignore"
 msgstr ""
 

-#: ../../mod/notifications.php:71
+#: ../../mod/notifications.php:75

 msgid "System"
 msgstr ""
 
 msgid "System"
 msgstr ""
 

-#: ../../mod/notifications.php:76 ../../include/nav.php:109
+#: ../../mod/notifications.php:80 ../../include/nav.php:113

 msgid "Network"
 msgstr ""
 
 msgid "Network"
 msgstr ""
 

-#: ../../mod/notifications.php:81 ../../mod/network.php:177
+#: ../../mod/notifications.php:85 ../../mod/network.php:184

 msgid "Personal"
 msgstr ""
 
 msgid "Personal"
 msgstr ""
 

-#: ../../mod/notifications.php:86 ../../include/nav.php:73
-#: ../../include/nav.php:111
+#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:122
+#: ../../include/nav.php:77 ../../include/nav.php:115

 msgid "Home"
 msgstr ""
 
 msgid "Home"
 msgstr ""
 

-#: ../../mod/notifications.php:91 ../../include/nav.php:117
+#: ../../mod/notifications.php:95 ../../include/nav.php:121

 msgid "Introductions"
 msgstr ""
 
 msgid "Introductions"
 msgstr ""
 

-#: ../../mod/notifications.php:96 ../../mod/message.php:76
-#: ../../include/nav.php:124
+#: ../../mod/notifications.php:100 ../../mod/message.php:104
+#: ../../include/nav.php:128

 msgid "Messages"
 msgstr ""
 
 msgid "Messages"
 msgstr ""
 

-#: ../../mod/notifications.php:115
+#: ../../mod/notifications.php:119

 msgid "Show Ignored Requests"
 msgstr ""
 
 msgid "Show Ignored Requests"
 msgstr ""
 

-#: ../../mod/notifications.php:115
+#: ../../mod/notifications.php:119

 msgid "Hide Ignored Requests"
 msgstr ""
 
 msgid "Hide Ignored Requests"
 msgstr ""
 

-#: ../../mod/notifications.php:141 ../../mod/notifications.php:187
+#: ../../mod/notifications.php:145 ../../mod/notifications.php:191

 msgid "Notification type: "
 msgstr ""
 
 msgid "Notification type: "
 msgstr ""
 

-#: ../../mod/notifications.php:142
+#: ../../mod/notifications.php:146

 msgid "Friend Suggestion"
 msgstr ""
 
 msgid "Friend Suggestion"
 msgstr ""
 

-#: ../../mod/notifications.php:144
+#: ../../mod/notifications.php:148

 #, php-format
 msgid "suggested by %s"
 msgstr ""
 
 #, php-format
 msgid "suggested by %s"
 msgstr ""
 

-#: ../../mod/notifications.php:149 ../../mod/notifications.php:196
-#: ../../mod/contacts.php:350
+#: ../../mod/notifications.php:153 ../../mod/notifications.php:200
+#: ../../mod/contacts.php:354

 msgid "Hide this contact from others"
 msgstr ""
 
 msgid "Hide this contact from others"
 msgstr ""
 

-#: ../../mod/notifications.php:150 ../../mod/notifications.php:197
+#: ../../mod/notifications.php:154 ../../mod/notifications.php:201

 msgid "Post a new friend activity"
 msgstr ""
 
 msgid "Post a new friend activity"
 msgstr ""
 

-#: ../../mod/notifications.php:150 ../../mod/notifications.php:197
+#: ../../mod/notifications.php:154 ../../mod/notifications.php:201

 msgid "if applicable"
 msgstr ""
 
 msgid "if applicable"
 msgstr ""
 

-#: ../../mod/notifications.php:153 ../../mod/notifications.php:200
-#: ../../mod/admin.php:482
+#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
+#: ../../mod/admin.php:645

 msgid "Approve"
 msgstr ""
 
 msgid "Approve"
 msgstr ""
 

-#: ../../mod/notifications.php:173
+#: ../../mod/notifications.php:177

 msgid "Claims to be known to you: "
 msgstr ""
 
 msgid "Claims to be known to you: "
 msgstr ""
 

-#: ../../mod/notifications.php:173
+#: ../../mod/notifications.php:177

 msgid "yes"
 msgstr ""
 
 msgid "yes"
 msgstr ""
 

-#: ../../mod/notifications.php:173
+#: ../../mod/notifications.php:177

 msgid "no"
 msgstr ""
 
 msgid "no"
 msgstr ""
 

-#: ../../mod/notifications.php:180
+#: ../../mod/notifications.php:184

 msgid "Approve as: "
 msgstr ""
 
 msgid "Approve as: "
 msgstr ""
 

-#: ../../mod/notifications.php:181
+#: ../../mod/notifications.php:185

 msgid "Friend"
 msgstr ""
 
 msgid "Friend"
 msgstr ""
 

-#: ../../mod/notifications.php:182
+#: ../../mod/notifications.php:186

 msgid "Sharer"
 msgstr ""
 
 msgid "Sharer"
 msgstr ""
 

-#: ../../mod/notifications.php:182
+#: ../../mod/notifications.php:186

 msgid "Fan/Admirer"
 msgstr ""
 
 msgid "Fan/Admirer"
 msgstr ""
 

-#: ../../mod/notifications.php:188
+#: ../../mod/notifications.php:192

 msgid "Friend/Connect Request"
 msgstr ""
 
 msgid "Friend/Connect Request"
 msgstr ""
 

-#: ../../mod/notifications.php:188
+#: ../../mod/notifications.php:192

 msgid "New Follower"
 msgstr ""
 
 msgid "New Follower"
 msgstr ""
 

-#: ../../mod/notifications.php:209
+#: ../../mod/notifications.php:213

 msgid "No introductions."
 msgstr ""
 
 msgid "No introductions."
 msgstr ""
 

-#: ../../mod/notifications.php:212 ../../include/nav.php:118
+#: ../../mod/notifications.php:216 ../../include/nav.php:122

 msgid "Notifications"
 msgstr ""
 
 msgid "Notifications"
 msgstr ""
 

-#: ../../mod/notifications.php:249 ../../mod/notifications.php:374
-#: ../../mod/notifications.php:461
+#: ../../mod/notifications.php:253 ../../mod/notifications.php:378
+#: ../../mod/notifications.php:465

 #, php-format
 msgid "%s liked %s's post"
 msgstr ""
 
 #, php-format
 msgid "%s liked %s's post"
 msgstr ""
 

-#: ../../mod/notifications.php:258 ../../mod/notifications.php:383
-#: ../../mod/notifications.php:470
+#: ../../mod/notifications.php:262 ../../mod/notifications.php:387
+#: ../../mod/notifications.php:474

 #, php-format
 msgid "%s disliked %s's post"
 msgstr ""
 
 #, php-format
 msgid "%s disliked %s's post"
 msgstr ""
 

-#: ../../mod/notifications.php:272 ../../mod/notifications.php:397
-#: ../../mod/notifications.php:484
+#: ../../mod/notifications.php:276 ../../mod/notifications.php:401
+#: ../../mod/notifications.php:488

 #, php-format
 msgid "%s is now friends with %s"
 msgstr ""
 
 #, php-format
 msgid "%s is now friends with %s"
 msgstr ""
 

-#: ../../mod/notifications.php:279 ../../mod/notifications.php:404
+#: ../../mod/notifications.php:283 ../../mod/notifications.php:408

 #, php-format
 msgid "%s created a new post"
 msgstr ""
 
 #, php-format
 msgid "%s created a new post"
 msgstr ""
 

-#: ../../mod/notifications.php:280 ../../mod/notifications.php:405
-#: ../../mod/notifications.php:493
+#: ../../mod/notifications.php:284 ../../mod/notifications.php:409
+#: ../../mod/notifications.php:497

 #, php-format
 msgid "%s commented on %s's post"
 msgstr ""
 
 #, php-format
 msgid "%s commented on %s's post"
 msgstr ""
 

-#: ../../mod/notifications.php:294
+#: ../../mod/notifications.php:298

 msgid "No more network notifications."
 msgstr ""
 
 msgid "No more network notifications."
 msgstr ""
 

-#: ../../mod/notifications.php:298
+#: ../../mod/notifications.php:302

 msgid "Network Notifications"
 msgstr ""
 
 msgid "Network Notifications"
 msgstr ""
 

-#: ../../mod/notifications.php:324 ../../mod/notify.php:59
+#: ../../mod/notifications.php:328 ../../mod/notify.php:61

 msgid "No more system notifications."
 msgstr ""
 
 msgid "No more system notifications."
 msgstr ""
 

-#: ../../mod/notifications.php:328 ../../mod/notify.php:63
+#: ../../mod/notifications.php:332 ../../mod/notify.php:65

 msgid "System Notifications"
 msgstr ""
 
 msgid "System Notifications"
 msgstr ""
 

-#: ../../mod/notifications.php:419
+#: ../../mod/notifications.php:423

 msgid "No more personal notifications."
 msgstr ""
 
 msgid "No more personal notifications."
 msgstr ""
 

-#: ../../mod/notifications.php:423
+#: ../../mod/notifications.php:427

 msgid "Personal Notifications"
 msgstr ""
 
 msgid "Personal Notifications"
 msgstr ""
 

-#: ../../mod/notifications.php:500
+#: ../../mod/notifications.php:504

 msgid "No more home notifications."
 msgstr ""
 
 msgid "No more home notifications."
 msgstr ""
 

-#: ../../mod/notifications.php:504
+#: ../../mod/notifications.php:508

 msgid "Home Notifications"
 msgstr ""
 
 msgid "Home Notifications"
 msgstr ""
 


@@ -1362,208 +1400,276 @@ msgstr ""
 msgid "Contact has been unignored"
 msgstr ""
 
 msgid "Contact has been unignored"
 msgstr ""
 

-#: ../../mod/contacts.php:200
-msgid "stopped following"
+#: ../../mod/contacts.php:195
+msgid "Contact has been archived"
+msgstr ""
+
+#: ../../mod/contacts.php:195
+msgid "Contact has been unarchived"

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/contacts.php:221
+#: ../../mod/contacts.php:208

 msgid "Contact has been removed."
 msgstr ""
 
 msgid "Contact has been removed."
 msgstr ""
 

-#: ../../mod/contacts.php:245
+#: ../../mod/contacts.php:238

 #, php-format
 msgid "You are mutual friends with %s"
 msgstr ""
 
 #, php-format
 msgid "You are mutual friends with %s"
 msgstr ""
 

-#: ../../mod/contacts.php:249
+#: ../../mod/contacts.php:242

 #, php-format
 msgid "You are sharing with %s"
 msgstr ""
 
 #, php-format
 msgid "You are sharing with %s"
 msgstr ""
 

-#: ../../mod/contacts.php:254
+#: ../../mod/contacts.php:247

 #, php-format
 msgid "%s is sharing with you"
 msgstr ""
 
 #, php-format
 msgid "%s is sharing with you"
 msgstr ""
 

-#: ../../mod/contacts.php:271
+#: ../../mod/contacts.php:264

 msgid "Private communications are not available for this contact."
 msgstr ""
 
 msgid "Private communications are not available for this contact."
 msgstr ""
 

-#: ../../mod/contacts.php:274
+#: ../../mod/contacts.php:267

 msgid "Never"
 msgstr ""
 
 msgid "Never"
 msgstr ""
 

-#: ../../mod/contacts.php:278
+#: ../../mod/contacts.php:271

 msgid "(Update was successful)"
 msgstr ""
 
 msgid "(Update was successful)"
 msgstr ""
 

-#: ../../mod/contacts.php:278
+#: ../../mod/contacts.php:271

 msgid "(Update was not successful)"
 msgstr ""
 
 msgid "(Update was not successful)"
 msgstr ""
 

-#: ../../mod/contacts.php:280
+#: ../../mod/contacts.php:273

 msgid "Suggest friends"
 msgstr ""
 
 msgid "Suggest friends"
 msgstr ""
 

-#: ../../mod/contacts.php:284
+#: ../../mod/contacts.php:277

 #, php-format
 msgid "Network type: %s"
 msgstr ""
 
 #, php-format
 msgid "Network type: %s"
 msgstr ""
 

-#: ../../mod/contacts.php:287
+#: ../../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] ""
 
 #, php-format
 msgid "%d contact in common"
 msgid_plural "%d contacts in common"
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../../mod/contacts.php:292
+#: ../../mod/contacts.php:285

 msgid "View all contacts"
 msgstr ""
 
 msgid "View all contacts"
 msgstr ""
 

-#: ../../mod/contacts.php:297 ../../mod/contacts.php:344
-#: ../../mod/admin.php:486
+#: ../../mod/contacts.php:290 ../../mod/contacts.php:347
+#: ../../mod/admin.php:649

 msgid "Unblock"
 msgstr ""
 
 msgid "Unblock"
 msgstr ""
 

-#: ../../mod/contacts.php:297 ../../mod/contacts.php:344
-#: ../../mod/admin.php:485
+#: ../../mod/contacts.php:290 ../../mod/contacts.php:347
+#: ../../mod/admin.php:648

 msgid "Block"
 msgstr ""
 
 msgid "Block"
 msgstr ""
 

-#: ../../mod/contacts.php:302 ../../mod/contacts.php:345
+#: ../../mod/contacts.php:293
+msgid "Toggle Blocked status"
+msgstr ""
+
+#: ../../mod/contacts.php:296 ../../mod/contacts.php:348

 msgid "Unignore"
 msgstr ""
 
 msgid "Unignore"
 msgstr ""
 

-#: ../../mod/contacts.php:307
+#: ../../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 ""
 
 msgid "Repair"
 msgstr ""
 

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

 msgstr ""
 
 #: ../../mod/contacts.php:320
 msgstr ""
 
 #: ../../mod/contacts.php:320

+msgid "Contact Editor"
+msgstr ""
+
+#: ../../mod/contacts.php:323

 msgid "Profile Visibility"
 msgstr ""
 
 msgid "Profile Visibility"
 msgstr ""
 

-#: ../../mod/contacts.php:321
+#: ../../mod/contacts.php:324

 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr ""
 
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr ""
 

-#: ../../mod/contacts.php:322
+#: ../../mod/contacts.php:325

 msgid "Contact Information / Notes"
 msgstr ""
 
 msgid "Contact Information / Notes"
 msgstr ""
 

-#: ../../mod/contacts.php:323
+#: ../../mod/contacts.php:326

 msgid "Edit contact notes"
 msgstr ""
 
 msgid "Edit contact notes"
 msgstr ""
 

-#: ../../mod/contacts.php:328 ../../mod/contacts.php:497
-#: ../../mod/viewcontacts.php:60
+#: ../../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 ""
 
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr ""
 

-#: ../../mod/contacts.php:329
+#: ../../mod/contacts.php:332

 msgid "Block/Unblock contact"
 msgstr ""
 
 msgid "Block/Unblock contact"
 msgstr ""
 

-#: ../../mod/contacts.php:330
+#: ../../mod/contacts.php:333

 msgid "Ignore contact"
 msgstr ""
 
 msgid "Ignore contact"
 msgstr ""
 

-#: ../../mod/contacts.php:331
+#: ../../mod/contacts.php:334

 msgid "Repair URL settings"
 msgstr ""
 
 msgid "Repair URL settings"
 msgstr ""
 

-#: ../../mod/contacts.php:332
+#: ../../mod/contacts.php:335

 msgid "View conversations"
 msgstr ""
 
 msgid "View conversations"
 msgstr ""
 

-#: ../../mod/contacts.php:334
+#: ../../mod/contacts.php:337

 msgid "Delete contact"
 msgstr ""
 
 msgid "Delete contact"
 msgstr ""
 

-#: ../../mod/contacts.php:338
+#: ../../mod/contacts.php:341

 msgid "Last update:"
 msgstr ""
 
 msgid "Last update:"
 msgstr ""
 

-#: ../../mod/contacts.php:339
+#: ../../mod/contacts.php:342

 msgid "Update public posts"
 msgstr ""
 
 msgid "Update public posts"
 msgstr ""
 

-#: ../../mod/contacts.php:341 ../../mod/admin.php:896
+#: ../../mod/contacts.php:344 ../../mod/admin.php:1120

 msgid "Update now"
 msgstr ""
 
 msgid "Update now"
 msgstr ""
 

-#: ../../mod/contacts.php:348
+#: ../../mod/contacts.php:351

 msgid "Currently blocked"
 msgstr ""
 
 msgid "Currently blocked"
 msgstr ""
 

-#: ../../mod/contacts.php:349
+#: ../../mod/contacts.php:352

 msgid "Currently ignored"
 msgstr ""
 
 msgid "Currently ignored"
 msgstr ""
 

-#: ../../mod/contacts.php:350
+#: ../../mod/contacts.php:353
+msgid "Currently archived"
+msgstr ""
+
+#: ../../mod/contacts.php:354

 msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr ""
 
 msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr ""
 

-#: ../../mod/contacts.php:399 ../../mod/group.php:194
-msgid "All Contacts"
+#: ../../mod/contacts.php:407
+msgid "Suggestions"

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/contacts.php:404
-msgid "Unblocked Contacts"
+#: ../../mod/contacts.php:410
+msgid "Suggest potential friends"

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/contacts.php:410
-msgid "Blocked Contacts"
+#: ../../mod/contacts.php:413 ../../mod/group.php:191
+msgid "All Contacts"

 msgstr ""
 
 #: ../../mod/contacts.php:416
 msgstr ""
 
 #: ../../mod/contacts.php:416

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

 msgstr ""
 
 #: ../../mod/contacts.php:422
 msgstr ""
 
 #: ../../mod/contacts.php:422

-msgid "Hidden Contacts"
+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 ""
 
 msgstr ""
 

-#: ../../mod/contacts.php:473
+#: ../../mod/contacts.php:447
+msgid "Hidden"
+msgstr ""
+
+#: ../../mod/contacts.php:450
+msgid "Only show hidden contacts"
+msgstr ""
+
+#: ../../mod/contacts.php:498

 msgid "Mutual Friendship"
 msgstr ""
 
 msgid "Mutual Friendship"
 msgstr ""
 

-#: ../../mod/contacts.php:477
+#: ../../mod/contacts.php:502

 msgid "is a fan of yours"
 msgstr ""
 
 msgid "is a fan of yours"
 msgstr ""
 

-#: ../../mod/contacts.php:481
+#: ../../mod/contacts.php:506

 msgid "you are a fan of"
 msgstr ""
 
 msgid "you are a fan of"
 msgstr ""
 

-#: ../../mod/contacts.php:498 ../../include/Contact.php:135
-#: ../../include/conversation.php:773
+#: ../../mod/contacts.php:523 ../../mod/nogroup.php:41

 msgid "Edit contact"
 msgstr ""
 
 msgid "Edit contact"
 msgstr ""
 

-#: ../../mod/contacts.php:518 ../../include/nav.php:132
+#: ../../mod/contacts.php:544 ../../view/theme/diabook/theme.php:124
+#: ../../include/nav.php:139

 msgid "Contacts"
 msgstr ""
 
 msgid "Contacts"
 msgstr ""
 

-#: ../../mod/contacts.php:522
+#: ../../mod/contacts.php:548

 msgid "Search your contacts"
 msgstr ""
 
 msgid "Search your contacts"
 msgstr ""
 

-#: ../../mod/contacts.php:523 ../../mod/directory.php:67
+#: ../../mod/contacts.php:549 ../../mod/directory.php:57

 msgid "Finding: "
 msgstr ""
 
 msgid "Finding: "
 msgstr ""
 

-#: ../../mod/contacts.php:524 ../../mod/directory.php:69
-#: ../../include/contact_widgets.php:34
+#: ../../mod/contacts.php:550 ../../mod/directory.php:59
+#: ../../include/contact_widgets.php:33

 msgid "Find"
 msgstr ""
 
 msgid "Find"
 msgstr ""
 


@@ -1571,494 +1677,585 @@ msgstr ""
 msgid "No valid account found."
 msgstr ""
 
 msgid "No valid account found."
 msgstr ""
 

-#: ../../mod/lostpass.php:31
+#: ../../mod/lostpass.php:32

 msgid "Password reset request issued. Check your email."
 msgstr ""
 
 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 ""
 
 #, php-format
 msgid "Password reset requested at %s"
 msgstr ""
 

-#: ../../mod/lostpass.php:44 ../../mod/lostpass.php:106
-#: ../../mod/register.php:380 ../../mod/register.php:434
-#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:716
-#: ../../include/items.php:2513
+#: ../../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 ""
 
 msgid "Administrator"
 msgstr ""
 

-#: ../../mod/lostpass.php:64
+#: ../../mod/lostpass.php:65

 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
 msgstr ""
 
 msgid ""
 "Request could not be verified. (You may have previously submitted it.) "
 "Password reset failed."
 msgstr ""
 

-#: ../../mod/lostpass.php:82 ../../boot.php:723
+#: ../../mod/lostpass.php:83 ../../boot.php:828

 msgid "Password Reset"
 msgstr ""
 
 msgid "Password Reset"
 msgstr ""
 

-#: ../../mod/lostpass.php:83
+#: ../../mod/lostpass.php:84

 msgid "Your password has been reset as requested."
 msgstr ""
 
 msgid "Your password has been reset as requested."
 msgstr ""
 

-#: ../../mod/lostpass.php:84
+#: ../../mod/lostpass.php:85

 msgid "Your new password is"
 msgstr ""
 
 msgid "Your new password is"
 msgstr ""
 

-#: ../../mod/lostpass.php:85
+#: ../../mod/lostpass.php:86

 msgid "Save or copy your new password - and then"
 msgstr ""
 
 msgid "Save or copy your new password - and then"
 msgstr ""
 

-#: ../../mod/lostpass.php:86
+#: ../../mod/lostpass.php:87

 msgid "click here to login"
 msgstr ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 msgid "Nickname or Email: "
 msgstr ""
 

-#: ../../mod/lostpass.php:121
+#: ../../mod/lostpass.php:122

 msgid "Reset"
 msgstr ""
 
 msgid "Reset"
 msgstr ""
 

+#: ../../mod/settings.php:49 ../../include/nav.php:137
+msgid "Account settings"
+msgstr ""
+
+#: ../../mod/settings.php:54
+msgid "Display settings"
+msgstr ""
+
+#: ../../mod/settings.php:60
+msgid "Connector settings"
+msgstr ""
+
+#: ../../mod/settings.php:65
+msgid "Plugin settings"
+msgstr ""
+

 #: ../../mod/settings.php:70
 #: ../../mod/settings.php:70

+msgid "Connected apps"
+msgstr ""
+
+#: ../../mod/settings.php:75
+msgid "Export personal data"
+msgstr ""
+
+#: ../../mod/settings.php:80
+msgid "Remove account"
+msgstr ""
+
+#: ../../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:131

 msgid "Missing some important data!"
 msgstr ""
 
 msgid "Missing some important data!"
 msgstr ""
 

-#: ../../mod/settings.php:73 ../../mod/settings.php:479 ../../mod/admin.php:75
+#: ../../mod/settings.php:134 ../../mod/settings.php:579

 msgid "Update"
 msgstr ""
 
 msgid "Update"
 msgstr ""
 

-#: ../../mod/settings.php:168
+#: ../../mod/settings.php:239

 msgid "Failed to connect with email account using the settings provided."
 msgstr ""
 
 msgid "Failed to connect with email account using the settings provided."
 msgstr ""
 

-#: ../../mod/settings.php:173
+#: ../../mod/settings.php:244

 msgid "Email settings updated."
 msgstr ""
 
 msgid "Email settings updated."
 msgstr ""
 

-#: ../../mod/settings.php:191
+#: ../../mod/settings.php:303

 msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
 

-#: ../../mod/settings.php:196
+#: ../../mod/settings.php:308

 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 

-#: ../../mod/settings.php:207
+#: ../../mod/settings.php:319

 msgid "Password changed."
 msgstr ""
 
 msgid "Password changed."
 msgstr ""
 

-#: ../../mod/settings.php:209
+#: ../../mod/settings.php:321

 msgid "Password update failed. Please try again."
 msgstr ""
 
 msgid "Password update failed. Please try again."
 msgstr ""
 

-#: ../../mod/settings.php:273
+#: ../../mod/settings.php:385

 msgid " Please use a shorter name."
 msgstr ""
 
 msgid " Please use a shorter name."
 msgstr ""
 

-#: ../../mod/settings.php:275
+#: ../../mod/settings.php:387

 msgid " Name too short."
 msgstr ""
 
 msgid " Name too short."
 msgstr ""
 

-#: ../../mod/settings.php:281
+#: ../../mod/settings.php:393

 msgid " Not valid email."
 msgstr ""
 
 msgid " Not valid email."
 msgstr ""
 

-#: ../../mod/settings.php:283
+#: ../../mod/settings.php:395

 msgid " Cannot change to that email."
 msgstr ""
 
 msgid " Cannot change to that email."
 msgstr ""
 

-#: ../../mod/settings.php:351 ../../addon/facebook/facebook.php:321
-#: ../../addon/impressum/impressum.php:64
-#: ../../addon/openstreetmap/openstreetmap.php:80
-#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:350
-msgid "Settings updated."
-msgstr ""
-
-#: ../../mod/settings.php:415 ../../include/nav.php:130
-msgid "Account settings"
-msgstr ""
-
-#: ../../mod/settings.php:420
-msgid "Connector settings"
-msgstr ""
-
-#: ../../mod/settings.php:425
-msgid "Plugin settings"
+#: ../../mod/settings.php:448
+msgid "Private forum has no privacy permissions. Using default privacy group."

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/settings.php:430
-msgid "Connections"
+#: ../../mod/settings.php:452
+msgid "Private forum has no privacy permissions and no default privacy group."

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/settings.php:435
-msgid "Export personal data"
+#: ../../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 ""
 
 msgstr ""
 

-#: ../../mod/settings.php:452 ../../mod/settings.php:478
-#: ../../mod/settings.php:511
+#: ../../mod/settings.php:552 ../../mod/settings.php:578
+#: ../../mod/settings.php:614

 msgid "Add application"
 msgstr ""
 
 msgid "Add application"
 msgstr ""
 

-#: ../../mod/settings.php:456 ../../mod/settings.php:482
-#: ../../addon/statusnet/statusnet.php:526
+#: ../../mod/settings.php:556 ../../mod/settings.php:582
+#: ../../addon/statusnet/statusnet.php:555

 msgid "Consumer Key"
 msgstr ""
 
 msgid "Consumer Key"
 msgstr ""
 

-#: ../../mod/settings.php:457 ../../mod/settings.php:483
-#: ../../addon/statusnet/statusnet.php:525
+#: ../../mod/settings.php:557 ../../mod/settings.php:583
+#: ../../addon/statusnet/statusnet.php:554

 msgid "Consumer Secret"
 msgstr ""
 
 msgid "Consumer Secret"
 msgstr ""
 

-#: ../../mod/settings.php:458 ../../mod/settings.php:484
+#: ../../mod/settings.php:558 ../../mod/settings.php:584

 msgid "Redirect"
 msgstr ""
 
 msgid "Redirect"
 msgstr ""
 

-#: ../../mod/settings.php:459 ../../mod/settings.php:485
+#: ../../mod/settings.php:559 ../../mod/settings.php:585

 msgid "Icon url"
 msgstr ""
 
 msgid "Icon url"
 msgstr ""
 

-#: ../../mod/settings.php:470
+#: ../../mod/settings.php:570

 msgid "You can't edit this application."
 msgstr ""
 
 msgid "You can't edit this application."
 msgstr ""
 

-#: ../../mod/settings.php:510
+#: ../../mod/settings.php:613

 msgid "Connected Apps"
 msgstr ""
 
 msgid "Connected Apps"
 msgstr ""
 

-#: ../../mod/settings.php:514
+#: ../../mod/settings.php:617

 msgid "Client key starts with"
 msgstr ""
 
 msgid "Client key starts with"
 msgstr ""
 

-#: ../../mod/settings.php:515
+#: ../../mod/settings.php:618

 msgid "No name"
 msgstr ""
 
 msgid "No name"
 msgstr ""
 

-#: ../../mod/settings.php:516
+#: ../../mod/settings.php:619

 msgid "Remove authorization"
 msgstr ""
 
 msgid "Remove authorization"
 msgstr ""
 

-#: ../../mod/settings.php:528
+#: ../../mod/settings.php:630

 msgid "No Plugin settings configured"
 msgstr ""
 
 msgid "No Plugin settings configured"
 msgstr ""
 

-#: ../../mod/settings.php:535 ../../addon/widgets/widgets.php:122
+#: ../../mod/settings.php:638 ../../addon/widgets/widgets.php:123

 msgid "Plugin Settings"
 msgstr ""
 
 msgid "Plugin Settings"
 msgstr ""
 

-#: ../../mod/settings.php:548 ../../mod/settings.php:549
+#: ../../mod/settings.php:650 ../../mod/settings.php:651

 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr ""
 
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr ""
 

-#: ../../mod/settings.php:548 ../../mod/settings.php:549
+#: ../../mod/settings.php:650 ../../mod/settings.php:651

 msgid "enabled"
 msgstr ""
 
 msgid "enabled"
 msgstr ""
 

-#: ../../mod/settings.php:548 ../../mod/settings.php:549
+#: ../../mod/settings.php:650 ../../mod/settings.php:651

 msgid "disabled"
 msgstr ""
 
 msgid "disabled"
 msgstr ""
 

-#: ../../mod/settings.php:549
+#: ../../mod/settings.php:651

 msgid "StatusNet"
 msgstr ""
 
 msgid "StatusNet"
 msgstr ""
 

-#: ../../mod/settings.php:575
+#: ../../mod/settings.php:681

 msgid "Connector Settings"
 msgstr ""
 
 msgid "Connector Settings"
 msgstr ""
 

-#: ../../mod/settings.php:581
+#: ../../mod/settings.php:686

 msgid "Email/Mailbox Setup"
 msgstr ""
 
 msgid "Email/Mailbox Setup"
 msgstr ""
 

-#: ../../mod/settings.php:582
+#: ../../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 ""
 
 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:583
+#: ../../mod/settings.php:688

 msgid "Last successful email check:"
 msgstr ""
 
 msgid "Last successful email check:"
 msgstr ""
 

-#: ../../mod/settings.php:584
+#: ../../mod/settings.php:689

 msgid "Email access is disabled on this site."
 msgstr ""
 
 msgid "Email access is disabled on this site."
 msgstr ""
 

-#: ../../mod/settings.php:585
+#: ../../mod/settings.php:690

 msgid "IMAP server name:"
 msgstr ""
 
 msgid "IMAP server name:"
 msgstr ""
 

-#: ../../mod/settings.php:586
+#: ../../mod/settings.php:691

 msgid "IMAP port:"
 msgstr ""
 
 msgid "IMAP port:"
 msgstr ""
 

-#: ../../mod/settings.php:587
+#: ../../mod/settings.php:692

 msgid "Security:"
 msgstr ""
 
 msgid "Security:"
 msgstr ""
 

-#: ../../mod/settings.php:587
+#: ../../mod/settings.php:692 ../../mod/settings.php:697

 msgid "None"
 msgstr ""
 
 msgid "None"
 msgstr ""
 

-#: ../../mod/settings.php:588
+#: ../../mod/settings.php:693

 msgid "Email login name:"
 msgstr ""
 
 msgid "Email login name:"
 msgstr ""
 

-#: ../../mod/settings.php:589
+#: ../../mod/settings.php:694

 msgid "Email password:"
 msgstr ""
 
 msgid "Email password:"
 msgstr ""
 

-#: ../../mod/settings.php:590
+#: ../../mod/settings.php:695

 msgid "Reply-to address:"
 msgstr ""
 
 msgid "Reply-to address:"
 msgstr ""
 

-#: ../../mod/settings.php:591
+#: ../../mod/settings.php:696

 msgid "Send public posts to all email contacts:"
 msgstr ""
 
 msgid "Send public posts to all email contacts:"
 msgstr ""
 

-#: ../../mod/settings.php:648 ../../mod/admin.php:142 ../../mod/admin.php:459
+#: ../../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 ""
 
 msgid "Normal Account"
 msgstr ""
 

-#: ../../mod/settings.php:649
+#: ../../mod/settings.php:836

 msgid "This account is a normal personal profile"
 msgstr ""
 
 msgid "This account is a normal personal profile"
 msgstr ""
 

-#: ../../mod/settings.php:652 ../../mod/admin.php:143 ../../mod/admin.php:460
+#: ../../mod/settings.php:839 ../../mod/admin.php:181 ../../mod/admin.php:622

 msgid "Soapbox Account"
 msgstr ""
 
 msgid "Soapbox Account"
 msgstr ""
 

-#: ../../mod/settings.php:653
+#: ../../mod/settings.php:840

 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr ""
 
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr ""
 

-#: ../../mod/settings.php:656 ../../mod/admin.php:144 ../../mod/admin.php:461
+#: ../../mod/settings.php:843 ../../mod/admin.php:182 ../../mod/admin.php:623

 msgid "Community/Celebrity Account"
 msgstr ""
 
 msgid "Community/Celebrity Account"
 msgstr ""
 

-#: ../../mod/settings.php:657
+#: ../../mod/settings.php:844

 msgid "Automatically approve all connection/friend requests as read-write fans"
 msgstr ""
 
 msgid "Automatically approve all connection/friend requests as read-write fans"
 msgstr ""
 

-#: ../../mod/settings.php:660 ../../mod/admin.php:145 ../../mod/admin.php:462
+#: ../../mod/settings.php:847 ../../mod/admin.php:183 ../../mod/admin.php:624

 msgid "Automatic Friend Account"
 msgstr ""
 
 msgid "Automatic Friend Account"
 msgstr ""
 

-#: ../../mod/settings.php:661
+#: ../../mod/settings.php:848

 msgid "Automatically approve all connection/friend requests as friends"
 msgstr ""
 
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr ""
 

-#: ../../mod/settings.php:671
+#: ../../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 ""
 
 msgid "OpenID:"
 msgstr ""
 

-#: ../../mod/settings.php:671
+#: ../../mod/settings.php:865

 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr ""
 

-#: ../../mod/settings.php:681
+#: ../../mod/settings.php:875

 msgid "Publish your default profile in your local site directory?"
 msgstr ""
 
 msgid "Publish your default profile in your local site directory?"
 msgstr ""
 

-#: ../../mod/settings.php:687
+#: ../../mod/settings.php:881

 msgid "Publish your default profile in the global social directory?"
 msgstr ""
 
 msgid "Publish your default profile in the global social directory?"
 msgstr ""
 

-#: ../../mod/settings.php:695
+#: ../../mod/settings.php:889

 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr ""
 
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr ""
 

-#: ../../mod/settings.php:699
+#: ../../mod/settings.php:893

 msgid "Hide your profile details from unknown viewers?"
 msgstr ""
 
 msgid "Hide your profile details from unknown viewers?"
 msgstr ""
 

-#: ../../mod/settings.php:704
+#: ../../mod/settings.php:898

 msgid "Allow friends to post to your profile page?"
 msgstr ""
 
 msgid "Allow friends to post to your profile page?"
 msgstr ""
 

-#: ../../mod/settings.php:710
+#: ../../mod/settings.php:904

 msgid "Allow friends to tag your posts?"
 msgstr ""
 
 msgid "Allow friends to tag your posts?"
 msgstr ""
 

-#: ../../mod/settings.php:716
+#: ../../mod/settings.php:910

 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 

-#: ../../mod/settings.php:725
+#: ../../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 ""
 
 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 

-#: ../../mod/settings.php:757 ../../mod/profile_photo.php:206
+#: ../../mod/settings.php:933 ../../mod/profile_photo.php:211

 msgid "or"
 msgstr ""
 
 msgid "or"
 msgstr ""
 

-#: ../../mod/settings.php:762
+#: ../../mod/settings.php:938

 msgid "Your Identity Address is"
 msgstr ""
 
 msgid "Your Identity Address is"
 msgstr ""
 

-#: ../../mod/settings.php:773
+#: ../../mod/settings.php:949

 msgid "Automatically expire posts after this many days:"
 msgstr ""
 
 msgid "Automatically expire posts after this many days:"
 msgstr ""
 

-#: ../../mod/settings.php:773
+#: ../../mod/settings.php:949

 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr ""
 
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr ""
 

-#: ../../mod/settings.php:774
+#: ../../mod/settings.php:950

 msgid "Advanced expiration settings"
 msgstr ""
 
 msgid "Advanced expiration settings"
 msgstr ""
 

-#: ../../mod/settings.php:775
+#: ../../mod/settings.php:951

 msgid "Advanced Expiration"
 msgstr ""
 
 msgid "Advanced Expiration"
 msgstr ""
 

-#: ../../mod/settings.php:776
+#: ../../mod/settings.php:952

 msgid "Expire posts:"
 msgstr ""
 
 msgid "Expire posts:"
 msgstr ""
 

-#: ../../mod/settings.php:777
+#: ../../mod/settings.php:953

 msgid "Expire personal notes:"
 msgstr ""
 
 msgid "Expire personal notes:"
 msgstr ""
 

-#: ../../mod/settings.php:778
+#: ../../mod/settings.php:954

 msgid "Expire starred posts:"
 msgstr ""
 
 msgid "Expire starred posts:"
 msgstr ""
 

-#: ../../mod/settings.php:779
+#: ../../mod/settings.php:955

 msgid "Expire photos:"
 msgstr ""
 
 msgid "Expire photos:"
 msgstr ""
 

-#: ../../mod/settings.php:784
+#: ../../mod/settings.php:962

 msgid "Account Settings"
 msgstr ""
 
 msgid "Account Settings"
 msgstr ""
 

-#: ../../mod/settings.php:792
+#: ../../mod/settings.php:970

 msgid "Password Settings"
 msgstr ""
 
 msgid "Password Settings"
 msgstr ""
 

-#: ../../mod/settings.php:793
+#: ../../mod/settings.php:971

 msgid "New Password:"
 msgstr ""
 
 msgid "New Password:"
 msgstr ""
 

-#: ../../mod/settings.php:794
+#: ../../mod/settings.php:972

 msgid "Confirm:"
 msgstr ""
 
 msgid "Confirm:"
 msgstr ""
 

-#: ../../mod/settings.php:794
+#: ../../mod/settings.php:972

 msgid "Leave password fields blank unless changing"
 msgstr ""
 
 msgid "Leave password fields blank unless changing"
 msgstr ""
 

-#: ../../mod/settings.php:798
+#: ../../mod/settings.php:976

 msgid "Basic Settings"
 msgstr ""
 
 msgid "Basic Settings"
 msgstr ""
 

-#: ../../mod/settings.php:799 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:977 ../../include/profile_advanced.php:15

 msgid "Full Name:"
 msgstr ""
 
 msgid "Full Name:"
 msgstr ""
 

-#: ../../mod/settings.php:800
+#: ../../mod/settings.php:978

 msgid "Email Address:"
 msgstr ""
 
 msgid "Email Address:"
 msgstr ""
 

-#: ../../mod/settings.php:801
+#: ../../mod/settings.php:979

 msgid "Your Timezone:"
 msgstr ""
 
 msgid "Your Timezone:"
 msgstr ""
 

-#: ../../mod/settings.php:802
+#: ../../mod/settings.php:980

 msgid "Default Post Location:"
 msgstr ""
 
 msgid "Default Post Location:"
 msgstr ""
 

-#: ../../mod/settings.php:803
+#: ../../mod/settings.php:981

 msgid "Use Browser Location:"
 msgstr ""
 
 msgid "Use Browser Location:"
 msgstr ""
 

-#: ../../mod/settings.php:804
-msgid "Display Theme:"
-msgstr ""
-
-#: ../../mod/settings.php:805
-msgid "Update browser every xx seconds"
-msgstr ""
-
-#: ../../mod/settings.php:805
-msgid "Minimum of 10 seconds, no maximum"
-msgstr ""
-
-#: ../../mod/settings.php:807
+#: ../../mod/settings.php:984

 msgid "Security and Privacy Settings"
 msgstr ""
 
 msgid "Security and Privacy Settings"
 msgstr ""
 

-#: ../../mod/settings.php:809
+#: ../../mod/settings.php:986

 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 

-#: ../../mod/settings.php:809
+#: ../../mod/settings.php:986 ../../mod/settings.php:1005

 msgid "(to prevent spam abuse)"
 msgstr ""
 
 msgid "(to prevent spam abuse)"
 msgstr ""
 

-#: ../../mod/settings.php:810
+#: ../../mod/settings.php:987

 msgid "Default Post Permissions"
 msgstr ""
 
 msgid "Default Post Permissions"
 msgstr ""
 

-#: ../../mod/settings.php:811
+#: ../../mod/settings.php:988

 msgid "(click to open/close)"
 msgstr ""
 
 msgid "(click to open/close)"
 msgstr ""
 

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

 msgid "Notification Settings"
 msgstr ""
 
 msgid "Notification Settings"
 msgstr ""
 

-#: ../../mod/settings.php:827
+#: ../../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 ""
 
 msgid "Send a notification email when:"
 msgstr ""
 

-#: ../../mod/settings.php:828
+#: ../../mod/settings.php:1014

 msgid "You receive an introduction"
 msgstr ""
 
 msgid "You receive an introduction"
 msgstr ""
 

-#: ../../mod/settings.php:829
+#: ../../mod/settings.php:1015

 msgid "Your introductions are confirmed"
 msgstr ""
 
 msgid "Your introductions are confirmed"
 msgstr ""
 

-#: ../../mod/settings.php:830
+#: ../../mod/settings.php:1016

 msgid "Someone writes on your profile wall"
 msgstr ""
 
 msgid "Someone writes on your profile wall"
 msgstr ""
 

-#: ../../mod/settings.php:831
+#: ../../mod/settings.php:1017

 msgid "Someone writes a followup comment"
 msgstr ""
 
 msgid "Someone writes a followup comment"
 msgstr ""
 

-#: ../../mod/settings.php:832
+#: ../../mod/settings.php:1018

 msgid "You receive a private message"
 msgstr ""
 
 msgid "You receive a private message"
 msgstr ""
 

-#: ../../mod/settings.php:833
+#: ../../mod/settings.php:1019

 msgid "You receive a friend suggestion"
 msgstr ""
 
 msgid "You receive a friend suggestion"
 msgstr ""
 

-#: ../../mod/settings.php:834
+#: ../../mod/settings.php:1020

 msgid "You are tagged in a post"
 msgstr ""
 
 msgid "You are tagged in a post"
 msgstr ""
 

-#: ../../mod/settings.php:837
+#: ../../mod/settings.php:1023

 msgid "Advanced Page Settings"
 msgstr ""
 
 msgid "Advanced Page Settings"
 msgstr ""
 


@@ -2080,39 +2277,63 @@ msgstr ""
 msgid "Search Results For:"
 msgstr ""
 
 msgid "Search Results For:"
 msgstr ""
 

-#: ../../mod/network.php:77 ../../mod/search.php:16
+#: ../../mod/network.php:82 ../../mod/search.php:16

 msgid "Remove term"
 msgstr ""
 
 msgid "Remove term"
 msgstr ""
 

-#: ../../mod/network.php:86 ../../mod/search.php:13
+#: ../../mod/network.php:91 ../../mod/search.php:13

 msgid "Saved Searches"
 msgstr ""
 
 msgid "Saved Searches"
 msgstr ""
 

-#: ../../mod/network.php:87 ../../include/group.php:216
+#: ../../mod/network.php:92 ../../include/group.php:244

 msgid "add"
 msgstr ""
 
 msgid "add"
 msgstr ""
 

-#: ../../mod/network.php:166
+#: ../../mod/network.php:171

 msgid "Commented Order"
 msgstr ""
 
 msgid "Commented Order"
 msgstr ""
 

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

 msgid "Posted Order"
 msgstr ""
 
 msgid "Posted Order"
 msgstr ""
 

-#: ../../mod/network.php:182
-msgid "New"
+#: ../../mod/network.php:180
+msgid "Sort by Post Date"

 msgstr ""
 
 #: ../../mod/network.php:187
 msgstr ""
 
 #: ../../mod/network.php:187

+msgid "Posts that mention or involve you"
+msgstr ""
+
+#: ../../mod/network.php:190
+msgid "New"
+msgstr ""
+
+#: ../../mod/network.php:193
+msgid "Activity Stream - by date"
+msgstr ""
+
+#: ../../mod/network.php:196

 msgid "Starred"
 msgstr ""
 
 msgid "Starred"
 msgstr ""
 

-#: ../../mod/network.php:192
-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 ""
 
 msgstr ""
 

-#: ../../mod/network.php:250
+#: ../../mod/network.php:281

 #, php-format
 msgid "Warning: This group contains %s member from an insecure network."
 msgid_plural ""
 #, php-format
 msgid "Warning: This group contains %s member from an insecure network."
 msgid_plural ""


@@ -2120,42 +2341,105 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../../mod/network.php:253
+#: ../../mod/network.php:284

 msgid "Private messages to this group are at risk of public disclosure."
 msgstr ""
 
 msgid "Private messages to this group are at risk of public disclosure."
 msgstr ""
 

-#: ../../mod/network.php:300
+#: ../../mod/network.php:329

 msgid "No such group"
 msgstr ""
 
 msgid "No such group"
 msgstr ""
 

-#: ../../mod/network.php:311
+#: ../../mod/network.php:340

 msgid "Group is empty"
 msgstr ""
 
 msgid "Group is empty"
 msgstr ""
 

-#: ../../mod/network.php:315
+#: ../../mod/network.php:344

 msgid "Group: "
 msgstr ""
 
 msgid "Group: "
 msgstr ""
 

-#: ../../mod/network.php:325
+#: ../../mod/network.php:354

 msgid "Contact: "
 msgstr ""
 
 msgid "Contact: "
 msgstr ""
 

-#: ../../mod/network.php:327
+#: ../../mod/network.php:356

 msgid "Private messages to this person are at risk of public disclosure."
 msgstr ""
 
 msgid "Private messages to this person are at risk of public disclosure."
 msgstr ""
 

-#: ../../mod/network.php:332
+#: ../../mod/network.php:361

 msgid "Invalid contact."
 msgstr ""
 
 msgid "Invalid contact."
 msgstr ""
 

-#: ../../mod/notes.php:44 ../../boot.php:1354
+#: ../../mod/notes.php:44 ../../boot.php:1509

 msgid "Personal Notes"
 msgstr ""
 
 msgid "Personal Notes"
 msgstr ""
 

-#: ../../mod/notes.php:63 ../../include/text.php:639
+#: ../../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 ""
 
 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 Friendica"
 msgstr ""
 #: ../../mod/newmember.php:6
 msgid "Welcome to Friendica"
 msgstr ""


@@ -2174,12 +2458,19 @@ msgstr ""
 
 #: ../../mod/newmember.php:16
 msgid ""
 
 #: ../../mod/newmember.php:16
 msgid ""

+"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 ""
 
 "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:18
+#: ../../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 "
 msgid ""
 "Review the other settings, particularly the privacy settings. An unpublished "
 "directory listing is like having an unlisted phone number. In general, you "


@@ -2187,61 +2478,61 @@ msgid ""
 "potential friends know exactly how to find you."
 msgstr ""
 
 "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 ""
 
 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 ""
 
 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:25
+#: ../../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 ""
 
 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:30
+#: ../../mod/newmember.php:32

 msgid ""
 "Enter your email access information on your Connector Settings page if you "
 "wish to import and interact with friends or mailing lists from your email "
 "INBOX"
 msgstr ""
 
 msgid ""
 "Enter your email access information on your Connector Settings page if you "
 "wish to import and interact with friends or mailing lists from your email "
 "INBOX"
 msgstr ""
 

-#: ../../mod/newmember.php:32
+#: ../../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 ""
 
 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:34
+#: ../../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 ""
 
 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:36
+#: ../../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>Add New Contact</em> dialog."
 msgstr ""
 
 msgid ""
 "Your Contacts page is your gateway to managing friendships and connecting "
 "with friends on other networks. Typically you enter their address or site "
 "URL in the <em>Add New Contact</em> dialog."
 msgstr ""
 

-#: ../../mod/newmember.php:38
+#: ../../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 ""
 
 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:40
+#: ../../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 "
 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 "


@@ -2250,14 +2541,14 @@ msgid ""
 "hours."
 msgstr ""
 
 "hours."
 msgstr ""
 

-#: ../../mod/newmember.php:42
+#: ../../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 ""
 
 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:44
+#: ../../mod/newmember.php:46

 msgid ""
 "Our <strong>help</strong> pages may be consulted for detail on other program "
 "features and resources."
 msgid ""
 "Our <strong>help</strong> pages may be consulted for detail on other program "
 "features and resources."


@@ -2271,54 +2562,54 @@ msgstr ""
 msgid "Item was not found."
 msgstr ""
 
 msgid "Item was not found."
 msgstr ""
 

-#: ../../mod/group.php:27
+#: ../../mod/group.php:29

 msgid "Group created."
 msgstr ""
 
 msgid "Group created."
 msgstr ""
 

-#: ../../mod/group.php:33
+#: ../../mod/group.php:35

 msgid "Could not create group."
 msgstr ""
 
 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 ""
 
 msgid "Group not found."
 msgstr ""
 

-#: ../../mod/group.php:56
+#: ../../mod/group.php:60

 msgid "Group name changed."
 msgstr ""
 
 msgid "Group name changed."
 msgstr ""
 

-#: ../../mod/group.php:67 ../../mod/profperm.php:19 ../../index.php:287
+#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:305

 msgid "Permission denied"
 msgstr ""
 
 msgid "Permission denied"
 msgstr ""
 

-#: ../../mod/group.php:82
+#: ../../mod/group.php:90

 msgid "Create a group of contacts/friends."
 msgstr ""
 
 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 ""
 
 msgid "Group Name: "
 msgstr ""
 

-#: ../../mod/group.php:98
+#: ../../mod/group.php:110

 msgid "Group removed."
 msgstr ""
 
 msgid "Group removed."
 msgstr ""
 

-#: ../../mod/group.php:100
+#: ../../mod/group.php:112

 msgid "Unable to remove group."
 msgstr ""
 
 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 ""
 
 msgid "Group Editor"
 msgstr ""
 

-#: ../../mod/group.php:179
+#: ../../mod/group.php:189

 msgid "Members"
 msgstr ""
 
 msgid "Members"
 msgstr ""
 

+#: ../../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
 msgid "Invalid profile identifier."
 msgstr ""
 #: ../../mod/profperm.php:25 ../../mod/profperm.php:55
 msgid "Invalid profile identifier."
 msgstr ""


@@ -2327,9 +2618,9 @@ msgstr ""
 msgid "Profile Visibility Editor"
 msgstr ""
 
 msgid "Profile Visibility Editor"
 msgstr ""
 

-#: ../../mod/profperm.php:103 ../../include/profile_advanced.php:7
-#: ../../include/profile_advanced.php:76 ../../include/nav.php:48
-#: ../../boot.php:1336
+#: ../../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 ""
 
 msgid "Profile"
 msgstr ""
 


@@ -2345,177 +2636,185 @@ msgstr ""
 msgid "No contacts."
 msgstr ""
 
 msgid "No contacts."
 msgstr ""
 

-#: ../../mod/viewcontacts.php:73 ../../include/text.php:578
+#: ../../mod/viewcontacts.php:76 ../../include/text.php:589

 msgid "View Contacts"
 msgstr ""
 
 msgid "View Contacts"
 msgstr ""
 

-#: ../../mod/register.php:62
+#: ../../mod/register.php:64

 msgid "An invitation is required."
 msgstr ""
 
 msgid "An invitation is required."
 msgstr ""
 

-#: ../../mod/register.php:67
+#: ../../mod/register.php:69

 msgid "Invitation could not be verified."
 msgstr ""
 
 msgid "Invitation could not be verified."
 msgstr ""
 

-#: ../../mod/register.php:75
+#: ../../mod/register.php:77

 msgid "Invalid OpenID url"
 msgstr ""
 
 msgid "Invalid OpenID url"
 msgstr ""
 

-#: ../../mod/register.php:90
+#: ../../mod/register.php:92

 msgid "Please enter the required information."
 msgstr ""
 
 msgid "Please enter the required information."
 msgstr ""
 

-#: ../../mod/register.php:104
+#: ../../mod/register.php:106

 msgid "Please use a shorter name."
 msgstr ""
 
 msgid "Please use a shorter name."
 msgstr ""
 

-#: ../../mod/register.php:106
+#: ../../mod/register.php:108

 msgid "Name too short."
 msgstr ""
 
 msgid "Name too short."
 msgstr ""
 

-#: ../../mod/register.php:121
+#: ../../mod/register.php:123

 msgid "That doesn't appear to be your full (First Last) name."
 msgstr ""
 
 msgid "That doesn't appear to be your full (First Last) name."
 msgstr ""
 

-#: ../../mod/register.php:126
+#: ../../mod/register.php:128

 msgid "Your email domain is not among those allowed on this site."
 msgstr ""
 
 msgid "Your email domain is not among those allowed on this site."
 msgstr ""
 

-#: ../../mod/register.php:129
+#: ../../mod/register.php:131

 msgid "Not a valid email address."
 msgstr ""
 
 msgid "Not a valid email address."
 msgstr ""
 

-#: ../../mod/register.php:139
+#: ../../mod/register.php:141

 msgid "Cannot use that email."
 msgstr ""
 
 msgid "Cannot use that email."
 msgstr ""
 

-#: ../../mod/register.php:145
+#: ../../mod/register.php:147

 msgid ""
 "Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
 "must also begin with a letter."
 msgstr ""
 
 msgid ""
 "Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
 "must also begin with a letter."
 msgstr ""
 

-#: ../../mod/register.php:151 ../../mod/register.php:252
+#: ../../mod/register.php:153 ../../mod/register.php:243

 msgid "Nickname is already registered. Please choose another."
 msgstr ""
 
 msgid "Nickname is already registered. Please choose another."
 msgstr ""
 

-#: ../../mod/register.php:170
+#: ../../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 ""
 
 msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr ""
 

-#: ../../mod/register.php:238
+#: ../../mod/register.php:229

 msgid "An error occurred during registration. Please try again."
 msgstr ""
 
 msgid "An error occurred during registration. Please try again."
 msgstr ""
 

-#: ../../mod/register.php:274
+#: ../../mod/register.php:265

 msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
 
 msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
 

-#: ../../mod/register.php:378 ../../mod/regmod.php:52
+#: ../../mod/register.php:365 ../../mod/regmod.php:52

 #, php-format
 msgid "Registration details for %s"
 msgstr ""
 
 #, php-format
 msgid "Registration details for %s"
 msgstr ""
 

-#: ../../mod/register.php:386
+#: ../../mod/register.php:373

 msgid ""
 "Registration successful. Please check your email for further instructions."
 msgstr ""
 
 msgid ""
 "Registration successful. Please check your email for further instructions."
 msgstr ""
 

-#: ../../mod/register.php:390
+#: ../../mod/register.php:377

 msgid "Failed to send email message. Here is the message that failed."
 msgstr ""
 
 msgid "Failed to send email message. Here is the message that failed."
 msgstr ""
 

-#: ../../mod/register.php:395
+#: ../../mod/register.php:382

 msgid "Your registration can not be processed."
 msgstr ""
 
 msgid "Your registration can not be processed."
 msgstr ""
 

-#: ../../mod/register.php:432
+#: ../../mod/register.php:419

 #, php-format
 msgid "Registration request at %s"
 msgstr ""
 
 #, php-format
 msgid "Registration request at %s"
 msgstr ""
 

-#: ../../mod/register.php:441
+#: ../../mod/register.php:428

 msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
 msgid "Your registration is pending approval by the site owner."
 msgstr ""
 

-#: ../../mod/register.php:479
+#: ../../mod/register.php:466

 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr ""
 
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr ""
 

-#: ../../mod/register.php:505
+#: ../../mod/register.php:492

 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
 msgstr ""
 
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
 msgstr ""
 

-#: ../../mod/register.php:506
+#: ../../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 ""
 
 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:507
+#: ../../mod/register.php:494

 msgid "Your OpenID (optional): "
 msgstr ""
 
 msgid "Your OpenID (optional): "
 msgstr ""
 

-#: ../../mod/register.php:521
+#: ../../mod/register.php:508

 msgid "Include your profile in member directory?"
 msgstr ""
 
 msgid "Include your profile in member directory?"
 msgstr ""
 

-#: ../../mod/register.php:536
+#: ../../mod/register.php:528

 msgid "Membership on this site is by invitation only."
 msgstr ""
 
 msgid "Membership on this site is by invitation only."
 msgstr ""
 

-#: ../../mod/register.php:537
+#: ../../mod/register.php:529

 msgid "Your invitation ID: "
 msgstr ""
 
 msgid "Your invitation ID: "
 msgstr ""
 

-#: ../../mod/register.php:540 ../../mod/admin.php:313
+#: ../../mod/register.php:532 ../../mod/admin.php:405

 msgid "Registration"
 msgstr ""
 
 msgid "Registration"
 msgstr ""
 

-#: ../../mod/register.php:548
+#: ../../mod/register.php:540

 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr ""
 
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr ""
 

-#: ../../mod/register.php:549
+#: ../../mod/register.php:541

 msgid "Your Email Address: "
 msgstr ""
 
 msgid "Your Email Address: "
 msgstr ""
 

-#: ../../mod/register.php:550
+#: ../../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 ""
 
 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:551
+#: ../../mod/register.php:543

 msgid "Choose a nickname: "
 msgstr ""
 
 msgid "Choose a nickname: "
 msgstr ""
 

-#: ../../mod/register.php:554 ../../include/nav.php:77 ../../boot.php:693
+#: ../../mod/register.php:546 ../../include/nav.php:81 ../../boot.php:794

 msgid "Register"
 msgstr ""
 
 msgid "Register"
 msgstr ""
 

-#: ../../mod/dirfind.php:23
+#: ../../mod/dirfind.php:26

 msgid "People Search"
 msgstr ""
 
 #: ../../mod/like.php:127 ../../mod/tagger.php:70
 msgid "People Search"
 msgstr ""
 
 #: ../../mod/like.php:127 ../../mod/tagger.php:70

-#: ../../addon/facebook/facebook.php:1092
+#: ../../addon/facebook/facebook.php:1572

 #: ../../addon/communityhome/communityhome.php:158
 #: ../../addon/communityhome/communityhome.php:167
 #: ../../addon/communityhome/communityhome.php:158
 #: ../../addon/communityhome/communityhome.php:167

-#: ../../include/diaspora.php:1600 ../../include/conversation.php:48
-#: ../../include/conversation.php:57 ../../include/conversation.php:121
-#: ../../include/conversation.php:130
+#: ../../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 ""
 
 msgid "status"
 msgstr ""
 

-#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1096
+#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1576

 #: ../../addon/communityhome/communityhome.php:172
 #: ../../addon/communityhome/communityhome.php:172

-#: ../../include/diaspora.php:1616 ../../include/conversation.php:65
+#: ../../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 ""
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr ""


@@ -2525,27 +2824,35 @@ msgstr ""
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 

-#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:127
-#: ../../mod/admin.php:518 ../../mod/admin.php:694 ../../mod/display.php:29
-#: ../../mod/display.php:134 ../../mod/viewd.php:14
-#: ../../include/items.php:2880
+#: ../../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 ""
 
 msgid "Item not found."
 msgstr ""
 

-#: ../../mod/viewsrc.php:7 ../../mod/viewd.php:6
+#: ../../mod/viewsrc.php:7

 msgid "Access denied."
 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:61
 msgid "Account approved."
 msgstr ""
 

-#: ../../mod/regmod.php:93
+#: ../../mod/regmod.php:98

 #, php-format
 msgid "Registration revoked for %s"
 msgstr ""
 
 #, php-format
 msgid "Registration revoked for %s"
 msgstr ""
 

-#: ../../mod/regmod.php:105
+#: ../../mod/regmod.php:110

 msgid "Please login."
 msgstr ""
 
 msgid "Please login."
 msgstr ""
 


@@ -2553,100 +2860,100 @@ msgstr ""
 msgid "Unable to locate original post."
 msgstr ""
 
 msgid "Unable to locate original post."
 msgstr ""
 

-#: ../../mod/item.php:249
+#: ../../mod/item.php:258

 msgid "Empty post discarded."
 msgstr ""
 
 msgid "Empty post discarded."
 msgstr ""
 

-#: ../../mod/item.php:351 ../../mod/wall_upload.php:81
-#: ../../mod/wall_upload.php:90 ../../mod/wall_upload.php:97
-#: ../../include/message.php:143
+#: ../../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 ""
 
 msgid "Wall Photos"
 msgstr ""
 

-#: ../../mod/item.php:830
+#: ../../mod/item.php:790

 msgid "System error. Post not saved."
 msgstr ""
 
 msgid "System error. Post not saved."
 msgstr ""
 

-#: ../../mod/item.php:855
+#: ../../mod/item.php:815

 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social network."
 msgstr ""
 
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social network."
 msgstr ""
 

-#: ../../mod/item.php:857
+#: ../../mod/item.php:817

 #, php-format
 msgid "You may visit them online at %s"
 msgstr ""
 
 #, php-format
 msgid "You may visit them online at %s"
 msgstr ""
 

-#: ../../mod/item.php:858
+#: ../../mod/item.php:818

 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr ""
 
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr ""
 

-#: ../../mod/item.php:860
+#: ../../mod/item.php:820

 #, php-format
 msgid "%s posted an update."
 msgstr ""
 
 #, 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 ""
 
 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 ""
 
 #, 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 ""
 
 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 ""
 
 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 ""
 
 #, php-format
 msgid "Image exceeds size limit of %d"
 msgstr ""
 

-#: ../../mod/profile_photo.php:203
+#: ../../mod/profile_photo.php:207

 msgid "Upload File:"
 msgstr ""
 
 msgid "Upload File:"
 msgstr ""
 

-#: ../../mod/profile_photo.php:204
+#: ../../mod/profile_photo.php:208

 msgid "Upload Profile Photo"
 msgstr ""
 
 msgid "Upload Profile Photo"
 msgstr ""
 

-#: ../../mod/profile_photo.php:205
+#: ../../mod/profile_photo.php:209

 msgid "Upload"
 msgstr ""
 
 msgid "Upload"
 msgstr ""
 

-#: ../../mod/profile_photo.php:206
+#: ../../mod/profile_photo.php:211

 msgid "skip this step"
 msgstr ""
 
 msgid "skip this step"
 msgstr ""
 

-#: ../../mod/profile_photo.php:206
+#: ../../mod/profile_photo.php:211

 msgid "select a photo from your photo albums"
 msgstr ""
 
 msgid "select a photo from your photo albums"
 msgstr ""
 

-#: ../../mod/profile_photo.php:219
+#: ../../mod/profile_photo.php:224

 msgid "Crop Image"
 msgstr ""
 
 msgid "Crop Image"
 msgstr ""
 

-#: ../../mod/profile_photo.php:220
+#: ../../mod/profile_photo.php:225

 msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 

-#: ../../mod/profile_photo.php:221
+#: ../../mod/profile_photo.php:227

 msgid "Done Editing"
 msgstr ""
 
 msgid "Done Editing"
 msgstr ""
 

-#: ../../mod/profile_photo.php:249
+#: ../../mod/profile_photo.php:255

 msgid "Image uploaded successfully."
 msgstr ""
 
 msgid "Image uploaded successfully."
 msgstr ""
 


@@ -2668,88 +2975,71 @@ msgstr ""
 msgid "Please enter your password for verification:"
 msgstr ""
 
 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 ""
 
 msgstr ""
 

-#: ../../mod/message.php:26
+#: ../../mod/message.php:69

 msgid "Unable to locate contact information."
 msgstr ""
 
 msgid "Unable to locate contact information."
 msgstr ""
 

-#: ../../mod/message.php:29
-msgid "Message could not be sent."
-msgstr ""
-
-#: ../../mod/message.php:32
-msgid "Message collection failure."
-msgstr ""
-
-#: ../../mod/message.php:35
-msgid "Message sent."
-msgstr ""
-
-#: ../../mod/message.php:55
-msgid "Inbox"
-msgstr ""
-
-#: ../../mod/message.php:60
-msgid "Outbox"
-msgstr ""
-
-#: ../../mod/message.php:65
-msgid "New Message"
-msgstr ""
-
-#: ../../mod/message.php:91
+#: ../../mod/message.php:119

 msgid "Message deleted."
 msgstr ""
 
 msgid "Message deleted."
 msgstr ""
 

-#: ../../mod/message.php:121
+#: ../../mod/message.php:149

 msgid "Conversation removed."
 msgstr ""
 
 msgid "Conversation removed."
 msgstr ""
 

-#: ../../mod/message.php:137 ../../include/conversation.php:868
-msgid "Please enter a link URL:"
-msgstr ""
-
-#: ../../mod/message.php:145
-msgid "Send Private Message"
-msgstr ""
-
-#: ../../mod/message.php:146 ../../mod/message.php:287
-msgid "To:"
+#: ../../mod/message.php:245
+msgid "No messages."

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/message.php:147 ../../mod/message.php:288
-msgid "Subject:"
+#: ../../mod/message.php:252
+#, php-format
+msgid "Unknown sender - %s"

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/message.php:150 ../../mod/message.php:291
-#: ../../mod/invite.php:101
-msgid "Your message:"
+#: ../../mod/message.php:255
+#, php-format
+msgid "You and %s"

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/message.php:188
-msgid "No messages."
+#: ../../mod/message.php:258
+#, php-format
+msgid "%s and You"

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/message.php:201
+#: ../../mod/message.php:268 ../../mod/message.php:390

 msgid "Delete conversation"
 msgstr ""
 
 msgid "Delete conversation"
 msgstr ""
 

-#: ../../mod/message.php:204
+#: ../../mod/message.php:271

 msgid "D, d M Y - g:i A"
 msgstr ""
 
 msgid "D, d M Y - g:i A"
 msgstr ""
 

-#: ../../mod/message.php:239
+#: ../../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 ""
 
 msgid "Message not available."
 msgstr ""
 

-#: ../../mod/message.php:276
+#: ../../mod/message.php:373

 msgid "Delete message"
 msgstr ""
 
 msgid "Delete message"
 msgstr ""
 

-#: ../../mod/message.php:286
+#: ../../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 ""
 
 msgid "Send Reply"
 msgstr ""
 


@@ -2762,468 +3052,707 @@ msgstr ""
 msgid "No friends to display."
 msgstr ""
 
 msgid "No friends to display."
 msgstr ""
 

-#: ../../mod/admin.php:71 ../../mod/admin.php:311
+#: ../../mod/admin.php:55
+msgid "Theme settings updated."
+msgstr ""
+
+#: ../../mod/admin.php:96 ../../mod/admin.php:403

 msgid "Site"
 msgstr ""
 
 msgid "Site"
 msgstr ""
 

-#: ../../mod/admin.php:72 ../../mod/admin.php:476 ../../mod/admin.php:488
+#: ../../mod/admin.php:97 ../../mod/admin.php:639 ../../mod/admin.php:651

 msgid "Users"
 msgstr ""
 
 msgid "Users"
 msgstr ""
 

-#: ../../mod/admin.php:73 ../../mod/admin.php:565 ../../mod/admin.php:602
+#: ../../mod/admin.php:98 ../../mod/admin.php:733 ../../mod/admin.php:775

 msgid "Plugins"
 msgstr ""
 
 msgid "Plugins"
 msgstr ""
 

-#: ../../mod/admin.php:74 ../../mod/admin.php:736 ../../mod/admin.php:768
+#: ../../mod/admin.php:99 ../../mod/admin.php:938 ../../mod/admin.php:974

 msgid "Themes"
 msgstr ""
 
 msgid "Themes"
 msgstr ""
 

-#: ../../mod/admin.php:89 ../../mod/admin.php:846
+#: ../../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 ""
 
 msgid "Logs"
 msgstr ""
 

-#: ../../mod/admin.php:94
+#: ../../mod/admin.php:120

 msgid "User registrations waiting for confirmation"
 msgstr ""
 
 msgid "User registrations waiting for confirmation"
 msgstr ""
 

-#: ../../mod/admin.php:160 ../../mod/admin.php:310 ../../mod/admin.php:475
-#: ../../mod/admin.php:564 ../../mod/admin.php:601 ../../mod/admin.php:735
-#: ../../mod/admin.php:767 ../../mod/admin.php:845
+#: ../../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 ""
 
 msgid "Administration"
 msgstr ""
 

-#: ../../mod/admin.php:161
+#: ../../mod/admin.php:196

 msgid "Summary"
 msgstr ""
 
 msgid "Summary"
 msgstr ""
 

-#: ../../mod/admin.php:162
+#: ../../mod/admin.php:197

 msgid "Registered users"
 msgstr ""
 
 msgid "Registered users"
 msgstr ""
 

-#: ../../mod/admin.php:164
+#: ../../mod/admin.php:199

 msgid "Pending registrations"
 msgstr ""
 
 msgid "Pending registrations"
 msgstr ""
 

-#: ../../mod/admin.php:165
+#: ../../mod/admin.php:200

 msgid "Version"
 msgstr ""
 
 msgid "Version"
 msgstr ""
 

-#: ../../mod/admin.php:167
+#: ../../mod/admin.php:202

 msgid "Active plugins"
 msgstr ""
 
 msgid "Active plugins"
 msgstr ""
 

-#: ../../mod/admin.php:259
+#: ../../mod/admin.php:341

 msgid "Site settings updated."
 msgstr ""
 
 msgid "Site settings updated."
 msgstr ""
 

-#: ../../mod/admin.php:303
+#: ../../mod/admin.php:389

 msgid "Closed"
 msgstr ""
 
 msgid "Closed"
 msgstr ""
 

-#: ../../mod/admin.php:304
+#: ../../mod/admin.php:390

 msgid "Requires approval"
 msgstr ""
 
 msgid "Requires approval"
 msgstr ""
 

-#: ../../mod/admin.php:305
+#: ../../mod/admin.php:391

 msgid "Open"
 msgstr ""
 
 msgid "Open"
 msgstr ""
 

-#: ../../mod/admin.php:314
+#: ../../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 ""
 
 msgid "File upload"
 msgstr ""
 

-#: ../../mod/admin.php:315
+#: ../../mod/admin.php:407

 msgid "Policies"
 msgstr ""
 
 msgid "Policies"
 msgstr ""
 

-#: ../../mod/admin.php:316
+#: ../../mod/admin.php:408

 msgid "Advanced"
 msgstr ""
 
 msgid "Advanced"
 msgstr ""
 

-#: ../../mod/admin.php:320 ../../addon/statusnet/statusnet.php:523
+#: ../../mod/admin.php:412 ../../addon/statusnet/statusnet.php:552

 msgid "Site name"
 msgstr ""
 
 msgid "Site name"
 msgstr ""
 

-#: ../../mod/admin.php:321
+#: ../../mod/admin.php:413

 msgid "Banner/Logo"
 msgstr ""
 
 msgid "Banner/Logo"
 msgstr ""
 

-#: ../../mod/admin.php:322
+#: ../../mod/admin.php:414

 msgid "System language"
 msgstr ""
 
 msgid "System language"
 msgstr ""
 

-#: ../../mod/admin.php:323
+#: ../../mod/admin.php:415

 msgid "System theme"
 msgstr ""
 
 msgid "System theme"
 msgstr ""
 

-#: ../../mod/admin.php:325
+#: ../../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:416
+msgid "SSL link policy"
+msgstr ""
+
+#: ../../mod/admin.php:416
+msgid "Determines whether generated links should be forced to use SSL"
+msgstr ""
+
+#: ../../mod/admin.php:417

 msgid "Maximum image size"
 msgstr ""
 
 msgid "Maximum image size"
 msgstr ""
 

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

 msgid "Register policy"
 msgstr ""
 
 msgid "Register policy"
 msgstr ""
 

-#: ../../mod/admin.php:328
+#: ../../mod/admin.php:420

 msgid "Register text"
 msgstr ""
 
 msgid "Register text"
 msgstr ""
 

-#: ../../mod/admin.php:329
+#: ../../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 ""
 
 msgid "Accounts abandoned after x days"
 msgstr ""
 

-#: ../../mod/admin.php:329
+#: ../../mod/admin.php:421

 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 

-#: ../../mod/admin.php:330
+#: ../../mod/admin.php:422

 msgid "Allowed friend domains"
 msgstr ""
 
 msgid "Allowed friend domains"
 msgstr ""
 

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

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

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

-#: ../../mod/admin.php:334
+#: ../../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 ""
 
 msgid "Global directory update URL"
 msgstr ""
 

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

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

 msgid "OpenID support"
 msgstr ""
 
 msgid "OpenID support"
 msgstr ""
 

-#: ../../mod/admin.php:338
-msgid "Gravatar support"
+#: ../../mod/admin.php:429
+msgid "OpenID support for registration and logins."

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/admin.php:339
+#: ../../mod/admin.php:430

 msgid "Fullname check"
 msgstr ""
 
 msgid "Fullname check"
 msgstr ""
 

-#: ../../mod/admin.php:340
+#: ../../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 ""
 
 msgid "UTF-8 Regular expressions"
 msgstr ""
 

-#: ../../mod/admin.php:341
+#: ../../mod/admin.php:431
+msgid "Use PHP UTF8 regular expressions"
+msgstr ""
+
+#: ../../mod/admin.php:432

 msgid "Show Community Page"
 msgstr ""
 
 msgid "Show Community Page"
 msgstr ""
 

-#: ../../mod/admin.php:342
+#: ../../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 ""
 
 msgid "Enable OStatus support"
 msgstr ""
 

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

-#: ../../mod/admin.php:344
+#: ../../mod/admin.php:434
+msgid "Provide built-in Diaspora network compatibility."
+msgstr ""
+
+#: ../../mod/admin.php:435

 msgid "Only allow Friendica contacts"
 msgstr ""
 
 msgid "Only allow Friendica contacts"
 msgstr ""
 

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

 msgid "Verify SSL"
 msgstr ""
 
 msgid "Verify SSL"
 msgstr ""
 

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

-#: ../../mod/admin.php:347
+#: ../../mod/admin.php:438

 msgid "Proxy URL"
 msgstr ""
 
 msgid "Proxy URL"
 msgstr ""
 

-#: ../../mod/admin.php:348
+#: ../../mod/admin.php:439

 msgid "Network timeout"
 msgstr ""
 
 msgid "Network timeout"
 msgstr ""
 

-#: ../../mod/admin.php:369
+#: ../../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
 #, php-format

-msgid "%s user blocked"
+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/unblocked"

 msgid_plural "%s users blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../../mod/admin.php:376
+#: ../../mod/admin.php:530

 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] ""
 msgstr[1] ""
 
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../../mod/admin.php:410
+#: ../../mod/admin.php:569

 #, php-format
 msgid "User '%s' deleted"
 msgstr ""
 
 #, php-format
 msgid "User '%s' deleted"
 msgstr ""
 

-#: ../../mod/admin.php:417
+#: ../../mod/admin.php:577

 #, php-format
 msgid "User '%s' unblocked"
 msgstr ""
 
 #, php-format
 msgid "User '%s' unblocked"
 msgstr ""
 

-#: ../../mod/admin.php:417
+#: ../../mod/admin.php:577

 #, php-format
 msgid "User '%s' blocked"
 msgstr ""
 
 #, php-format
 msgid "User '%s' blocked"
 msgstr ""
 

-#: ../../mod/admin.php:478
+#: ../../mod/admin.php:641

 msgid "select all"
 msgstr ""
 
 msgid "select all"
 msgstr ""
 

-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:642

 msgid "User registrations waiting for confirm"
 msgstr ""
 
 msgid "User registrations waiting for confirm"
 msgstr ""
 

-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:643

 msgid "Request date"
 msgstr ""
 
 msgid "Request date"
 msgstr ""
 

-#: ../../mod/admin.php:480 ../../mod/admin.php:489
+#: ../../mod/admin.php:643 ../../mod/admin.php:652

 #: ../../include/contact_selectors.php:79
 msgid "Email"
 msgstr ""
 
 #: ../../include/contact_selectors.php:79
 msgid "Email"
 msgstr ""
 

-#: ../../mod/admin.php:481
+#: ../../mod/admin.php:644

 msgid "No registrations."
 msgstr ""
 
 msgid "No registrations."
 msgstr ""
 

-#: ../../mod/admin.php:483
+#: ../../mod/admin.php:646

 msgid "Deny"
 msgstr ""
 
 msgid "Deny"
 msgstr ""
 

-#: ../../mod/admin.php:489
+#: ../../mod/admin.php:652

 msgid "Register date"
 msgstr ""
 
 msgid "Register date"
 msgstr ""
 

-#: ../../mod/admin.php:489
+#: ../../mod/admin.php:652

 msgid "Last login"
 msgstr ""
 
 msgid "Last login"
 msgstr ""
 

-#: ../../mod/admin.php:489
+#: ../../mod/admin.php:652

 msgid "Last item"
 msgstr ""
 
 msgid "Last item"
 msgstr ""
 

-#: ../../mod/admin.php:489
+#: ../../mod/admin.php:652

 msgid "Account"
 msgstr ""
 
 msgid "Account"
 msgstr ""
 

-#: ../../mod/admin.php:491
+#: ../../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 ""
 
 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:492
+#: ../../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 ""
 
 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:528
+#: ../../mod/admin.php:696

 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 
 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 

-#: ../../mod/admin.php:532
+#: ../../mod/admin.php:700

 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 
 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 

-#: ../../mod/admin.php:542 ../../mod/admin.php:718
+#: ../../mod/admin.php:710 ../../mod/admin.php:908

 msgid "Disable"
 msgstr ""
 
 msgid "Disable"
 msgstr ""
 

-#: ../../mod/admin.php:544 ../../mod/admin.php:720
+#: ../../mod/admin.php:712 ../../mod/admin.php:910

 msgid "Enable"
 msgstr ""
 
 msgid "Enable"
 msgstr ""
 

-#: ../../mod/admin.php:566 ../../mod/admin.php:737
+#: ../../mod/admin.php:734 ../../mod/admin.php:939

 msgid "Toggle"
 msgstr ""
 
 msgid "Toggle"
 msgstr ""
 

-#: ../../mod/admin.php:567 ../../mod/admin.php:738 ../../include/nav.php:130
-msgid "Settings"
+#: ../../mod/admin.php:742 ../../mod/admin.php:949
+msgid "Author: "
+msgstr ""
+
+#: ../../mod/admin.php:743 ../../mod/admin.php:950
+msgid "Maintainer: "

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/admin.php:683
+#: ../../mod/admin.php:872

 msgid "No themes found."
 msgstr ""
 
 msgid "No themes found."
 msgstr ""
 

-#: ../../mod/admin.php:795
+#: ../../mod/admin.php:931
+msgid "Screenshot"
+msgstr ""
+
+#: ../../mod/admin.php:979
+msgid "[Experimental]"
+msgstr ""
+
+#: ../../mod/admin.php:980
+msgid "[Unsupported]"
+msgstr ""
+
+#: ../../mod/admin.php:1007

 msgid "Log settings updated."
 msgstr ""
 
 msgid "Log settings updated."
 msgstr ""
 

-#: ../../mod/admin.php:848
+#: ../../mod/admin.php:1063

 msgid "Clear"
 msgstr ""
 
 msgid "Clear"
 msgstr ""
 

-#: ../../mod/admin.php:854
+#: ../../mod/admin.php:1069

 msgid "Debugging"
 msgstr ""
 
 msgid "Debugging"
 msgstr ""
 

-#: ../../mod/admin.php:855
+#: ../../mod/admin.php:1070

 msgid "Log file"
 msgstr ""
 
 msgid "Log file"
 msgstr ""
 

-#: ../../mod/admin.php:855
+#: ../../mod/admin.php:1070

 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr ""
 
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr ""
 

-#: ../../mod/admin.php:856
+#: ../../mod/admin.php:1071

 msgid "Log level"
 msgstr ""
 
 msgid "Log level"
 msgstr ""
 

-#: ../../mod/admin.php:897
+#: ../../mod/admin.php:1121

 msgid "Close"
 msgstr ""
 
 msgid "Close"
 msgstr ""
 

-#: ../../mod/admin.php:903
+#: ../../mod/admin.php:1127

 msgid "FTP Host"
 msgstr ""
 
 msgid "FTP Host"
 msgstr ""
 

-#: ../../mod/admin.php:904
+#: ../../mod/admin.php:1128

 msgid "FTP Path"
 msgstr ""
 
 msgid "FTP Path"
 msgstr ""
 

-#: ../../mod/admin.php:905
+#: ../../mod/admin.php:1129

 msgid "FTP User"
 msgstr ""
 
 msgid "FTP User"
 msgstr ""
 

-#: ../../mod/admin.php:906
+#: ../../mod/admin.php:1130

 msgid "FTP Password"
 msgstr ""
 
 msgid "FTP Password"
 msgstr ""
 

-#: ../../mod/profile.php:15 ../../boot.php:845
+#: ../../mod/profile.php:21 ../../boot.php:959

 msgid "Requested profile is not available."
 msgstr ""
 
 msgid "Requested profile is not available."
 msgstr ""
 

-#: ../../mod/profile.php:111 ../../mod/display.php:67
+#: ../../mod/profile.php:126 ../../mod/display.php:75

 msgid "Access to this profile has been restricted."
 msgstr ""
 
 msgid "Access to this profile has been restricted."
 msgstr ""
 

-#: ../../mod/profile.php:131
+#: ../../mod/profile.php:151

 msgid "Tips for New Members"
 msgstr ""
 
 msgid "Tips for New Members"
 msgstr ""
 

-#: ../../mod/ping.php:146
+#: ../../mod/ping.php:177

 msgid "{0} wants to be your friend"
 msgstr ""
 
 msgid "{0} wants to be your friend"
 msgstr ""
 

-#: ../../mod/ping.php:151
+#: ../../mod/ping.php:182

 msgid "{0} sent you a message"
 msgstr ""
 
 msgid "{0} sent you a message"
 msgstr ""
 

-#: ../../mod/ping.php:156
+#: ../../mod/ping.php:187

 msgid "{0} requested registration"
 msgstr ""
 
 msgid "{0} requested registration"
 msgstr ""
 

-#: ../../mod/ping.php:162
+#: ../../mod/ping.php:193

 #, php-format
 msgid "{0} commented %s's post"
 msgstr ""
 
 #, 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 ""
 
 #, 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 ""
 
 #, 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 ""
 
 #, php-format
 msgid "{0} is now friends with %s"
 msgstr ""
 

-#: ../../mod/ping.php:182
+#: ../../mod/ping.php:213

 msgid "{0} posted"
 msgstr ""
 
 msgid "{0} posted"
 msgstr ""
 

-#: ../../mod/ping.php:187
+#: ../../mod/ping.php:218

 #, php-format
 msgid "{0} tagged %s's post with #%s"
 msgstr ""
 
 #, php-format
 msgid "{0} tagged %s's post with #%s"
 msgstr ""
 

-#: ../../mod/ping.php:193
+#: ../../mod/ping.php:224

 msgid "{0} mentioned you in a post"
 msgstr ""
 
 msgid "{0} mentioned you in a post"
 msgstr ""
 

-#: ../../mod/openid.php:63 ../../mod/openid.php:77 ../../include/auth.php:90
-#: ../../include/auth.php:115 ../../include/auth.php:169
+#: ../../mod/nogroup.php:58
+msgid "Contacts who are not members of a group"
+msgstr ""
+
+#: ../../mod/openid.php:24
+msgid "OpenID protocol error. No ID returned."
+msgstr ""
+
+#: ../../mod/openid.php:53
+msgid ""
+"Account not found and OpenID registration is not permitted on this site."
+msgstr ""
+
+#: ../../mod/openid.php:93 ../../include/auth.php:90
+#: ../../include/auth.php:153

 msgid "Login failed."
 msgstr ""
 
 msgid "Login failed."
 msgstr ""
 

-#: ../../mod/follow.php:27
+#: ../../mod/follow.php:30

 msgid "Connect URL missing."
 msgstr ""
 
 msgid "Connect URL missing."
 msgstr ""
 

-#: ../../mod/follow.php:47
+#: ../../mod/follow.php:56

 msgid ""
 "This site is not configured to allow communications with other networks."
 msgstr ""
 
 msgid ""
 "This site is not configured to allow communications with other networks."
 msgstr ""
 

-#: ../../mod/follow.php:48 ../../mod/follow.php:63
+#: ../../mod/follow.php:57 ../../mod/follow.php:72

 msgid "No compatible communication protocols or feeds were discovered."
 msgstr ""
 
 msgid "No compatible communication protocols or feeds were discovered."
 msgstr ""
 

-#: ../../mod/follow.php:61
+#: ../../mod/follow.php:70

 msgid "The profile address specified does not provide adequate information."
 msgstr ""
 
 msgid "The profile address specified does not provide adequate information."
 msgstr ""
 

-#: ../../mod/follow.php:65
+#: ../../mod/follow.php:74

 msgid "An author or name was not found."
 msgstr ""
 
 msgid "An author or name was not found."
 msgstr ""
 

-#: ../../mod/follow.php:67
+#: ../../mod/follow.php:76

 msgid "No browser URL could be matched to this address."
 msgstr ""
 
 msgid "No browser URL could be matched to this address."
 msgstr ""
 

-#: ../../mod/follow.php:74
+#: ../../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 ""
 
 msgid ""
 "The profile address specified belongs to a network which has been disabled "
 "on this site."
 msgstr ""
 

-#: ../../mod/follow.php:79
+#: ../../mod/follow.php:90

 msgid ""
 "Limited profile. This person will be unable to receive direct/personal "
 "notifications from you."
 msgstr ""
 
 msgid ""
 "Limited profile. This person will be unable to receive direct/personal "
 "notifications from you."
 msgstr ""
 

-#: ../../mod/follow.php:149
+#: ../../mod/follow.php:161

 msgid "Unable to retrieve contact information."
 msgstr ""
 
 msgid "Unable to retrieve contact information."
 msgstr ""
 

-#: ../../mod/follow.php:195
+#: ../../mod/follow.php:216

 msgid "following"
 msgstr ""
 
 msgid "following"
 msgstr ""
 

-#: ../../mod/common.php:34
+#: ../../mod/common.php:42

 msgid "Common Friends"
 msgstr ""
 
 msgid "Common Friends"
 msgstr ""
 

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

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/display.php:127
+#: ../../mod/display.php:135

 msgid "Item has been removed."
 msgstr ""
 
 msgid "Item has been removed."
 msgstr ""
 


@@ -3235,226 +3764,297 @@ msgstr ""
 msgid "No installed applications."
 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 ""
 
 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 ""
 
 msgid "Profile not found."
 msgstr ""
 

-#: ../../mod/profiles.php:28
+#: ../../mod/profiles.php:31

 msgid "Profile Name is required."
 msgstr ""
 
 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 ""
 
 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 ""
 
 msgid "Profile deleted."
 msgstr ""
 

-#: ../../mod/profiles.php:272 ../../mod/profiles.php:303
+#: ../../mod/profiles.php:412 ../../mod/profiles.php:446

 msgid "Profile-"
 msgstr ""
 
 msgid "Profile-"
 msgstr ""
 

-#: ../../mod/profiles.php:291 ../../mod/profiles.php:330
+#: ../../mod/profiles.php:431 ../../mod/profiles.php:473

 msgid "New profile created."
 msgstr ""
 
 msgid "New profile created."
 msgstr ""
 

-#: ../../mod/profiles.php:309
+#: ../../mod/profiles.php:452

 msgid "Profile unavailable to clone."
 msgstr ""
 
 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 ""
 
 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 ""
 
 msgid "Edit Profile Details"
 msgstr ""
 

-#: ../../mod/profiles.php:376
+#: ../../mod/profiles.php:535

 msgid "View this profile"
 msgstr ""
 
 msgid "View this profile"
 msgstr ""
 

-#: ../../mod/profiles.php:377
+#: ../../mod/profiles.php:536

 msgid "Create a new profile using these settings"
 msgstr ""
 
 msgid "Create a new profile using these settings"
 msgstr ""
 

-#: ../../mod/profiles.php:378
+#: ../../mod/profiles.php:537

 msgid "Clone this profile"
 msgstr ""
 
 msgid "Clone this profile"
 msgstr ""
 

-#: ../../mod/profiles.php:379
+#: ../../mod/profiles.php:538

 msgid "Delete this profile"
 msgstr ""
 
 msgid "Delete this profile"
 msgstr ""
 

-#: ../../mod/profiles.php:380
+#: ../../mod/profiles.php:539

 msgid "Profile Name:"
 msgstr ""
 
 msgid "Profile Name:"
 msgstr ""
 

-#: ../../mod/profiles.php:381
+#: ../../mod/profiles.php:540

 msgid "Your Full Name:"
 msgstr ""
 
 msgid "Your Full Name:"
 msgstr ""
 

-#: ../../mod/profiles.php:382
+#: ../../mod/profiles.php:541

 msgid "Title/Description:"
 msgstr ""
 
 msgid "Title/Description:"
 msgstr ""
 

-#: ../../mod/profiles.php:383
+#: ../../mod/profiles.php:542

 msgid "Your Gender:"
 msgstr ""
 
 msgid "Your Gender:"
 msgstr ""
 

-#: ../../mod/profiles.php:384
+#: ../../mod/profiles.php:543

 #, php-format
 msgid "Birthday (%s):"
 msgstr ""
 
 #, php-format
 msgid "Birthday (%s):"
 msgstr ""
 

-#: ../../mod/profiles.php:385
+#: ../../mod/profiles.php:544

 msgid "Street Address:"
 msgstr ""
 
 msgid "Street Address:"
 msgstr ""
 

-#: ../../mod/profiles.php:386
+#: ../../mod/profiles.php:545

 msgid "Locality/City:"
 msgstr ""
 
 msgid "Locality/City:"
 msgstr ""
 

-#: ../../mod/profiles.php:387
+#: ../../mod/profiles.php:546

 msgid "Postal/Zip Code:"
 msgstr ""
 
 msgid "Postal/Zip Code:"
 msgstr ""
 

-#: ../../mod/profiles.php:388
+#: ../../mod/profiles.php:547

 msgid "Country:"
 msgstr ""
 
 msgid "Country:"
 msgstr ""
 

-#: ../../mod/profiles.php:389
+#: ../../mod/profiles.php:548

 msgid "Region/State:"
 msgstr ""
 
 msgid "Region/State:"
 msgstr ""
 

-#: ../../mod/profiles.php:390
+#: ../../mod/profiles.php:549

 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr ""
 
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr ""
 

-#: ../../mod/profiles.php:391
+#: ../../mod/profiles.php:550

 msgid "Who: (if applicable)"
 msgstr ""
 
 msgid "Who: (if applicable)"
 msgstr ""
 

-#: ../../mod/profiles.php:392
+#: ../../mod/profiles.php:551

 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
 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 ""
 
 msgid "Sexual Preference:"
 msgstr ""
 

-#: ../../mod/profiles.php:394
+#: ../../mod/profiles.php:553

 msgid "Homepage URL:"
 msgstr ""
 
 msgid "Homepage URL:"
 msgstr ""
 

-#: ../../mod/profiles.php:395 ../../include/profile_advanced.php:49
+#: ../../mod/profiles.php:554 ../../include/profile_advanced.php:49

 msgid "Political Views:"
 msgstr ""
 
 msgid "Political Views:"
 msgstr ""
 

-#: ../../mod/profiles.php:396
+#: ../../mod/profiles.php:555

 msgid "Religious Views:"
 msgstr ""
 
 msgid "Religious Views:"
 msgstr ""
 

-#: ../../mod/profiles.php:397
+#: ../../mod/profiles.php:556

 msgid "Public Keywords:"
 msgstr ""
 
 msgid "Public Keywords:"
 msgstr ""
 

-#: ../../mod/profiles.php:398
+#: ../../mod/profiles.php:557

 msgid "Private Keywords:"
 msgstr ""
 
 msgid "Private Keywords:"
 msgstr ""
 

-#: ../../mod/profiles.php:399
+#: ../../mod/profiles.php:558

 msgid "Example: fishing photography software"
 msgstr ""
 
 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 ""
 
 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 ""
 
 msgid "(Used for searching profiles, never shown to others)"
 msgstr ""
 

-#: ../../mod/profiles.php:402
+#: ../../mod/profiles.php:561

 msgid "Tell us about yourself..."
 msgstr ""
 
 msgid "Tell us about yourself..."
 msgstr ""
 

-#: ../../mod/profiles.php:403
+#: ../../mod/profiles.php:562

 msgid "Hobbies/Interests"
 msgstr ""
 
 msgid "Hobbies/Interests"
 msgstr ""
 

-#: ../../mod/profiles.php:404
+#: ../../mod/profiles.php:563

 msgid "Contact information and Social Networks"
 msgstr ""
 
 msgid "Contact information and Social Networks"
 msgstr ""
 

-#: ../../mod/profiles.php:405
+#: ../../mod/profiles.php:564

 msgid "Musical interests"
 msgstr ""
 
 msgid "Musical interests"
 msgstr ""
 

-#: ../../mod/profiles.php:406
+#: ../../mod/profiles.php:565

 msgid "Books, literature"
 msgstr ""
 
 msgid "Books, literature"
 msgstr ""
 

-#: ../../mod/profiles.php:407
+#: ../../mod/profiles.php:566

 msgid "Television"
 msgstr ""
 
 msgid "Television"
 msgstr ""
 

-#: ../../mod/profiles.php:408
+#: ../../mod/profiles.php:567

 msgid "Film/dance/culture/entertainment"
 msgstr ""
 
 msgid "Film/dance/culture/entertainment"
 msgstr ""
 

-#: ../../mod/profiles.php:409
+#: ../../mod/profiles.php:568

 msgid "Love/romance"
 msgstr ""
 
 msgid "Love/romance"
 msgstr ""
 

-#: ../../mod/profiles.php:410
+#: ../../mod/profiles.php:569

 msgid "Work/employment"
 msgstr ""
 
 msgid "Work/employment"
 msgstr ""
 

-#: ../../mod/profiles.php:411
+#: ../../mod/profiles.php:570

 msgid "School/education"
 msgstr ""
 
 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 ""
 
 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:124
+#: ../../mod/profiles.php:585 ../../mod/directory.php:111

 msgid "Age: "
 msgstr ""
 
 msgid "Age: "
 msgstr ""
 

-#: ../../mod/profiles.php:461
+#: ../../mod/profiles.php:620

 msgid "Edit/Manage Profiles"
 msgstr ""
 
 msgid "Edit/Manage Profiles"
 msgstr ""
 

-#: ../../mod/profiles.php:462 ../../boot.php:946
+#: ../../mod/profiles.php:621 ../../boot.php:1068

 msgid "Change profile photo"
 msgstr ""
 
 msgid "Change profile photo"
 msgstr ""
 

-#: ../../mod/profiles.php:463 ../../boot.php:947
+#: ../../mod/profiles.php:622 ../../boot.php:1069

 msgid "Create New Profile"
 msgstr ""
 
 msgid "Create New Profile"
 msgstr ""
 

-#: ../../mod/profiles.php:473 ../../boot.php:957
+#: ../../mod/profiles.php:633 ../../boot.php:1079

 msgid "Profile Image"
 msgstr ""
 
 msgid "Profile Image"
 msgstr ""
 

-#: ../../mod/profiles.php:475 ../../boot.php:960
+#: ../../mod/profiles.php:635 ../../boot.php:1082

 msgid "visible to everybody"
 msgstr ""
 
 msgid "visible to everybody"
 msgstr ""
 

-#: ../../mod/profiles.php:476 ../../boot.php:961
+#: ../../mod/profiles.php:636 ../../boot.php:1083

 msgid "Edit visibility"
 msgstr ""
 
 msgid "Edit visibility"
 msgstr ""
 

+#: ../../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"
 #: ../../mod/tagger.php:103 ../../include/conversation.php:138
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"


@@ -3495,7 +4095,8 @@ msgstr ""
 msgid "No entries."
 msgstr ""
 
 msgid "No entries."
 msgstr ""
 

-#: ../../mod/suggest.php:38 ../../include/contact_widgets.php:35
+#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:621
+#: ../../include/contact_widgets.php:34

 msgid "Friend Suggestions"
 msgstr ""
 
 msgid "Friend Suggestions"
 msgstr ""
 


@@ -3509,31 +4110,23 @@ msgstr ""
 msgid "Ignore/Hide"
 msgstr ""
 
 msgid "Ignore/Hide"
 msgstr ""
 

-#: ../../mod/directory.php:51
+#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:619

 msgid "Global Directory"
 msgstr ""
 
 msgid "Global Directory"
 msgstr ""
 

-#: ../../mod/directory.php:57
-msgid "Normal site view"
-msgstr ""
-
-#: ../../mod/directory.php:59
-msgid "Admin - View all site entries"
-msgstr ""
-
-#: ../../mod/directory.php:65
+#: ../../mod/directory.php:55

 msgid "Find on this site"
 msgstr ""
 
 msgid "Find on this site"
 msgstr ""
 

-#: ../../mod/directory.php:68
+#: ../../mod/directory.php:58

 msgid "Site Directory"
 msgstr ""
 
 msgid "Site Directory"
 msgstr ""
 

-#: ../../mod/directory.php:127
+#: ../../mod/directory.php:114

 msgid "Gender: "
 msgstr ""
 
 msgid "Gender: "
 msgstr ""
 

-#: ../../mod/directory.php:153
+#: ../../mod/directory.php:140

 msgid "No entries (some entries may be hidden)."
 msgstr ""
 
 msgid "No entries (some entries may be hidden)."
 msgstr ""
 


@@ -3543,8 +4136,7 @@ msgid "%s : Not a valid email address."
 msgstr ""
 
 #: ../../mod/invite.php:59
 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
 msgstr ""
 
 #: ../../mod/invite.php:69


@@ -3563,173 +4155,229 @@ msgstr[1] ""
 msgid "You have no more invitations available"
 msgstr ""
 
 msgid "You have no more invitations available"
 msgstr ""
 

-#: ../../mod/invite.php:99
-msgid "Send invitations"
-msgstr ""
-

 #: ../../mod/invite.php:100
 #: ../../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
 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
 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 ""
 
 msgstr ""
 

-#: ../../mod/invite.php:104
+#: ../../mod/invite.php:116

 msgid "You will need to supply this invitation code: $invite_code"
 msgstr ""
 
 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 ""
 
 msgid ""
 "Once you have registered, please connect with me via my profile page at:"
 msgstr ""
 

-#: ../../mod/dfrn_confirm.php:238
+#: ../../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 ""
 
 msgid "Response from remote site was not understood."
 msgstr ""
 

-#: ../../mod/dfrn_confirm.php:247
+#: ../../mod/dfrn_confirm.php:244

 msgid "Unexpected response from remote site: "
 msgstr ""
 
 msgid "Unexpected response from remote site: "
 msgstr ""
 

-#: ../../mod/dfrn_confirm.php:255
+#: ../../mod/dfrn_confirm.php:252

 msgid "Confirmation completed successfully."
 msgstr ""
 
 msgid "Confirmation completed successfully."
 msgstr ""
 

-#: ../../mod/dfrn_confirm.php:257 ../../mod/dfrn_confirm.php:271
-#: ../../mod/dfrn_confirm.php:278
+#: ../../mod/dfrn_confirm.php:254 ../../mod/dfrn_confirm.php:268
+#: ../../mod/dfrn_confirm.php:275

 msgid "Remote site reported: "
 msgstr ""
 
 msgid "Remote site reported: "
 msgstr ""
 

-#: ../../mod/dfrn_confirm.php:269
+#: ../../mod/dfrn_confirm.php:266

 msgid "Temporary failure. Please wait and try again."
 msgstr ""
 
 msgid "Temporary failure. Please wait and try again."
 msgstr ""
 

-#: ../../mod/dfrn_confirm.php:276
+#: ../../mod/dfrn_confirm.php:273

 msgid "Introduction failed or was revoked."
 msgstr ""
 
 msgid "Introduction failed or was revoked."
 msgstr ""
 

-#: ../../mod/dfrn_confirm.php:421
+#: ../../mod/dfrn_confirm.php:418

 msgid "Unable to set contact photo."
 msgstr ""
 
 msgid "Unable to set contact photo."
 msgstr ""
 

-#: ../../mod/dfrn_confirm.php:473 ../../include/diaspora.php:495
+#: ../../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 ""
 
 #: ../../include/conversation.php:101
 #, php-format
 msgid "%1$s is now friends with %2$s"
 msgstr ""
 

-#: ../../mod/dfrn_confirm.php:543
+#: ../../mod/dfrn_confirm.php:557

 #, php-format
 msgid "No user record found for '%s' "
 msgstr ""
 
 #, php-format
 msgid "No user record found for '%s' "
 msgstr ""
 

-#: ../../mod/dfrn_confirm.php:553
+#: ../../mod/dfrn_confirm.php:567

 msgid "Our site encryption key is apparently messed up."
 msgstr ""
 
 msgid "Our site encryption key is apparently messed up."
 msgstr ""
 

-#: ../../mod/dfrn_confirm.php:564
+#: ../../mod/dfrn_confirm.php:578

 msgid "Empty site URL was provided or URL could not be decrypted by us."
 msgstr ""
 
 msgid "Empty site URL was provided or URL could not be decrypted by us."
 msgstr ""
 

-#: ../../mod/dfrn_confirm.php:585
+#: ../../mod/dfrn_confirm.php:599

 msgid "Contact record was not found for you on our site."
 msgstr ""
 
 msgid "Contact record was not found for you on our site."
 msgstr ""
 

-#: ../../mod/dfrn_confirm.php:599
+#: ../../mod/dfrn_confirm.php:613

 #, php-format
 msgid "Site public key not available in contact record for URL %s."
 msgstr ""
 
 #, php-format
 msgid "Site public key not available in contact record for URL %s."
 msgstr ""
 

-#: ../../mod/dfrn_confirm.php:619
+#: ../../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 ""
 
 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:630
+#: ../../mod/dfrn_confirm.php:644

 msgid "Unable to set your contact credentials on our system."
 msgstr ""
 
 msgid "Unable to set your contact credentials on our system."
 msgstr ""
 

-#: ../../mod/dfrn_confirm.php:684
+#: ../../mod/dfrn_confirm.php:709

 msgid "Unable to update your contact profile details on our system"
 msgstr ""
 
 msgid "Unable to update your contact profile details on our system"
 msgstr ""
 

-#: ../../mod/dfrn_confirm.php:714
+#: ../../mod/dfrn_confirm.php:743

 #, php-format
 msgid "Connection accepted at %s"
 msgstr ""
 
 #, php-format
 msgid "Connection accepted at %s"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:338
+#: ../../mod/dfrn_confirm.php:792
+#, php-format
+msgid "%1$s has joined %2$s"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:509

 msgid "Facebook disabled"
 msgstr ""
 
 msgid "Facebook disabled"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:343
+#: ../../addon/facebook/facebook.php:514

 msgid "Updating contacts"
 msgstr ""
 
 msgid "Updating contacts"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:352
+#: ../../addon/facebook/facebook.php:537

 msgid "Facebook API key is missing."
 msgstr ""
 
 msgid "Facebook API key is missing."
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:359
+#: ../../addon/facebook/facebook.php:544

 msgid "Facebook Connect"
 msgstr ""
 
 msgid "Facebook Connect"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:365
+#: ../../addon/facebook/facebook.php:550

 msgid "Install Facebook connector for this account."
 msgstr ""
 
 msgid "Install Facebook connector for this account."
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:372
+#: ../../addon/facebook/facebook.php:557

 msgid "Remove Facebook connector"
 msgstr ""
 
 msgid "Remove Facebook connector"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:377
+#: ../../addon/facebook/facebook.php:562

 msgid ""
 "Re-authenticate [This is necessary whenever your Facebook password is "
 "changed.]"
 msgstr ""
 
 msgid ""
 "Re-authenticate [This is necessary whenever your Facebook password is "
 "changed.]"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:384
+#: ../../addon/facebook/facebook.php:569

 msgid "Post to Facebook by default"
 msgstr ""
 
 msgid "Post to Facebook by default"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:388
+#: ../../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 ""
 
 msgid "Link all your Facebook friends and conversations on this website"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:390
+#: ../../addon/facebook/facebook.php:584

 msgid ""
 "Facebook conversations consist of your <em>profile wall</em> and your friend "
 "<em>stream</em>."
 msgstr ""
 
 msgid ""
 "Facebook conversations consist of your <em>profile wall</em> and your friend "
 "<em>stream</em>."
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:391
+#: ../../addon/facebook/facebook.php:585

 msgid "On this website, your Facebook friend stream is only visible to you."
 msgstr ""
 
 msgid "On this website, your Facebook friend stream is only visible to you."
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:392
+#: ../../addon/facebook/facebook.php:586

 msgid ""
 "The following settings determine the privacy of your Facebook profile wall "
 "on this website."
 msgstr ""
 
 msgid ""
 "The following settings determine the privacy of your Facebook profile wall "
 "on this website."
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:396
+#: ../../addon/facebook/facebook.php:590

 msgid ""
 "On this website your Facebook profile wall conversations will only be "
 "visible to you"
 msgstr ""
 
 msgid ""
 "On this website your Facebook profile wall conversations will only be "
 "visible to you"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:401
+#: ../../addon/facebook/facebook.php:595

 msgid "Do not import your Facebook profile wall conversations"
 msgstr ""
 
 msgid "Do not import your Facebook profile wall conversations"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:403
+#: ../../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 "
 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 "


@@ -3737,44 +4385,147 @@ msgid ""
 "who may see the conversations."
 msgstr ""
 
 "who may see the conversations."
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:408
+#: ../../addon/facebook/facebook.php:602

 msgid "Comma separated applications to ignore"
 msgstr ""
 
 msgid "Comma separated applications to ignore"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:476
+#: ../../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 ""
 
 #: ../../include/contact_selectors.php:81
 msgid "Facebook"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:477
+#: ../../addon/facebook/facebook.php:715

 msgid "Facebook Connector Settings"
 msgstr ""
 
 msgid "Facebook Connector Settings"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:491
+#: ../../addon/facebook/facebook.php:730
+msgid "Facebook API Key"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:740
+msgid ""
+"Error: it appears that you have specified the App-ID and -Secret in your ."
+"htconfig.php file. As long as they are specified there, they cannot be set "
+"using this form.<br><br>"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:745
+msgid ""
+"Error: the given API Key seems to be incorrect (the application access token "
+"could not be retrieved)."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:747
+msgid "The given API Key seems to work correctly."
+msgstr ""
+
+#: ../../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:752
+msgid "App-ID / API-Key"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:753
+msgid "Application secret"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:754
+#, php-format
+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 ""
 
 msgid "Post to Facebook"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:582
+#: ../../addon/facebook/facebook.php:907

 msgid ""
 "Post to Facebook cancelled because of multi-network access permission "
 "conflict."
 msgstr ""
 
 msgid ""
 "Post to Facebook cancelled because of multi-network access permission "
 "conflict."
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:651
-msgid "Image: "
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:728
+#: ../../addon/facebook/facebook.php:1127

 msgid "View on Friendica"
 msgstr ""
 
 msgid "View on Friendica"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:752
+#: ../../addon/facebook/facebook.php:1160

 msgid "Facebook post failed. Queued for retry."
 msgstr ""
 
 msgid "Facebook post failed. Queued for retry."
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:877 ../../addon/facebook/facebook.php:886
-#: ../../include/bb2diaspora.php:132
-msgid "link"
+#: ../../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
 msgstr ""
 
 #: ../../addon/widgets/widget_like.php:58


@@ -3791,15 +4542,19 @@ msgid_plural "%d people don't like this"
 msgstr[0] ""
 msgstr[1] ""
 
 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 ""
 
 msgid "Generate new key"
 msgstr ""
 

-#: ../../addon/widgets/widgets.php:58
+#: ../../addon/widgets/widgets.php:59

 msgid "Widgets key"
 msgstr ""
 
 msgid "Widgets key"
 msgstr ""
 

-#: ../../addon/widgets/widgets.php:60
+#: ../../addon/widgets/widgets.php:61

 msgid "Widgets available"
 msgstr ""
 
 msgid "Widgets available"
 msgstr ""
 


@@ -3831,16 +4586,50 @@ msgstr ""
 msgid "yourls Settings saved."
 msgstr ""
 
 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
 #: ../../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 ""
+"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
 msgstr ""
 
 #: ../../addon/nsfw/nsfw.php:50

-msgid "Enable NSFW filter"
+msgid "Enable Content filter"

 msgstr ""
 
 #: ../../addon/nsfw/nsfw.php:53
 msgstr ""
 
 #: ../../addon/nsfw/nsfw.php:53

-msgid "Comma separated words to treat as NSFW"
+msgid "Comma separated list of keywords to hide"

 msgstr ""
 
 #: ../../addon/nsfw/nsfw.php:58
 msgstr ""
 
 #: ../../addon/nsfw/nsfw.php:58


@@ -3851,38 +4640,62 @@ msgstr ""
 msgid "NSFW Settings saved."
 msgstr ""
 
 msgid "NSFW Settings saved."
 msgstr ""
 

-#: ../../addon/nsfw/nsfw.php:120
+#: ../../addon/nsfw/nsfw.php:121

 #, php-format
 msgid "%s - Click to open/close"
 msgstr ""
 
 #, 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:28

-#: ../../addon/communityhome/communityhome.php:34 ../../include/nav.php:62
-#: ../../boot.php:710
+#: ../../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
 msgid "Login"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:29

+#: ../../addon/communityhome/twillingham/communityhome.php:29

 msgid "OpenID"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:38
 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
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:81

+#: ../../addon/communityhome/twillingham/communityhome.php:81

 msgid "Most active users"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:98
 msgid "Most active users"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:98

-msgid "Last photos"
+msgid "Latest photos"

 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:133
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:133

-msgid "Last likes"
+msgid "Latest likes"

 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:155
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:155

+#: ../../view/theme/diabook/theme.php:557 ../../include/text.php:1303

 #: ../../include/conversation.php:45 ../../include/conversation.php:118
 msgid "event"
 msgstr ""
 #: ../../include/conversation.php:45 ../../include/conversation.php:118
 msgid "event"
 msgstr ""


@@ -3965,14 +4778,38 @@ msgstr ""
 msgid "I won!"
 msgstr ""
 
 msgid "I won!"
 msgstr ""
 

-#: ../../addon/randplace/randplace.php:171
+#: ../../addon/randplace/randplace.php:169

 msgid "Randplace Settings"
 msgstr ""
 
 msgid "Randplace Settings"
 msgstr ""
 

-#: ../../addon/randplace/randplace.php:173
+#: ../../addon/randplace/randplace.php:171

 msgid "Enable Randplace Plugin"
 msgstr ""
 
 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:35
 msgid "Post to Drupal"
 msgstr ""


@@ -4009,8 +4846,8 @@ msgstr ""
 msgid "Post to Drupal by default"
 msgstr ""
 
 msgid "Post to Drupal by default"
 msgstr ""
 

-#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:172
-#: ../../addon/posterous/posterous.php:173
+#: ../../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 ""
 
 msgid "Post from Friendica"
 msgstr ""
 


@@ -4026,6 +4863,25 @@ msgstr ""
 msgid "Enable Geonames Plugin"
 msgstr ""
 
 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 ""
 #: ../../addon/js_upload/js_upload.php:43
 msgid "Upload a file"
 msgstr ""


@@ -4066,41 +4922,71 @@ msgstr ""
 msgid "URL to embed:"
 msgstr ""
 
 msgid "URL to embed:"
 msgstr ""
 

-#: ../../addon/impressum/impressum.php:25
+#: ../../addon/impressum/impressum.php:36

 msgid "Impressum"
 msgstr ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 msgid "Postal Address"
 msgstr ""
 

-#: ../../addon/impressum/impressum.php:49
+#: ../../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 ""
 
 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:71
+#: ../../addon/impressum/impressum.php:83
+msgid "The page operators name."
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:84

 msgid "Site Owners Profile"
 msgstr ""
 
 msgid "Site Owners Profile"
 msgstr ""
 

-#: ../../addon/impressum/impressum.php:73
+#: ../../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 ""
 
 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/buglink/buglink.php:15
 msgid "Report Bug"
 msgstr ""


@@ -4151,10 +5037,16 @@ msgid "Quick Comment Settings"
 msgstr ""
 
 #: ../../addon/qcomment/qcomment.php:56
 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 ""
 
 msgid "Enter quick comments, one per line"
 msgstr ""
 

-#: ../../addon/qcomment/qcomment.php:74
+#: ../../addon/qcomment/qcomment.php:75

 msgid "Quick Comment settings saved."
 msgstr ""
 
 msgid "Quick Comment settings saved."
 msgstr ""
 


@@ -4176,6 +5068,27 @@ msgstr ""
 msgid "The default zoom level. (1:world, 18:highest)"
 msgstr ""
 
 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:46
 msgid "Editplain settings updated."
 msgstr ""


@@ -4188,15 +5101,96 @@ msgstr ""
 msgid "Disable richtext status editor"
 msgstr ""
 
 msgid "Disable richtext status editor"
 msgstr ""
 

-#: ../../addon/pageheader/pageheader.php:47
+#: ../../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 ""
 
 msgid "\"pageheader\" Settings"
 msgstr ""
 

-#: ../../addon/pageheader/pageheader.php:65
+#: ../../addon/pageheader/pageheader.php:68

 msgid "pageheader Settings saved."
 msgstr ""
 
 msgid "pageheader Settings saved."
 msgstr ""
 

-#: ../../addon/viewsrc/viewsrc.php:25
+#: ../../addon/ijpost/ijpost.php:39
+msgid "Post to Insanejournal"
+msgstr ""
+
+#: ../../addon/ijpost/ijpost.php:70
+msgid "InsaneJournal Post Settings"
+msgstr ""
+
+#: ../../addon/ijpost/ijpost.php:72
+msgid "Enable InsaneJournal Post Plugin"
+msgstr ""
+
+#: ../../addon/ijpost/ijpost.php:77
+msgid "InsaneJournal username"
+msgstr ""
+
+#: ../../addon/ijpost/ijpost.php:82
+msgid "InsaneJournal password"
+msgstr ""
+
+#: ../../addon/ijpost/ijpost.php:87
+msgid "Post to InsaneJournal by default"
+msgstr ""
+
+#: ../../addon/viewsrc/viewsrc.php:37

 msgid "View Source"
 msgstr ""
 
 msgid "View Source"
 msgstr ""
 


@@ -4204,40 +5198,40 @@ msgstr ""
 msgid "Post to StatusNet"
 msgstr ""
 
 msgid "Post to StatusNet"
 msgstr ""
 

-#: ../../addon/statusnet/statusnet.php:175
+#: ../../addon/statusnet/statusnet.php:176

 msgid ""
 "Please contact your site administrator.<br />The provided API URL is not "
 "valid."
 msgstr ""
 
 msgid ""
 "Please contact your site administrator.<br />The provided API URL is not "
 "valid."
 msgstr ""
 

-#: ../../addon/statusnet/statusnet.php:203
+#: ../../addon/statusnet/statusnet.php:204

 msgid "We could not contact the StatusNet API with the Path you entered."
 msgstr ""
 
 msgid "We could not contact the StatusNet API with the Path you entered."
 msgstr ""
 

-#: ../../addon/statusnet/statusnet.php:229
+#: ../../addon/statusnet/statusnet.php:232

 msgid "StatusNet settings updated."
 msgstr ""
 
 msgid "StatusNet settings updated."
 msgstr ""
 

-#: ../../addon/statusnet/statusnet.php:252
+#: ../../addon/statusnet/statusnet.php:257

 msgid "StatusNet Posting Settings"
 msgstr ""
 
 msgid "StatusNet Posting Settings"
 msgstr ""
 

-#: ../../addon/statusnet/statusnet.php:266
+#: ../../addon/statusnet/statusnet.php:271

 msgid "Globally Available StatusNet OAuthKeys"
 msgstr ""
 
 msgid "Globally Available StatusNet OAuthKeys"
 msgstr ""
 

-#: ../../addon/statusnet/statusnet.php:267
+#: ../../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 ""
 
 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:275
+#: ../../addon/statusnet/statusnet.php:280

 msgid "Provide your own OAuth Credentials"
 msgstr ""
 
 msgid "Provide your own OAuth Credentials"
 msgstr ""
 

-#: ../../addon/statusnet/statusnet.php:276
+#: ../../addon/statusnet/statusnet.php:281

 msgid ""
 "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 "
 msgid ""
 "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 "


@@ -4246,19 +5240,19 @@ msgid ""
 "installation at your favorited StatusNet installation."
 msgstr ""
 
 "installation at your favorited StatusNet installation."
 msgstr ""
 

-#: ../../addon/statusnet/statusnet.php:278
+#: ../../addon/statusnet/statusnet.php:283

 msgid "OAuth Consumer Key"
 msgstr ""
 
 msgid "OAuth Consumer Key"
 msgstr ""
 

-#: ../../addon/statusnet/statusnet.php:281
+#: ../../addon/statusnet/statusnet.php:286

 msgid "OAuth Consumer Secret"
 msgstr ""
 
 msgid "OAuth Consumer Secret"
 msgstr ""
 

-#: ../../addon/statusnet/statusnet.php:284
+#: ../../addon/statusnet/statusnet.php:289

 msgid "Base API Path (remember the trailing /)"
 msgstr ""
 
 msgid "Base API Path (remember the trailing /)"
 msgstr ""
 

-#: ../../addon/statusnet/statusnet.php:305
+#: ../../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 "
 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 "


@@ -4266,38 +5260,38 @@ msgid ""
 "to StatusNet."
 msgstr ""
 
 "to StatusNet."
 msgstr ""
 

-#: ../../addon/statusnet/statusnet.php:306
+#: ../../addon/statusnet/statusnet.php:311

 msgid "Log in with StatusNet"
 msgstr ""
 
 msgid "Log in with StatusNet"
 msgstr ""
 

-#: ../../addon/statusnet/statusnet.php:308
+#: ../../addon/statusnet/statusnet.php:313

 msgid "Copy the security code from StatusNet here"
 msgstr ""
 
 msgid "Copy the security code from StatusNet here"
 msgstr ""
 

-#: ../../addon/statusnet/statusnet.php:314
+#: ../../addon/statusnet/statusnet.php:319

 msgid "Cancel Connection Process"
 msgstr ""
 
 msgid "Cancel Connection Process"
 msgstr ""
 

-#: ../../addon/statusnet/statusnet.php:316
+#: ../../addon/statusnet/statusnet.php:321

 msgid "Current StatusNet API is"
 msgstr ""
 
 msgid "Current StatusNet API is"
 msgstr ""
 

-#: ../../addon/statusnet/statusnet.php:317
+#: ../../addon/statusnet/statusnet.php:322

 msgid "Cancel StatusNet Connection"
 msgstr ""
 
 msgid "Cancel StatusNet Connection"
 msgstr ""
 

-#: ../../addon/statusnet/statusnet.php:328 ../../addon/twitter/twitter.php:184
+#: ../../addon/statusnet/statusnet.php:333 ../../addon/twitter/twitter.php:189

 msgid "Currently connected to: "
 msgstr ""
 
 msgid "Currently connected to: "
 msgstr ""
 

-#: ../../addon/statusnet/statusnet.php:329
+#: ../../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 ""
 
 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:331
+#: ../../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 "
 msgid ""
 "<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
 "details from unknown viewers?</em>) the link potentially included in public "


@@ -4305,19 +5299,23 @@ msgid ""
 "informing the visitor that the access to your profile has been restricted."
 msgstr ""
 
 "informing the visitor that the access to your profile has been restricted."
 msgstr ""
 

-#: ../../addon/statusnet/statusnet.php:334
+#: ../../addon/statusnet/statusnet.php:339

 msgid "Allow posting to StatusNet"
 msgstr ""
 
 msgid "Allow posting to StatusNet"
 msgstr ""
 

-#: ../../addon/statusnet/statusnet.php:337
+#: ../../addon/statusnet/statusnet.php:342

 msgid "Send public postings to StatusNet by default"
 msgstr ""
 
 msgid "Send public postings to StatusNet by default"
 msgstr ""
 

-#: ../../addon/statusnet/statusnet.php:342 ../../addon/twitter/twitter.php:198
+#: ../../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 ""
 
 msgid "Clear OAuth configuration"
 msgstr ""
 

-#: ../../addon/statusnet/statusnet.php:524
+#: ../../addon/statusnet/statusnet.php:553

 msgid "API URL"
 msgstr ""
 
 msgid "API URL"
 msgstr ""
 


@@ -4357,34 +5355,65 @@ msgstr ""
 msgid "How many contacts to display on profile sidebar"
 msgstr ""
 
 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:42
 msgid "Post to Wordpress"
 msgstr ""
 
 #: ../../addon/wppost/wppost.php:42
 msgid "Post to Wordpress"
 msgstr ""
 

-#: ../../addon/wppost/wppost.php:74
+#: ../../addon/wppost/wppost.php:76

 msgid "WordPress Post Settings"
 msgstr ""
 
 msgid "WordPress Post Settings"
 msgstr ""
 

-#: ../../addon/wppost/wppost.php:76
+#: ../../addon/wppost/wppost.php:78

 msgid "Enable WordPress Post Plugin"
 msgstr ""
 
 msgid "Enable WordPress Post Plugin"
 msgstr ""
 

-#: ../../addon/wppost/wppost.php:81
+#: ../../addon/wppost/wppost.php:83

 msgid "WordPress username"
 msgstr ""
 
 msgid "WordPress username"
 msgstr ""
 

-#: ../../addon/wppost/wppost.php:86
+#: ../../addon/wppost/wppost.php:88

 msgid "WordPress password"
 msgstr ""
 
 msgid "WordPress password"
 msgstr ""
 

-#: ../../addon/wppost/wppost.php:91
+#: ../../addon/wppost/wppost.php:93

 msgid "WordPress API URL"
 msgstr ""
 
 msgid "WordPress API URL"
 msgstr ""
 

-#: ../../addon/wppost/wppost.php:96
+#: ../../addon/wppost/wppost.php:98

 msgid "Post to WordPress by default"
 msgstr ""
 
 msgid "Post to WordPress by default"
 msgstr ""
 

+#: ../../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:38
 msgid "\"Show more\" Settings"
 msgstr ""


@@ -4397,14 +5426,10 @@ msgstr ""
 msgid "Cutting posts after how much characters"
 msgstr ""
 
 msgid "Cutting posts after how much characters"
 msgstr ""
 

-#: ../../addon/showmore/showmore.php:64
+#: ../../addon/showmore/showmore.php:65

 msgid "Show More Settings saved."
 msgstr ""
 
 msgid "Show More Settings saved."
 msgstr ""
 

-#: ../../addon/showmore/showmore.php:86
-msgid "Show More"
-msgstr ""
-

 #: ../../addon/piwik/piwik.php:79
 msgid ""
 "This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
 #: ../../addon/piwik/piwik.php:79
 msgid ""
 "This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "


@@ -4429,109 +5454,385 @@ msgid ""
 "trailing slash)"
 msgstr ""
 
 "trailing slash)"
 msgstr ""
 

-#: ../../addon/piwik/piwik.php:91
-msgid "Site ID"
+#: ../../addon/piwik/piwik.php:91
+msgid "Site ID"
+msgstr ""
+
+#: ../../addon/piwik/piwik.php:92
+msgid "Show opt-out cookie link?"
+msgstr ""
+
+#: ../../addon/piwik/piwik.php:93
+msgid "Asynchronous tracking"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:73
+msgid "Post to Twitter"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:122
+msgid "Twitter settings updated."
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:146
+msgid "Twitter Posting Settings"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:153
+msgid ""
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:172
+msgid ""
+"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:173
+msgid "Log in with Twitter"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:175
+msgid "Copy the PIN from Twitter here"
+msgstr ""
+
+#: ../../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: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:198
+msgid "Send public postings to Twitter by default"
+msgstr ""
+
+#: ../../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:384
+msgid "Consumer secret"
+msgstr ""
+
+#: ../../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:70
+msgid "Posterous Post Settings"
+msgstr ""
+
+#: ../../addon/posterous/posterous.php:72
+msgid "Enable Posterous Post Plugin"
+msgstr ""
+
+#: ../../addon/posterous/posterous.php:77
+msgid "Posterous login"
+msgstr ""
+
+#: ../../addon/posterous/posterous.php:82
+msgid "Posterous password"
+msgstr ""
+
+#: ../../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 ""
+
+#: ../../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 ""
 
 msgstr ""
 

-#: ../../addon/piwik/piwik.php:92
-msgid "Show opt-out cookie link?"
+#: ../../view/theme/diabook/theme.php:620 ../../include/contact_widgets.php:35
+msgid "Similar Interests"

 msgstr ""
 
 msgstr ""
 

-#: ../../addon/piwik/piwik.php:93
-msgid "Asynchronous tracking"
+#: ../../view/theme/diabook/theme.php:622 ../../include/contact_widgets.php:37
+msgid "Invite Friends"

 msgstr ""
 
 msgstr ""
 

-#: ../../addon/twitter/twitter.php:73
-msgid "Post to Twitter"
+#: ../../view/theme/diabook/theme.php:673
+#: ../../view/theme/diabook/theme.php:743
+#: ../../view/theme/diabook/config.php:202
+msgid "Earth Layers"

 msgstr ""
 
 msgstr ""
 

-#: ../../addon/twitter/twitter.php:119
-msgid "Twitter settings updated."
+#: ../../view/theme/diabook/theme.php:678
+msgid "Set zoomfactor for Earth Layers"

 msgstr ""
 
 msgstr ""
 

-#: ../../addon/twitter/twitter.php:141
-msgid "Twitter Posting Settings"
+#: ../../view/theme/diabook/theme.php:679
+#: ../../view/theme/diabook/config.php:199
+msgid "Set longitude (X) for Earth Layers"

 msgstr ""
 
 msgstr ""
 

-#: ../../addon/twitter/twitter.php:148
-msgid ""
-"No consumer key pair for Twitter found. Please contact your site "
-"administrator."
+#: ../../view/theme/diabook/theme.php:680
+#: ../../view/theme/diabook/config.php:200
+msgid "Set latitude (Y) for Earth Layers"

 msgstr ""
 
 msgstr ""
 

-#: ../../addon/twitter/twitter.php:167
-msgid ""
-"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."
+#: ../../view/theme/diabook/theme.php:693
+#: ../../view/theme/diabook/theme.php:745
+#: ../../view/theme/diabook/config.php:204
+msgid "Help or @NewHere ?"

 msgstr ""
 
 msgstr ""
 

-#: ../../addon/twitter/twitter.php:168
-msgid "Log in with Twitter"
+#: ../../view/theme/diabook/theme.php:700
+#: ../../view/theme/diabook/theme.php:746
+#: ../../view/theme/diabook/config.php:205
+msgid "Connect Services"

 msgstr ""
 
 msgstr ""
 

-#: ../../addon/twitter/twitter.php:170
-msgid "Copy the PIN from Twitter here"
+#: ../../view/theme/diabook/theme.php:707
+#: ../../view/theme/diabook/theme.php:748
+msgid "Last Tweets"

 msgstr ""
 
 msgstr ""
 

-#: ../../addon/twitter/twitter.php:185
-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."
+#: ../../view/theme/diabook/theme.php:710
+#: ../../view/theme/diabook/config.php:197
+msgid "Set twitter search term"

 msgstr ""
 
 msgstr ""
 

-#: ../../addon/twitter/twitter.php:187
-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."
+#: ../../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 ""
 
 msgstr ""
 

-#: ../../addon/twitter/twitter.php:190
-msgid "Allow posting to Twitter"
+#: ../../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 ""
 
 msgstr ""
 

-#: ../../addon/twitter/twitter.php:193
-msgid "Send public postings to Twitter by default"
+#: ../../view/theme/diabook/theme.php:740
+msgid "Show/hide boxes at right-hand column:"

 msgstr ""
 
 msgstr ""
 

-#: ../../addon/twitter/twitter.php:357
-msgid "Consumer key"
+#: ../../view/theme/diabook/config.php:194
+#: ../../view/theme/dispy/config.php:74
+msgid "Set line-height for posts and comments"

 msgstr ""
 
 msgstr ""
 

-#: ../../addon/twitter/twitter.php:358
-msgid "Consumer secret"
+#: ../../view/theme/diabook/config.php:195
+msgid "Set resolution for middle column"

 msgstr ""
 
 msgstr ""
 

-#: ../../addon/posterous/posterous.php:36
-msgid "Post to Posterous"
+#: ../../view/theme/diabook/config.php:196
+msgid "Set color scheme"

 msgstr ""
 
 msgstr ""
 

-#: ../../addon/posterous/posterous.php:67
-msgid "Posterous Post Settings"
+#: ../../view/theme/diabook/config.php:198
+msgid "Set zoomfactor for Earth Layer"

 msgstr ""
 
 msgstr ""
 

-#: ../../addon/posterous/posterous.php:69
-msgid "Enable Posterous Post Plugin"
+#: ../../view/theme/diabook/config.php:207
+msgid "Last tweets"

 msgstr ""
 
 msgstr ""
 

-#: ../../addon/posterous/posterous.php:74
-msgid "Posterous login"
+#: ../../view/theme/quattro/config.php:55
+msgid "Alignment"

 msgstr ""
 
 msgstr ""
 

-#: ../../addon/posterous/posterous.php:79
-msgid "Posterous password"
+#: ../../view/theme/quattro/config.php:55
+msgid "Left"

 msgstr ""
 
 msgstr ""
 

-#: ../../addon/posterous/posterous.php:84
-msgid "Post to Posterous by default"
+#: ../../view/theme/quattro/config.php:55
+msgid "Center"
+msgstr ""
+
+#: ../../view/theme/dispy/config.php:75
+msgid "Set colour scheme"

 msgstr ""
 
 msgstr ""
 

-#: ../../include/profile_advanced.php:17 ../../boot.php:982
+#: ../../include/profile_advanced.php:17 ../../boot.php:1104

 msgid "Gender:"
 msgstr ""
 
 msgid "Gender:"
 msgstr ""
 


@@ -4543,8 +5844,8 @@ msgstr ""
 msgid "j F"
 msgstr ""
 
 msgid "j F"
 msgstr ""
 

-#: ../../include/profile_advanced.php:30 ../../include/datetime.php:438
-#: ../../include/items.php:1349
+#: ../../include/profile_advanced.php:30 ../../include/datetime.php:448
+#: ../../include/items.php:1419

 msgid "Birthday:"
 msgstr ""
 
 msgid "Birthday:"
 msgstr ""
 


@@ -4552,11 +5853,11 @@ msgstr ""
 msgid "Age:"
 msgstr ""
 
 msgid "Age:"
 msgstr ""
 

-#: ../../include/profile_advanced.php:37 ../../boot.php:985
+#: ../../include/profile_advanced.php:37 ../../boot.php:1107

 msgid "Status:"
 msgstr ""
 
 msgid "Status:"
 msgstr ""
 

-#: ../../include/profile_advanced.php:45 ../../boot.php:987
+#: ../../include/profile_advanced.php:45 ../../boot.php:1109

 msgid "Homepage:"
 msgstr ""
 
 msgid "Homepage:"
 msgstr ""
 


@@ -4736,316 +6037,372 @@ msgstr ""
 msgid "Undecided"
 msgstr ""
 
 msgid "Undecided"
 msgstr ""
 

-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:21

 msgid "Males"
 msgstr ""
 
 msgid "Males"
 msgstr ""
 

-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:21

 msgid "Females"
 msgstr ""
 
 msgid "Females"
 msgstr ""
 

-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:21

 msgid "Gay"
 msgstr ""
 
 msgid "Gay"
 msgstr ""
 

-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:21

 msgid "Lesbian"
 msgstr ""
 
 msgid "Lesbian"
 msgstr ""
 

-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:21

 msgid "No Preference"
 msgstr ""
 
 msgid "No Preference"
 msgstr ""
 

-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:21

 msgid "Bisexual"
 msgstr ""
 
 msgid "Bisexual"
 msgstr ""
 

-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:21

 msgid "Autosexual"
 msgstr ""
 
 msgid "Autosexual"
 msgstr ""
 

-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:21

 msgid "Abstinent"
 msgstr ""
 
 msgid "Abstinent"
 msgstr ""
 

-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:21

 msgid "Virgin"
 msgstr ""
 
 msgid "Virgin"
 msgstr ""
 

-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:21

 msgid "Deviant"
 msgstr ""
 
 msgid "Deviant"
 msgstr ""
 

-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:21

 msgid "Fetish"
 msgstr ""
 
 msgid "Fetish"
 msgstr ""
 

-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:21

 msgid "Oodles"
 msgstr ""
 
 msgid "Oodles"
 msgstr ""
 

-#: ../../include/profile_selectors.php:19
+#: ../../include/profile_selectors.php:21

 msgid "Nonsexual"
 msgstr ""
 
 msgid "Nonsexual"
 msgstr ""
 

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37

 msgid "Single"
 msgstr ""
 
 msgid "Single"
 msgstr ""
 

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37

 msgid "Lonely"
 msgstr ""
 
 msgid "Lonely"
 msgstr ""
 

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37

 msgid "Available"
 msgstr ""
 
 msgid "Available"
 msgstr ""
 

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37

 msgid "Unavailable"
 msgstr ""
 
 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 ""
 
 msgid "Dating"
 msgstr ""
 

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37

 msgid "Unfaithful"
 msgstr ""
 
 msgid "Unfaithful"
 msgstr ""
 

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37

 msgid "Sex Addict"
 msgstr ""
 
 msgid "Sex Addict"
 msgstr ""
 

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37

 msgid "Friends"
 msgstr ""
 
 msgid "Friends"
 msgstr ""
 

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37

 msgid "Friends/Benefits"
 msgstr ""
 
 msgid "Friends/Benefits"
 msgstr ""
 

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37

 msgid "Casual"
 msgstr ""
 
 msgid "Casual"
 msgstr ""
 

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37

 msgid "Engaged"
 msgstr ""
 
 msgid "Engaged"
 msgstr ""
 

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37

 msgid "Married"
 msgstr ""
 
 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 ""
 
 msgid "Partners"
 msgstr ""
 

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37

 msgid "Cohabiting"
 msgstr ""
 
 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 ""
 
 msgid "Happy"
 msgstr ""
 

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

 msgstr ""
 
 msgstr ""
 

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37

 msgid "Swinger"
 msgstr ""
 
 msgid "Swinger"
 msgstr ""
 

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37

 msgid "Betrayed"
 msgstr ""
 
 msgid "Betrayed"
 msgstr ""
 

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37

 msgid "Separated"
 msgstr ""
 
 msgid "Separated"
 msgstr ""
 

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37

 msgid "Unstable"
 msgstr ""
 
 msgid "Unstable"
 msgstr ""
 

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37

 msgid "Divorced"
 msgstr ""
 
 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 ""
 
 msgid "Widowed"
 msgstr ""
 

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37

 msgid "Uncertain"
 msgstr ""
 
 msgid "Uncertain"
 msgstr ""
 

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

 msgstr ""
 
 msgstr ""
 

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37

 msgid "Don't care"
 msgstr ""
 
 msgid "Don't care"
 msgstr ""
 

-#: ../../include/profile_selectors.php:33
+#: ../../include/profile_selectors.php:37

 msgid "Ask me"
 msgstr ""
 
 msgid "Ask me"
 msgstr ""
 

-#: ../../include/event.php:17 ../../include/bb2diaspora.php:274
+#: ../../include/event.php:17 ../../include/bb2diaspora.php:244

 msgid "Starts:"
 msgstr ""
 
 msgid "Starts:"
 msgstr ""
 

-#: ../../include/event.php:27 ../../include/bb2diaspora.php:282
+#: ../../include/event.php:27 ../../include/bb2diaspora.php:252

 msgid "Finishes:"
 msgstr ""
 
 msgid "Finishes:"
 msgstr ""
 

-#: ../../include/delivery.php:424 ../../include/notifier.php:637
+#: ../../include/delivery.php:455 ../../include/notifier.php:659

 msgid "(no subject)"
 msgstr ""
 
 msgid "(no subject)"
 msgstr ""
 

-#: ../../include/delivery.php:431 ../../include/enotify.php:16
-#: ../../include/notifier.php:644
+#: ../../include/delivery.php:462 ../../include/enotify.php:23
+#: ../../include/notifier.php:666

 msgid "noreply"
 msgstr ""
 
 msgid "noreply"
 msgstr ""
 

-#: ../../include/text.php:232
+#: ../../include/text.php:243

 msgid "prev"
 msgstr ""
 
 msgid "prev"
 msgstr ""
 

-#: ../../include/text.php:234
+#: ../../include/text.php:245

 msgid "first"
 msgstr ""
 
 msgid "first"
 msgstr ""
 

-#: ../../include/text.php:263
+#: ../../include/text.php:274

 msgid "last"
 msgstr ""
 
 msgid "last"
 msgstr ""
 

-#: ../../include/text.php:266
+#: ../../include/text.php:277

 msgid "next"
 msgstr ""
 
 msgid "next"
 msgstr ""
 

-#: ../../include/text.php:557
+#: ../../include/text.php:568

 msgid "No contacts"
 msgstr ""
 
 msgid "No contacts"
 msgstr ""
 

-#: ../../include/text.php:566
+#: ../../include/text.php:577

 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] ""
 msgstr[1] ""
 
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../../include/text.php:637 ../../include/nav.php:87
-msgid "Search"
-msgstr ""
-
-#: ../../include/text.php:813
+#: ../../include/text.php:831

 msgid "Monday"
 msgstr ""
 
 msgid "Monday"
 msgstr ""
 

-#: ../../include/text.php:813
+#: ../../include/text.php:831

 msgid "Tuesday"
 msgstr ""
 
 msgid "Tuesday"
 msgstr ""
 

-#: ../../include/text.php:813
+#: ../../include/text.php:831

 msgid "Wednesday"
 msgstr ""
 
 msgid "Wednesday"
 msgstr ""
 

-#: ../../include/text.php:813
+#: ../../include/text.php:831

 msgid "Thursday"
 msgstr ""
 
 msgid "Thursday"
 msgstr ""
 

-#: ../../include/text.php:813
+#: ../../include/text.php:831

 msgid "Friday"
 msgstr ""
 
 msgid "Friday"
 msgstr ""
 

-#: ../../include/text.php:813
+#: ../../include/text.php:831

 msgid "Saturday"
 msgstr ""
 
 msgid "Saturday"
 msgstr ""
 

-#: ../../include/text.php:813
+#: ../../include/text.php:831

 msgid "Sunday"
 msgstr ""
 
 msgid "Sunday"
 msgstr ""
 

-#: ../../include/text.php:817
+#: ../../include/text.php:835

 msgid "January"
 msgstr ""
 
 msgid "January"
 msgstr ""
 

-#: ../../include/text.php:817
+#: ../../include/text.php:835

 msgid "February"
 msgstr ""
 
 msgid "February"
 msgstr ""
 

-#: ../../include/text.php:817
+#: ../../include/text.php:835

 msgid "March"
 msgstr ""
 
 msgid "March"
 msgstr ""
 

-#: ../../include/text.php:817
+#: ../../include/text.php:835

 msgid "April"
 msgstr ""
 
 msgid "April"
 msgstr ""
 

-#: ../../include/text.php:817
+#: ../../include/text.php:835

 msgid "May"
 msgstr ""
 
 msgid "May"
 msgstr ""
 

-#: ../../include/text.php:817
+#: ../../include/text.php:835

 msgid "June"
 msgstr ""
 
 msgid "June"
 msgstr ""
 

-#: ../../include/text.php:817
+#: ../../include/text.php:835

 msgid "July"
 msgstr ""
 
 msgid "July"
 msgstr ""
 

-#: ../../include/text.php:817
+#: ../../include/text.php:835

 msgid "August"
 msgstr ""
 
 msgid "August"
 msgstr ""
 

-#: ../../include/text.php:817
+#: ../../include/text.php:835

 msgid "September"
 msgstr ""
 
 msgid "September"
 msgstr ""
 

-#: ../../include/text.php:817
+#: ../../include/text.php:835

 msgid "October"
 msgstr ""
 
 msgid "October"
 msgstr ""
 

-#: ../../include/text.php:817
+#: ../../include/text.php:835

 msgid "November"
 msgstr ""
 
 msgid "November"
 msgstr ""
 

-#: ../../include/text.php:817
+#: ../../include/text.php:835

 msgid "December"
 msgstr ""
 
 msgid "December"
 msgstr ""
 

-#: ../../include/text.php:887
+#: ../../include/text.php:919

 msgid "bytes"
 msgstr ""
 
 msgid "bytes"
 msgstr ""
 

-#: ../../include/text.php:982
-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 ""
 
 msgstr ""
 

-#: ../../include/text.php:994
+#: ../../include/text.php:937
+msgid "Categories:"
+msgstr ""
+
+#: ../../include/text.php:952
+msgid "Filed under:"
+msgstr ""
+
+#: ../../include/text.php:968 ../../include/text.php:980
+msgid "Click to open/close"
+msgstr ""
+
+#: ../../include/text.php:1085

 msgid "default"
 msgstr ""
 
 msgid "default"
 msgstr ""
 

-#: ../../include/diaspora.php:570
+#: ../../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 ""
 
 msgid "Sharing notification from Diaspora network"
 msgstr ""
 

-#: ../../include/diaspora.php:1911
+#: ../../include/diaspora.php:1977

 msgid "Attachments:"
 msgstr ""
 
 msgid "Attachments:"
 msgstr ""
 

-#: ../../include/diaspora.php:2094
+#: ../../include/diaspora.php:2160

 #, php-format
 msgid "[Relayed] Comment authored by %s from network %s"
 msgstr ""
 
 #, 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 ""
 
 msgid "Embedded content"
 msgstr ""
 

-#: ../../include/oembed.php:137
+#: ../../include/oembed.php:141

 msgid "Embedding disabled"
 msgstr ""
 
 msgid "Embedding disabled"
 msgstr ""
 


@@ -5056,155 +6413,143 @@ msgid ""
 "not what you intended, please create another group with a different name."
 msgstr ""
 
 "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 ""
 
 msgid "Everybody"
 msgstr ""
 

-#: ../../include/group.php:191
+#: ../../include/group.php:218

 msgid "edit"
 msgstr ""
 
 msgid "edit"
 msgstr ""
 

-#: ../../include/group.php:212
+#: ../../include/group.php:239

 msgid "Groups"
 msgstr ""
 
 msgid "Groups"
 msgstr ""
 

-#: ../../include/group.php:213
+#: ../../include/group.php:240

 msgid "Edit group"
 msgstr ""
 
 msgid "Edit group"
 msgstr ""
 

-#: ../../include/group.php:214
+#: ../../include/group.php:241

 msgid "Create a new group"
 msgstr ""
 
 msgid "Create a new group"
 msgstr ""
 

-#: ../../include/nav.php:44 ../../boot.php:709
+#: ../../include/group.php:242
+msgid "Contacts not in any group"
+msgstr ""
+
+#: ../../include/nav.php:46 ../../boot.php:814

 msgid "Logout"
 msgstr ""
 
 msgid "Logout"
 msgstr ""
 

-#: ../../include/nav.php:44
+#: ../../include/nav.php:46

 msgid "End this session"
 msgstr ""
 
 msgid "End this session"
 msgstr ""
 

-#: ../../include/nav.php:47 ../../boot.php:1331
+#: ../../include/nav.php:49 ../../boot.php:1482

 msgid "Status"
 msgstr ""
 
 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"
-msgstr ""
-
-#: ../../include/nav.php:49 ../../boot.php:1341
-msgid "Photos"
-msgstr ""
-
-#: ../../include/nav.php:49
-msgid "Your photos"
-msgstr ""
-
-#: ../../include/nav.php:50
-msgid "Your events"
-msgstr ""
-
-#: ../../include/nav.php:51
-msgid "Personal notes"
-msgstr ""
-
-#: ../../include/nav.php:51
-msgid "Your personal photos"
-msgstr ""
-
-#: ../../include/nav.php:62
+#: ../../include/nav.php:64

 msgid "Sign in"
 msgstr ""
 
 msgid "Sign in"
 msgstr ""
 

-#: ../../include/nav.php:73
+#: ../../include/nav.php:77

 msgid "Home Page"
 msgstr ""
 
 msgid "Home Page"
 msgstr ""
 

-#: ../../include/nav.php:77
+#: ../../include/nav.php:81

 msgid "Create an account"
 msgstr ""
 
 msgid "Create an account"
 msgstr ""
 

-#: ../../include/nav.php:82
+#: ../../include/nav.php:86

 msgid "Help and documentation"
 msgstr ""
 
 msgid "Help and documentation"
 msgstr ""
 

-#: ../../include/nav.php:85
+#: ../../include/nav.php:89

 msgid "Apps"
 msgstr ""
 
 msgid "Apps"
 msgstr ""
 

-#: ../../include/nav.php:85
+#: ../../include/nav.php:89

 msgid "Addon applications, utilities, games"
 msgstr ""
 
 msgid "Addon applications, utilities, games"
 msgstr ""
 

-#: ../../include/nav.php:87
+#: ../../include/nav.php:91

 msgid "Search site content"
 msgstr ""
 
 msgid "Search site content"
 msgstr ""
 

-#: ../../include/nav.php:97
+#: ../../include/nav.php:101

 msgid "Conversations on this site"
 msgstr ""
 
 msgid "Conversations on this site"
 msgstr ""
 

-#: ../../include/nav.php:99
+#: ../../include/nav.php:103

 msgid "Directory"
 msgstr ""
 
 msgid "Directory"
 msgstr ""
 

-#: ../../include/nav.php:99
+#: ../../include/nav.php:103

 msgid "People directory"
 msgstr ""
 
 msgid "People directory"
 msgstr ""
 

-#: ../../include/nav.php:109
+#: ../../include/nav.php:113

 msgid "Conversations from your friends"
 msgstr ""
 
 msgid "Conversations from your friends"
 msgstr ""
 

-#: ../../include/nav.php:117
+#: ../../include/nav.php:121

 msgid "Friend Requests"
 msgstr ""
 
 msgid "Friend Requests"
 msgstr ""
 

-#: ../../include/nav.php:119
+#: ../../include/nav.php:123

 msgid "See all notifications"
 msgstr ""
 
 msgid "See all notifications"
 msgstr ""
 

-#: ../../include/nav.php:120
+#: ../../include/nav.php:124

 msgid "Mark all system notifications seen"
 msgstr ""
 
 msgid "Mark all system notifications seen"
 msgstr ""
 

-#: ../../include/nav.php:124
+#: ../../include/nav.php:128

 msgid "Private mail"
 msgstr ""
 
 msgid "Private mail"
 msgstr ""
 

-#: ../../include/nav.php:127
+#: ../../include/nav.php:129
+msgid "Inbox"
+msgstr ""
+
+#: ../../include/nav.php:130
+msgid "Outbox"
+msgstr ""
+
+#: ../../include/nav.php:134

 msgid "Manage"
 msgstr ""
 
 msgid "Manage"
 msgstr ""
 

-#: ../../include/nav.php:127
+#: ../../include/nav.php:134

 msgid "Manage other pages"
 msgstr ""
 
 msgid "Manage other pages"
 msgstr ""
 

-#: ../../include/nav.php:131 ../../boot.php:940
+#: ../../include/nav.php:138 ../../boot.php:1062

 msgid "Profiles"
 msgstr ""
 
 msgid "Profiles"
 msgstr ""
 

-#: ../../include/nav.php:131 ../../boot.php:940
+#: ../../include/nav.php:138 ../../boot.php:1062

 msgid "Manage/edit profiles"
 msgstr ""
 
 msgid "Manage/edit profiles"
 msgstr ""
 

-#: ../../include/nav.php:132
+#: ../../include/nav.php:139

 msgid "Manage/edit friends and contacts"
 msgstr ""
 
 msgid "Manage/edit friends and contacts"
 msgstr ""
 

-#: ../../include/nav.php:139
+#: ../../include/nav.php:146

 msgid "Admin"
 msgstr ""
 
 msgid "Admin"
 msgstr ""
 

-#: ../../include/nav.php:139
+#: ../../include/nav.php:146

 msgid "Site setup and configuration"
 msgstr ""
 
 msgid "Site setup and configuration"
 msgstr ""
 

-#: ../../include/nav.php:162
+#: ../../include/nav.php:169

 msgid "Nothing new here"
 msgstr ""
 
 msgid "Nothing new here"
 msgstr ""
 


@@ -5220,35 +6565,31 @@ msgstr ""
 msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr ""
 
 msgid "Example: bob@example.com, http://example.com/barbara"
 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] ""
 
 #, 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 ""
 
 msgid "Find People"
 msgstr ""
 

-#: ../../include/contact_widgets.php:31
+#: ../../include/contact_widgets.php:30

 msgid "Enter name or interest"
 msgstr ""
 
 msgid "Enter name or interest"
 msgstr ""
 

-#: ../../include/contact_widgets.php:32
+#: ../../include/contact_widgets.php:31

 msgid "Connect/Follow"
 msgstr ""
 
 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 "Examples: Robert Morgenstein, Fishing"
 msgstr ""
 
 #: ../../include/contact_widgets.php:36

-msgid "Similar Interests"
+msgid "Random Profile"

 msgstr ""
 
 #: ../../include/contact_widgets.php:68
 msgstr ""
 
 #: ../../include/contact_widgets.php:68


@@ -5259,329 +6600,381 @@ msgstr ""
 msgid "All Networks"
 msgstr ""
 
 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:29
 msgid "Logged out."
 msgstr ""
 
 #: ../../include/auth.php:29
 msgid "Logged out."
 msgstr ""
 

+#: ../../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:43 ../../include/datetime.php:45
 msgid "Miscellaneous"
 msgstr ""
 

-#: ../../include/datetime.php:121 ../../include/datetime.php:253
+#: ../../include/datetime.php:131 ../../include/datetime.php:263

 msgid "year"
 msgstr ""
 
 msgid "year"
 msgstr ""
 

-#: ../../include/datetime.php:126 ../../include/datetime.php:254
+#: ../../include/datetime.php:136 ../../include/datetime.php:264

 msgid "month"
 msgstr ""
 
 msgid "month"
 msgstr ""
 

-#: ../../include/datetime.php:131 ../../include/datetime.php:256
+#: ../../include/datetime.php:141 ../../include/datetime.php:266

 msgid "day"
 msgstr ""
 
 msgid "day"
 msgstr ""
 

-#: ../../include/datetime.php:244
+#: ../../include/datetime.php:254

 msgid "never"
 msgstr ""
 
 msgid "never"
 msgstr ""
 

-#: ../../include/datetime.php:250
+#: ../../include/datetime.php:260

 msgid "less than a second ago"
 msgstr ""
 
 msgid "less than a second ago"
 msgstr ""
 

-#: ../../include/datetime.php:253
+#: ../../include/datetime.php:263

 msgid "years"
 msgstr ""
 
 msgid "years"
 msgstr ""
 

-#: ../../include/datetime.php:254
+#: ../../include/datetime.php:264

 msgid "months"
 msgstr ""
 
 msgid "months"
 msgstr ""
 

-#: ../../include/datetime.php:255
+#: ../../include/datetime.php:265

 msgid "week"
 msgstr ""
 
 msgid "week"
 msgstr ""
 

-#: ../../include/datetime.php:255
+#: ../../include/datetime.php:265

 msgid "weeks"
 msgstr ""
 
 msgid "weeks"
 msgstr ""
 

-#: ../../include/datetime.php:256
+#: ../../include/datetime.php:266

 msgid "days"
 msgstr ""
 
 msgid "days"
 msgstr ""
 

-#: ../../include/datetime.php:257
+#: ../../include/datetime.php:267

 msgid "hour"
 msgstr ""
 
 msgid "hour"
 msgstr ""
 

-#: ../../include/datetime.php:257
+#: ../../include/datetime.php:267

 msgid "hours"
 msgstr ""
 
 msgid "hours"
 msgstr ""
 

-#: ../../include/datetime.php:258
+#: ../../include/datetime.php:268

 msgid "minute"
 msgstr ""
 
 msgid "minute"
 msgstr ""
 

-#: ../../include/datetime.php:258
+#: ../../include/datetime.php:268

 msgid "minutes"
 msgstr ""
 
 msgid "minutes"
 msgstr ""
 

-#: ../../include/datetime.php:259
+#: ../../include/datetime.php:269

 msgid "second"
 msgstr ""
 
 msgid "second"
 msgstr ""
 

-#: ../../include/datetime.php:259
+#: ../../include/datetime.php:269

 msgid "seconds"
 msgstr ""
 
 msgid "seconds"
 msgstr ""
 

-#: ../../include/datetime.php:267
+#: ../../include/datetime.php:277

 #, php-format
 msgid "%1$d %2$s ago"
 msgstr ""
 
 #, php-format
 msgid "%1$d %2$s ago"
 msgstr ""
 

-#: ../../include/poller.php:474
+#: ../../include/onepoll.php:406

 msgid "From: "
 msgstr ""
 
 msgid "From: "
 msgstr ""
 

-#: ../../include/bbcode.php:202
+#: ../../include/bbcode.php:203 ../../include/bbcode.php:223

 msgid "$1 wrote:"
 msgstr ""
 
 msgid "$1 wrote:"
 msgstr ""
 

-#: ../../include/bbcode.php:216 ../../include/bbcode.php:282
+#: ../../include/bbcode.php:238 ../../include/bbcode.php:307

 msgid "Image/photo"
 msgstr ""
 
 msgid "Image/photo"
 msgstr ""
 

-#: ../../include/dba.php:39
+#: ../../include/dba.php:41

 #, php-format
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
 #, php-format
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 

-#: ../../include/message.php:14
+#: ../../include/message.php:15 ../../include/message.php:171

 msgid "[no subject]"
 msgstr ""
 
 msgid "[no subject]"
 msgstr ""
 

-#: ../../include/acl_selectors.php:279
+#: ../../include/acl_selectors.php:286

 msgid "Visible to everybody"
 msgstr ""
 
 msgid "Visible to everybody"
 msgstr ""
 

-#: ../../include/acl_selectors.php:280
-msgid "show"
-msgstr ""
-
-#: ../../include/acl_selectors.php:281
-msgid "don't show"
-msgstr ""
-
-#: ../../include/enotify.php:8
+#: ../../include/enotify.php:14

 msgid "Friendica Notification"
 msgstr ""
 
 msgid "Friendica Notification"
 msgstr ""
 

-#: ../../include/enotify.php:11
+#: ../../include/enotify.php:17

 msgid "Thank You,"
 msgstr ""
 
 msgid "Thank You,"
 msgstr ""
 

-#: ../../include/enotify.php:13
+#: ../../include/enotify.php:19

 #, php-format
 msgid "%s Administrator"
 msgstr ""
 
 #, php-format
 msgid "%s Administrator"
 msgstr ""
 

-#: ../../include/enotify.php:28
+#: ../../include/enotify.php:35
+#, php-format
+msgid "%s <!item_type!>"
+msgstr ""
+
+#: ../../include/enotify.php:39

 #, php-format
 #, php-format

-msgid "New mail received at %s"
+msgid "[Friendica:Notify] New mail received at %s"

 msgstr ""
 
 msgstr ""
 

-#: ../../include/enotify.php:30
+#: ../../include/enotify.php:41

 #, php-format
 msgid "%s sent you a new private message at %s."
 msgstr ""
 
 #, php-format
 msgid "%s sent you a new private message at %s."
 msgstr ""
 

-#: ../../include/enotify.php:31
+#: ../../include/enotify.php:42

 #, php-format
 msgid "%s sent you %s."
 msgstr ""
 
 #, php-format
 msgid "%s sent you %s."
 msgstr ""
 

-#: ../../include/enotify.php:31
+#: ../../include/enotify.php:42

 msgid "a private message"
 msgstr ""
 
 msgid "a private message"
 msgstr ""
 

-#: ../../include/enotify.php:32
+#: ../../include/enotify.php:43

 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr ""
 
 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr ""
 

-#: ../../include/enotify.php:40
+#: ../../include/enotify.php:73

 #, php-format
 #, php-format

-msgid "%s commented on an item at %s"
+msgid "%s's"

 msgstr ""
 
 msgstr ""
 

-#: ../../include/enotify.php:41
+#: ../../include/enotify.php:77
+msgid "your"
+msgstr ""
+
+#: ../../include/enotify.php:84

 #, php-format
 #, php-format

-msgid "%s commented on an item/conversation you have been following."
+msgid "[Friendica:Notify] Comment to conversation #%d by %s"

 msgstr ""
 
 msgstr ""
 

-#: ../../include/enotify.php:42
+#: ../../include/enotify.php:85

 #, php-format
 #, php-format

-msgid "%s commented in %s."
+msgid "%s commented on an item/conversation you have been following."

 msgstr ""
 
 msgstr ""
 

-#: ../../include/enotify.php:42
-msgid "a watched conversation"
+#: ../../include/enotify.php:86
+#, php-format
+msgid "%s commented on %s."

 msgstr ""
 
 msgstr ""
 

-#: ../../include/enotify.php:44 ../../include/enotify.php:54
-#: ../../include/enotify.php:64 ../../include/enotify.php:74
+#: ../../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 ""
 
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
 msgstr ""
 

-#: ../../include/enotify.php:51
+#: ../../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 ""
 
 #, php-format
 msgid "%s posted to your profile wall at %s"
 msgstr ""
 

-#: ../../include/enotify.php:52
+#: ../../include/enotify.php:99

 #, php-format
 msgid "%s posted to %s"
 msgstr ""
 
 #, php-format
 msgid "%s posted to %s"
 msgstr ""
 

-#: ../../include/enotify.php:52
+#: ../../include/enotify.php:99

 msgid "your profile wall."
 msgstr ""
 
 msgid "your profile wall."
 msgstr ""
 

-#: ../../include/enotify.php:61
+#: ../../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 ""
 
 #, php-format
 msgid "%s tagged you at %s"
 msgstr ""
 

-#: ../../include/enotify.php:62
+#: ../../include/enotify.php:110

 #, php-format
 msgid "%s %s."
 msgstr ""
 
 #, php-format
 msgid "%s %s."
 msgstr ""
 

-#: ../../include/enotify.php:62
+#: ../../include/enotify.php:110

 msgid "tagged you"
 msgstr ""
 
 msgid "tagged you"
 msgstr ""
 

-#: ../../include/enotify.php:71
+#: ../../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 ""
 
 #, php-format
 msgid "%s tagged your post at %s"
 msgstr ""
 

-#: ../../include/enotify.php:72
+#: ../../include/enotify.php:121

 #, php-format
 msgid "%s tagged %s"
 msgstr ""
 
 #, php-format
 msgid "%s tagged %s"
 msgstr ""
 

-#: ../../include/enotify.php:72
+#: ../../include/enotify.php:121

 msgid "your post"
 msgstr ""
 
 msgid "your post"
 msgstr ""
 

-#: ../../include/enotify.php:81
-#, php-format
-msgid "Introduction received at %s"
+#: ../../include/enotify.php:130
+msgid "[Friendica:Notify] Introduction received"

 msgstr ""
 
 msgstr ""
 

-#: ../../include/enotify.php:82
+#: ../../include/enotify.php:131

 #, php-format
 msgid "You've received an introduction from '%s' at %s"
 msgstr ""
 
 #, php-format
 msgid "You've received an introduction from '%s' at %s"
 msgstr ""
 

-#: ../../include/enotify.php:83
+#: ../../include/enotify.php:132

 #, php-format
 msgid "You've received %s from %s."
 msgstr ""
 
 #, php-format
 msgid "You've received %s from %s."
 msgstr ""
 

-#: ../../include/enotify.php:83
+#: ../../include/enotify.php:132

 msgid "an introduction"
 msgstr ""
 
 msgid "an introduction"
 msgstr ""
 

-#: ../../include/enotify.php:84 ../../include/enotify.php:101
+#: ../../include/enotify.php:133 ../../include/enotify.php:150

 #, php-format
 msgid "You may visit their profile at %s"
 msgstr ""
 
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr ""
 

-#: ../../include/enotify.php:86
+#: ../../include/enotify.php:135

 #, php-format
 msgid "Please visit %s to approve or reject the introduction."
 msgstr ""
 
 #, php-format
 msgid "Please visit %s to approve or reject the introduction."
 msgstr ""
 

-#: ../../include/enotify.php:93
-#, php-format
-msgid "Friend suggestion received at %s"
+#: ../../include/enotify.php:142
+msgid "[Friendica:Notify] Friend suggestion received"

 msgstr ""
 
 msgstr ""
 

-#: ../../include/enotify.php:94
+#: ../../include/enotify.php:143

 #, php-format
 msgid "You've received a friend suggestion from '%s' at %s"
 msgstr ""
 
 #, php-format
 msgid "You've received a friend suggestion from '%s' at %s"
 msgstr ""
 

-#: ../../include/enotify.php:95
+#: ../../include/enotify.php:144

 #, php-format
 msgid "You've received %s for %s from %s."
 msgstr ""
 
 #, php-format
 msgid "You've received %s for %s from %s."
 msgstr ""
 

-#: ../../include/enotify.php:96
+#: ../../include/enotify.php:145

 msgid "a friend suggestion"
 msgstr ""
 
 msgid "a friend suggestion"
 msgstr ""
 

-#: ../../include/enotify.php:99
+#: ../../include/enotify.php:148

 msgid "Name:"
 msgstr ""
 
 msgid "Name:"
 msgstr ""
 

-#: ../../include/enotify.php:100
+#: ../../include/enotify.php:149

 msgid "Photo:"
 msgstr ""
 
 msgid "Photo:"
 msgstr ""
 

-#: ../../include/enotify.php:103
+#: ../../include/enotify.php:152

 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 

-#: ../../include/items.php:2511
+#: ../../include/items.php:2736

 msgid "A new person is sharing with you at "
 msgstr ""
 
 msgid "A new person is sharing with you at "
 msgstr ""
 

-#: ../../include/items.php:2511
+#: ../../include/items.php:2736

 msgid "You have a new follower at "
 msgstr ""
 
 msgid "You have a new follower at "
 msgstr ""
 

-#: ../../include/bb2diaspora.php:83
-msgid "view full size"
+#: ../../include/bb2diaspora.php:102 ../../include/bb2diaspora.php:112
+#: ../../include/bb2diaspora.php:113
+msgid "image/photo"

 msgstr ""
 
 msgstr ""
 

-#: ../../include/bb2diaspora.php:132 ../../include/bb2diaspora.php:142
-#: ../../include/bb2diaspora.php:143
-msgid "image/photo"
+#: ../../include/bb2diaspora.php:102
+msgid "link"

 msgstr ""
 
 msgstr ""
 

-#: ../../include/security.php:20
+#: ../../include/security.php:21

 msgid "Welcome "
 msgstr ""
 
 msgid "Welcome "
 msgstr ""
 

-#: ../../include/security.php:21
+#: ../../include/security.php:22

 msgid "Please upload a profile photo."
 msgstr ""
 
 msgid "Please upload a profile photo."
 msgstr ""
 

-#: ../../include/security.php:24
+#: ../../include/security.php:25

 msgid "Welcome back "
 msgstr ""
 
 msgid "Welcome back "
 msgstr ""
 

-#: ../../include/Contact.php:131 ../../include/conversation.php:769
-msgid "View status"
+#: ../../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: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 ""
 
 msgstr ""
 

-#: ../../include/Contact.php:132 ../../include/conversation.php:770
-msgid "View profile"
+#: ../../include/Contact.php:205 ../../include/conversation.php:822
+msgid "View Photos"

 msgstr ""
 
 msgstr ""
 

-#: ../../include/Contact.php:133 ../../include/conversation.php:771
-msgid "View photos"
+#: ../../include/Contact.php:206 ../../include/Contact.php:219
+#: ../../include/conversation.php:823
+msgid "Network Posts"

 msgstr ""
 
 msgstr ""
 

-#: ../../include/Contact.php:134 ../../include/Contact.php:147
-#: ../../include/conversation.php:772
-msgid "View recent"
+#: ../../include/Contact.php:207 ../../include/Contact.php:219
+#: ../../include/conversation.php:824
+msgid "Edit Contact"

 msgstr ""
 
 msgstr ""
 

-#: ../../include/Contact.php:136 ../../include/Contact.php:147
-#: ../../include/conversation.php:774
+#: ../../include/Contact.php:208 ../../include/Contact.php:219
+#: ../../include/conversation.php:825

 msgid "Send PM"
 msgstr ""
 
 msgid "Send PM"
 msgstr ""
 


@@ -5594,251 +6987,309 @@ msgstr ""
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 

-#: ../../include/conversation.php:301 ../../include/conversation.php:562
+#: ../../include/conversation.php:320 ../../include/conversation.php:586

 msgid "Select"
 msgstr ""
 
 msgid "Select"
 msgstr ""
 

-#: ../../include/conversation.php:316 ../../include/conversation.php:648
-#: ../../include/conversation.php:649
+#: ../../include/conversation.php:337 ../../include/conversation.php:679
+#: ../../include/conversation.php:680

 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 

-#: ../../include/conversation.php:325 ../../include/conversation.php:660
+#: ../../include/conversation.php:347 ../../include/conversation.php:691

 #, php-format
 msgid "%s from %s"
 msgstr ""
 
 #, php-format
 msgid "%s from %s"
 msgstr ""
 

-#: ../../include/conversation.php:341
+#: ../../include/conversation.php:362

 msgid "View in context"
 msgstr ""
 
 msgid "View in context"
 msgstr ""
 

-#: ../../include/conversation.php:456
+#: ../../include/conversation.php:468

 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""
 
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../../include/conversation.php:459 ../../boot.php:448
-msgid "show more"
-msgstr ""
-
-#: ../../include/conversation.php:519
+#: ../../include/conversation.php:532

 msgid "like"
 msgstr ""
 
 msgid "like"
 msgstr ""
 

-#: ../../include/conversation.php:520
+#: ../../include/conversation.php:533

 msgid "dislike"
 msgstr ""
 
 msgid "dislike"
 msgstr ""
 

-#: ../../include/conversation.php:522
+#: ../../include/conversation.php:535

 msgid "Share this"
 msgstr ""
 
 msgid "Share this"
 msgstr ""
 

-#: ../../include/conversation.php:522
+#: ../../include/conversation.php:535

 msgid "share"
 msgstr ""
 
 msgid "share"
 msgstr ""
 

-#: ../../include/conversation.php:572
+#: ../../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 ""
 
 msgid "add star"
 msgstr ""
 

-#: ../../include/conversation.php:573
+#: ../../include/conversation.php:600

 msgid "remove star"
 msgstr ""
 
 msgid "remove star"
 msgstr ""
 

-#: ../../include/conversation.php:574
+#: ../../include/conversation.php:601

 msgid "toggle star status"
 msgstr ""
 
 msgid "toggle star status"
 msgstr ""
 

-#: ../../include/conversation.php:577
+#: ../../include/conversation.php:604

 msgid "starred"
 msgstr ""
 
 msgid "starred"
 msgstr ""
 

-#: ../../include/conversation.php:578
+#: ../../include/conversation.php:605

 msgid "add tag"
 msgstr ""
 
 msgid "add tag"
 msgstr ""
 

-#: ../../include/conversation.php:650
+#: ../../include/conversation.php:609
+msgid "save to folder"
+msgstr ""
+
+#: ../../include/conversation.php:681

 msgid "to"
 msgstr ""
 
 msgid "to"
 msgstr ""
 

-#: ../../include/conversation.php:651
+#: ../../include/conversation.php:682

 msgid "Wall-to-Wall"
 msgstr ""
 
 msgid "Wall-to-Wall"
 msgstr ""
 

-#: ../../include/conversation.php:652
+#: ../../include/conversation.php:683

 msgid "via Wall-To-Wall:"
 msgstr ""
 
 msgid "via Wall-To-Wall:"
 msgstr ""
 

-#: ../../include/conversation.php:694
+#: ../../include/conversation.php:728

 msgid "Delete Selected Items"
 msgstr ""
 
 msgid "Delete Selected Items"
 msgstr ""
 

-#: ../../include/conversation.php:826
+#: ../../include/conversation.php:879

 #, php-format
 msgid "%s likes this."
 msgstr ""
 
 #, php-format
 msgid "%s likes this."
 msgstr ""
 

-#: ../../include/conversation.php:826
+#: ../../include/conversation.php:879

 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 

-#: ../../include/conversation.php:830
+#: ../../include/conversation.php:883

 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""
 
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""
 

-#: ../../include/conversation.php:832
+#: ../../include/conversation.php:885

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

-#: ../../include/conversation.php:838
+#: ../../include/conversation.php:891

 msgid "and"
 msgstr ""
 
 msgid "and"
 msgstr ""
 

-#: ../../include/conversation.php:841
+#: ../../include/conversation.php:894

 #, php-format
 msgid ", and %d other people"
 msgstr ""
 
 #, php-format
 msgid ", and %d other people"
 msgstr ""
 

-#: ../../include/conversation.php:842
+#: ../../include/conversation.php:895

 #, php-format
 msgid "%s like this."
 msgstr ""
 
 #, php-format
 msgid "%s like this."
 msgstr ""
 

-#: ../../include/conversation.php:842
+#: ../../include/conversation.php:895

 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 

-#: ../../include/conversation.php:867
+#: ../../include/conversation.php:920

 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 

-#: ../../include/conversation.php:869
+#: ../../include/conversation.php:922

 msgid "Please enter a video link/URL:"
 msgstr ""
 
 msgid "Please enter a video link/URL:"
 msgstr ""
 

-#: ../../include/conversation.php:870
+#: ../../include/conversation.php:923

 msgid "Please enter an audio link/URL:"
 msgstr ""
 
 msgid "Please enter an audio link/URL:"
 msgstr ""
 

-#: ../../include/conversation.php:871
+#: ../../include/conversation.php:924

 msgid "Tag term:"
 msgstr ""
 
 msgid "Tag term:"
 msgstr ""
 

-#: ../../include/conversation.php:872
+#: ../../include/conversation.php:926

 msgid "Where are you right now?"
 msgstr ""
 
 msgid "Where are you right now?"
 msgstr ""
 

-#: ../../include/conversation.php:873
-msgid "Enter a title for this item"
-msgstr ""
-
-#: ../../include/conversation.php:916
+#: ../../include/conversation.php:969

 msgid "upload photo"
 msgstr ""
 
 msgid "upload photo"
 msgstr ""
 

-#: ../../include/conversation.php:918
+#: ../../include/conversation.php:971

 msgid "attach file"
 msgstr ""
 
 msgid "attach file"
 msgstr ""
 

-#: ../../include/conversation.php:920
+#: ../../include/conversation.php:973

 msgid "web link"
 msgstr ""
 
 msgid "web link"
 msgstr ""
 

-#: ../../include/conversation.php:921
+#: ../../include/conversation.php:974

 msgid "Insert video link"
 msgstr ""
 
 msgid "Insert video link"
 msgstr ""
 

-#: ../../include/conversation.php:922
+#: ../../include/conversation.php:975

 msgid "video link"
 msgstr ""
 
 msgid "video link"
 msgstr ""
 

-#: ../../include/conversation.php:923
+#: ../../include/conversation.php:976

 msgid "Insert audio link"
 msgstr ""
 
 msgid "Insert audio link"
 msgstr ""
 

-#: ../../include/conversation.php:924
+#: ../../include/conversation.php:977

 msgid "audio link"
 msgstr ""
 
 msgid "audio link"
 msgstr ""
 

-#: ../../include/conversation.php:926
+#: ../../include/conversation.php:979

 msgid "set location"
 msgstr ""
 
 msgid "set location"
 msgstr ""
 

-#: ../../include/conversation.php:928
+#: ../../include/conversation.php:981

 msgid "clear location"
 msgstr ""
 
 msgid "clear location"
 msgstr ""
 

-#: ../../include/conversation.php:933
+#: ../../include/conversation.php:988

 msgid "permissions"
 msgstr ""
 
 msgid "permissions"
 msgstr ""
 

-#: ../../boot.php:446
+#: ../../boot.php:515

 msgid "Delete this item?"
 msgstr ""
 
 msgid "Delete this item?"
 msgstr ""
 

-#: ../../boot.php:449
+#: ../../boot.php:518

 msgid "show fewer"
 msgstr ""
 
 msgid "show fewer"
 msgstr ""
 

-#: ../../boot.php:692
+#: ../../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 ""
 
 msgid "Create a New Account"
 msgstr ""
 

-#: ../../boot.php:712
+#: ../../boot.php:817

 msgid "Nickname or Email address: "
 msgstr ""
 
 msgid "Nickname or Email address: "
 msgstr ""
 

-#: ../../boot.php:713
+#: ../../boot.php:818

 msgid "Password: "
 msgstr ""
 
 msgid "Password: "
 msgstr ""
 

-#: ../../boot.php:716
+#: ../../boot.php:821

 msgid "Or login using OpenID: "
 msgstr ""
 
 msgid "Or login using OpenID: "
 msgstr ""
 

-#: ../../boot.php:722
+#: ../../boot.php:827

 msgid "Forgot your password?"
 msgstr ""
 
 msgid "Forgot your password?"
 msgstr ""
 

-#: ../../boot.php:879
+#: ../../boot.php:994

 msgid "Edit profile"
 msgstr ""
 
 msgid "Edit profile"
 msgstr ""
 

-#: ../../boot.php:1046 ../../boot.php:1117
+#: ../../boot.php:1054
+msgid "Message"
+msgstr ""
+
+#: ../../boot.php:1170 ../../boot.php:1246

 msgid "g A l F d"
 msgstr ""
 
 msgid "g A l F d"
 msgstr ""
 

-#: ../../boot.php:1047 ../../boot.php:1118
+#: ../../boot.php:1171 ../../boot.php:1247

 msgid "F d"
 msgstr ""
 
 msgid "F d"
 msgstr ""
 

-#: ../../boot.php:1072
+#: ../../boot.php:1216 ../../boot.php:1287
+msgid "[today]"
+msgstr ""
+
+#: ../../boot.php:1228

 msgid "Birthday Reminders"
 msgstr ""
 
 msgid "Birthday Reminders"
 msgstr ""
 

-#: ../../boot.php:1073
+#: ../../boot.php:1229

 msgid "Birthdays this week:"
 msgstr ""
 
 msgid "Birthdays this week:"
 msgstr ""
 

-#: ../../boot.php:1096 ../../boot.php:1160
-msgid "[today]"
+#: ../../boot.php:1280
+msgid "[No description]"

 msgstr ""
 
 msgstr ""
 

-#: ../../boot.php:1141
+#: ../../boot.php:1298

 msgid "Event Reminders"
 msgstr ""
 
 msgid "Event Reminders"
 msgstr ""
 

-#: ../../boot.php:1142
+#: ../../boot.php:1299

 msgid "Events this week:"
 msgstr ""
 
 msgid "Events this week:"
 msgstr ""
 

-#: ../../boot.php:1154
-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 ""
 msgstr ""