Merge https://github.com/friendica/friendica into pull

[friendica.git] / util / messages.po

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

-"Project-Id-Version: 2.3.1273\n"
+"Project-Id-Version: 2.3.1312\n"

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

-"POT-Creation-Date: 2012-03-06 15:09-0800\n"
+"POT-Creation-Date: 2012-04-14 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,29 @@ msgstr ""
 msgid "Contact update failed."
 msgstr ""
 
 msgid "Contact update failed."
 msgstr ""
 

-#: ../../mod/crepair.php:115 ../../mod/wall_attach.php:43
+#: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44

 #: ../../mod/fsuggest.php:78 ../../mod/events.php:110 ../../mod/api.php:26
 #: ../../mod/fsuggest.php:78 ../../mod/events.php:110 ../../mod/api.php:26

-#: ../../mod/api.php:31 ../../mod/photos.php:129 ../../mod/photos.php:865
+#: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:866

 #: ../../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:411
-#: ../../mod/settings.php:416 ../../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:133 ../../mod/profiles.php:7
-#: ../../mod/profiles.php:229 ../../mod/delegate.php:6
-#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
-#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:332
-#: ../../include/items.php:3030 ../../index.php:288
+#: ../../mod/notifications.php:66 ../../mod/contacts.php:125
+#: ../../mod/settings.php:99 ../../mod/settings.php:514
+#: ../../mod/settings.php:519 ../../mod/manage.php:86 ../../mod/network.php:6
+#: ../../mod/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:38
+#: ../../mod/message.php:90 ../../mod/allfriends.php:9
+#: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:46
+#: ../../mod/follow.php:8 ../../mod/common.php:9 ../../mod/display.php:138
+#: ../../mod/profiles.php:7 ../../mod/profiles.php:329
+#: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13
+#: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53
+#: ../../addon/facebook/facebook.php:461 ../../include/items.php:3142
+#: ../../index.php:309

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


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

-#: ../../mod/crepair.php:148 ../../mod/settings.php:462
-#: ../../mod/settings.php:488 ../../mod/admin.php:484 ../../mod/admin.php:493
+#: ../../mod/crepair.php:148 ../../mod/settings.php:534
+#: ../../mod/settings.php:560 ../../mod/admin.php:544 ../../mod/admin.php:553

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


@@ -119,38 +123,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:400 ../../mod/photos.php:901 ../../mod/photos.php:959
+#: ../../mod/photos.php:1194 ../../mod/photos.php:1234
+#: ../../mod/photos.php:1274 ../../mod/photos.php:1305

 #: ../../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:460 ../../mod/settings.php:603
-#: ../../mod/settings.php:797 ../../mod/manage.php:109 ../../mod/group.php:80
-#: ../../mod/admin.php:313 ../../mod/admin.php:481 ../../mod/admin.php:609
-#: ../../mod/admin.php:776 ../../mod/admin.php:856 ../../mod/profiles.php:375
-#: ../../mod/invite.php:106 ../../addon/facebook/facebook.php:411
-#: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:92
-#: ../../addon/nsfw/nsfw.php:57
+#: ../../mod/localtime.php:45 ../../mod/contacts.php:325
+#: ../../mod/settings.php:532 ../../mod/settings.php:678
+#: ../../mod/settings.php:739 ../../mod/settings.php:930
+#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:374
+#: ../../mod/admin.php:541 ../../mod/admin.php:670 ../../mod/admin.php:850
+#: ../../mod/admin.php:930 ../../mod/profiles.php:498 ../../mod/invite.php:119
+#: ../../addon/facebook/facebook.php:552 ../../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/dwpost/dwpost.php:92
+#: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93

 #: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187
 #: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187

-#: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:69
+#: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:80

 #: ../../addon/blockem/blockem.php:57 ../../addon/qcomment/qcomment.php:61
 #: ../../addon/openstreetmap/openstreetmap.php:70
 #: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:94
 #: ../../addon/blockem/blockem.php:57 ../../addon/qcomment/qcomment.php:61
 #: ../../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/gravatar/gravatar.php:86
+#: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93
+#: ../../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:553 ../../addon/tumblr/tumblr.php:90

 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88
 #: ../../addon/wppost/wppost.php:102 ../../addon/showmore/showmore.php:48
 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88
 #: ../../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/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180
+#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375
+#: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102

 #: ../../addon/posterous/posterous.php:90
 #: ../../addon/posterous/posterous.php:90

-#: ../../view/theme/quattro/theme.php:15 ../../include/conversation.php:552
+#: ../../view/theme/diabook-red/config.php:64
+#: ../../view/theme/diabook-blue/config.php:64
+#: ../../view/theme/diabook/config.php:64
+#: ../../view/theme/quattro/config.php:52
+#: ../../view/theme/diabook-aerith/config.php:64
+#: ../../include/conversation.php:555

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


@@ -158,24 +170,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:228

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

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

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


@@ -204,11 +216,15 @@ msgstr ""
 msgid "Edit event"
 msgstr ""
 
 msgid "Edit event"
 msgstr ""
 

-#: ../../mod/events.php:272 ../../include/text.php:982
+#: ../../mod/events.php:272 ../../include/text.php:1053

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

-#: ../../mod/events.php:296 ../../include/nav.php:50 ../../boot.php:1349
+#: ../../mod/events.php:296 ../../view/theme/diabook-red/theme.php:243
+#: ../../view/theme/diabook-blue/theme.php:243
+#: ../../view/theme/diabook/theme.php:251
+#: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:52
+#: ../../boot.php:1470

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


@@ -258,7 +274,7 @@ msgid "Description:"
 msgstr ""
 
 #: ../../mod/events.php:395 ../../include/event.php:37
 msgstr ""
 
 #: ../../mod/events.php:395 ../../include/event.php:37

-#: ../../include/bb2diaspora.php:260 ../../boot.php:980
+#: ../../include/bb2diaspora.php:260 ../../boot.php:1082

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


@@ -267,8 +283,8 @@ msgid "Share this event"
 msgstr ""
 
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
 msgstr ""
 
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94

-#: ../../mod/dfrn_request.php:686 ../../mod/settings.php:461
-#: ../../mod/settings.php:487 ../../addon/js_upload/js_upload.php:45
+#: ../../mod/dfrn_request.php:752 ../../mod/settings.php:533
+#: ../../mod/settings.php:559 ../../addon/js_upload/js_upload.php:45

 msgid "Cancel"
 msgstr ""
 
 msgid "Cancel"
 msgstr ""
 


@@ -288,7 +304,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 ""


@@ -311,245 +327,257 @@ 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:692 ../../mod/settings.php:698
-#: ../../mod/settings.php:706 ../../mod/settings.php:710
-#: ../../mod/settings.php:715 ../../mod/settings.php:721
-#: ../../mod/settings.php:727 ../../mod/settings.php:787
-#: ../../mod/settings.php:788 ../../mod/settings.php:789
-#: ../../mod/settings.php:790 ../../mod/register.php:524
-#: ../../mod/profiles.php:357
+#: ../../mod/api.php:105 ../../mod/dfrn_request.php:740
+#: ../../mod/settings.php:844 ../../mod/settings.php:850
+#: ../../mod/settings.php:858 ../../mod/settings.php:862
+#: ../../mod/settings.php:867 ../../mod/settings.php:873
+#: ../../mod/settings.php:879 ../../mod/settings.php:885
+#: ../../mod/settings.php:921 ../../mod/settings.php:922
+#: ../../mod/settings.php:923 ../../mod/settings.php:924
+#: ../../mod/register.php:532 ../../mod/profiles.php:475

 msgid "Yes"
 msgstr ""
 
 msgid "Yes"
 msgstr ""
 

-#: ../../mod/api.php:106 ../../mod/dfrn_request.php:677
-#: ../../mod/settings.php:692 ../../mod/settings.php:698
-#: ../../mod/settings.php:706 ../../mod/settings.php:710
-#: ../../mod/settings.php:715 ../../mod/settings.php:721
-#: ../../mod/settings.php:727 ../../mod/settings.php:787
-#: ../../mod/settings.php:788 ../../mod/settings.php:789
-#: ../../mod/settings.php:790 ../../mod/register.php:525
-#: ../../mod/profiles.php:358
+#: ../../mod/api.php:106 ../../mod/dfrn_request.php:741
+#: ../../mod/settings.php:844 ../../mod/settings.php:850
+#: ../../mod/settings.php:858 ../../mod/settings.php:862
+#: ../../mod/settings.php:867 ../../mod/settings.php:873
+#: ../../mod/settings.php:879 ../../mod/settings.php:885
+#: ../../mod/settings.php:921 ../../mod/settings.php:922
+#: ../../mod/settings.php:923 ../../mod/settings.php:924
+#: ../../mod/register.php:533 ../../mod/profiles.php:476

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

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

 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:880
+#: ../../mod/photos.php:951 ../../mod/photos.php:966 ../../mod/photos.php:1383
+#: ../../mod/photos.php:1395 ../../addon/communityhome/communityhome.php:110
+#: ../../view/theme/diabook-red/theme.php:113
+#: ../../view/theme/diabook-blue/theme.php:113
+#: ../../view/theme/diabook/theme.php:117
+#: ../../view/theme/diabook-aerith/theme.php:114

 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:976 ../../mod/photos.php:1425

 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:598 ../../mod/photos.php:951
+#: ../../mod/photos.php:966 ../../mod/register.php:335
+#: ../../mod/register.php:342 ../../mod/register.php:349
+#: ../../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-red/theme.php:114
+#: ../../view/theme/diabook-blue/theme.php:114
+#: ../../view/theme/diabook/theme.php:118
+#: ../../view/theme/diabook-aerith/theme.php:115

 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:960

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

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

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

-#: ../../mod/photos.php:528
+#: ../../mod/photos.php:529

 msgid "was tagged in a"
 msgstr ""
 
 msgid "was tagged in a"
 msgstr ""
 

-#: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70
-#: ../../addon/communityhome/communityhome.php:163 ../../include/text.php:1226
-#: ../../include/diaspora.php:1600 ../../include/conversation.php:53
+#: ../../mod/photos.php:529 ../../mod/like.php:127 ../../mod/tagger.php:70
+#: ../../addon/communityhome/communityhome.php:163
+#: ../../view/theme/diabook-red/theme.php:85
+#: ../../view/theme/diabook-blue/theme.php:85
+#: ../../view/theme/diabook/theme.php:89
+#: ../../view/theme/diabook-aerith/theme.php:86 ../../include/text.php:1304
+#: ../../include/diaspora.php:1654 ../../include/conversation.php:53

 #: ../../include/conversation.php:126
 msgid "photo"
 msgstr ""
 
 #: ../../include/conversation.php:126
 msgid "photo"
 msgstr ""
 

-#: ../../mod/photos.php:528
+#: ../../mod/photos.php:529

 msgid "by"
 msgstr ""
 
 msgid "by"
 msgstr ""
 

-#: ../../mod/photos.php:631 ../../addon/js_upload/js_upload.php:315
+#: ../../mod/photos.php:632 ../../addon/js_upload/js_upload.php:315

 msgid "Image exceeds size limit of "
 msgstr ""
 
 msgid "Image exceeds size limit of "
 msgstr ""
 

-#: ../../mod/photos.php:639
+#: ../../mod/photos.php:640

 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:654 ../../mod/profile_photo.php:124
+#: ../../mod/wall_upload.php:69

 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:674 ../../mod/profile_photo.php:257
+#: ../../mod/wall_upload.php:88

 msgid "Image upload failed."
 msgstr ""
 
 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/photos.php:760 ../../mod/community.php:16
+#: ../../mod/dfrn_request.php:671 ../../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 ""
 

-#: ../../mod/photos.php:769
+#: ../../mod/photos.php:770

 msgid "No photos selected"
 msgstr ""
 
 msgid "No photos selected"
 msgstr ""
 

-#: ../../mod/photos.php:846
+#: ../../mod/photos.php:847

 msgid "Access to this item is restricted."
 msgstr ""
 
 msgid "Access to this item is restricted."
 msgstr ""
 

-#: ../../mod/photos.php:907
+#: ../../mod/photos.php:908

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

-#: ../../mod/photos.php:910 ../../mod/photos.php:954
+#: ../../mod/photos.php:911 ../../mod/photos.php:955

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

-#: ../../mod/photos.php:911
+#: ../../mod/photos.php:912

 msgid "or existing album name: "
 msgstr ""
 
 msgid "or existing album name: "
 msgstr ""
 

-#: ../../mod/photos.php:912
+#: ../../mod/photos.php:913

 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:915 ../../mod/photos.php:1190

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

-#: ../../mod/photos.php:969
+#: ../../mod/photos.php:970

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

-#: ../../mod/photos.php:984 ../../mod/photos.php:1396
+#: ../../mod/photos.php:985 ../../mod/photos.php:1408

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

-#: ../../mod/photos.php:1019
+#: ../../mod/photos.php:1020

 msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
 msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 

-#: ../../mod/photos.php:1021
+#: ../../mod/photos.php:1022

 msgid "Photo not available"
 msgstr ""
 
 msgid "Photo not available"
 msgstr ""
 

-#: ../../mod/photos.php:1071
+#: ../../mod/photos.php:1072

 msgid "View photo"
 msgstr ""
 
 msgid "View photo"
 msgstr ""
 

-#: ../../mod/photos.php:1071
+#: ../../mod/photos.php:1072

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

-#: ../../mod/photos.php:1072
+#: ../../mod/photos.php:1073

 msgid "Use as profile photo"
 msgstr ""
 
 msgid "Use as profile photo"
 msgstr ""
 

-#: ../../mod/photos.php:1078 ../../include/conversation.php:482
+#: ../../mod/photos.php:1079 ../../include/conversation.php:480

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 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:529
+#: ../../mod/photos.php:1212 ../../include/conversation.php:529

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

-#: ../../mod/photos.php:1201 ../../include/conversation.php:530
+#: ../../mod/photos.php:1213 ../../include/conversation.php:530

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

-#: ../../mod/photos.php:1202 ../../include/conversation.php:933
+#: ../../mod/photos.php:1214 ../../include/conversation.php:960

 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:348 ../../include/conversation.php:694
-#: ../../include/conversation.php:950
+#: ../../mod/photos.php:1215 ../../mod/editpost.php:104
+#: ../../mod/wallmessage.php:145 ../../mod/message.php:188
+#: ../../mod/message.php:357 ../../include/conversation.php:362
+#: ../../include/conversation.php:702 ../../include/conversation.php:979

 msgid "Please wait"
 msgstr ""
 
 msgid "Please wait"
 msgstr ""
 

-#: ../../mod/photos.php:1219 ../../mod/photos.php:1259
-#: ../../mod/photos.php:1290 ../../include/conversation.php:549
+#: ../../mod/photos.php:1231 ../../mod/photos.php:1271
+#: ../../mod/photos.php:1302 ../../include/conversation.php:552

 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:551
-#: ../../boot.php:447
+#: ../../mod/photos.php:1233 ../../mod/photos.php:1273
+#: ../../mod/photos.php:1304 ../../include/conversation.php:554
+#: ../../boot.php:495

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

-#: ../../mod/photos.php:1223 ../../mod/editpost.php:123
-#: ../../include/conversation.php:553 ../../include/conversation.php:968
+#: ../../mod/photos.php:1235 ../../mod/editpost.php:125
+#: ../../include/conversation.php:556 ../../include/conversation.php:997

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

-#: ../../mod/photos.php:1320 ../../mod/settings.php:520
-#: ../../mod/settings.php:601 ../../mod/group.php:158 ../../mod/admin.php:488
-#: ../../include/conversation.php:304 ../../include/conversation.php:573
+#: ../../mod/photos.php:1332 ../../mod/settings.php:595
+#: ../../mod/settings.php:676 ../../mod/group.php:168 ../../mod/admin.php:548
+#: ../../include/conversation.php:318 ../../include/conversation.php:576

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

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

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

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

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


@@ -557,43 +585,46 @@ msgstr ""
 msgid "Not available."
 msgstr ""
 
 msgid "Not available."
 msgstr ""
 

-#: ../../mod/community.php:30 ../../include/nav.php:97
+#: ../../mod/community.php:30 ../../view/theme/diabook-red/theme.php:245
+#: ../../view/theme/diabook-blue/theme.php:245
+#: ../../view/theme/diabook/theme.php:253
+#: ../../view/theme/diabook-aerith/theme.php:246 ../../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:115

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

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

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

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

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

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

 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:52

 msgid "Bug reports and issues: please visit"
 msgstr ""
 
 msgid "Bug reports and issues: please visit"
 msgstr ""
 

-#: ../../mod/friendica.php:49
+#: ../../mod/friendica.php:53

 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:58
+msgid "Installed plugins/addons/apps:"

 msgstr ""
 
 msgstr ""
 

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

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


@@ -605,26 +636,28 @@ msgstr ""
 msgid "Edit post"
 msgstr ""
 
 msgid "Edit post"
 msgstr ""
 

-#: ../../mod/editpost.php:80 ../../include/conversation.php:919
+#: ../../mod/editpost.php:80 ../../include/conversation.php:946

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

-#: ../../mod/editpost.php:95 ../../mod/settings.php:519
-#: ../../include/conversation.php:560
+#: ../../mod/editpost.php:95 ../../mod/settings.php:594
+#: ../../include/conversation.php:563

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

-#: ../../mod/editpost.php:96 ../../mod/message.php:153
-#: ../../mod/message.php:294 ../../include/conversation.php:934
+#: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143
+#: ../../mod/message.php:186 ../../mod/message.php:355
+#: ../../include/conversation.php:961

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

-#: ../../mod/editpost.php:97 ../../include/conversation.php:936
+#: ../../mod/editpost.php:97 ../../include/conversation.php:963

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

-#: ../../mod/editpost.php:98 ../../mod/message.php:154
-#: ../../mod/message.php:295 ../../include/conversation.php:938
+#: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144
+#: ../../mod/message.php:187 ../../mod/message.php:356
+#: ../../include/conversation.php:965

 msgid "Insert web link"
 msgstr ""
 
 msgid "Insert web link"
 msgstr ""
 


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

-#: ../../mod/editpost.php:102 ../../include/conversation.php:944
+#: ../../mod/editpost.php:102 ../../include/conversation.php:971

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

-#: ../../mod/editpost.php:103 ../../include/conversation.php:946
+#: ../../mod/editpost.php:103 ../../include/conversation.php:973

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

-#: ../../mod/editpost.php:105 ../../include/conversation.php:951
+#: ../../mod/editpost.php:105 ../../include/conversation.php:980

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

-#: ../../mod/editpost.php:113 ../../include/conversation.php:960
+#: ../../mod/editpost.php:113 ../../include/conversation.php:989

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

-#: ../../mod/editpost.php:114 ../../include/conversation.php:961
+#: ../../mod/editpost.php:114 ../../include/conversation.php:990

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

-#: ../../mod/editpost.php:117 ../../include/conversation.php:949
+#: ../../mod/editpost.php:117 ../../include/conversation.php:976

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

-#: ../../mod/editpost.php:118 ../../include/conversation.php:963
+#: ../../mod/editpost.php:119 ../../include/conversation.php:978
+msgid "Categories (comma-separated list)"
+msgstr ""
+
+#: ../../mod/editpost.php:120 ../../include/conversation.php:992

 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:427

 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:432

 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:434

 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:437

 #, 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:372

 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:385

 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:389

 #, 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:410

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

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

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

-#: ../../mod/dfrn_request.php:439 ../../mod/contacts.php:102
+#: ../../mod/dfrn_request.php:485 ../../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:506

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

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

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

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

 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:585

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

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

 #, 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:587

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

-#: ../../mod/dfrn_request.php:582 ../../include/items.php:2566
+#: ../../mod/dfrn_request.php:628 ../../include/items.php:2662

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

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

 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:731
+msgid "<strike>Connect as an email follower</strike> (Coming soon)"

 msgstr ""
 
 msgstr ""
 

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

 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:736

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

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

 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:738

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

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

 #, 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:742

 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:744 ../../include/contact_selectors.php:76

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

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

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

-#: ../../mod/dfrn_request.php:682 ../../mod/settings.php:555
+#: ../../mod/dfrn_request.php:746 ../../mod/settings.php:629

 #: ../../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:747
+#, 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:748

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

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

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


@@ -974,7 +1026,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


@@ -1129,7 +1181,7 @@ 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:1026

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


@@ -1154,184 +1206,187 @@ 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:308
+#: ../../mod/contacts.php:351

 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:182

 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-red/theme.php:239
+#: ../../view/theme/diabook-blue/theme.php:239
+#: ../../view/theme/diabook/theme.php:247
+#: ../../view/theme/diabook-aerith/theme.php:240 ../../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:102
+#: ../../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:356

 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:486
+#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
+#: ../../mod/admin.php:546

 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:61
+#: ../../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:65
+#: ../../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 ""
 


@@ -1371,200 +1426,206 @@ msgstr ""
 msgid "Contact has been removed."
 msgstr ""
 
 msgid "Contact has been removed."
 msgstr ""
 

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

 #, 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:255

 #, 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:260

 #, 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:277

 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:280

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

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

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

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

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

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

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

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

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

-#: ../../mod/contacts.php:287
+#: ../../mod/contacts.php:293

 #, 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:298

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

-#: ../../mod/contacts.php:297 ../../mod/contacts.php:344
-#: ../../mod/admin.php:490
+#: ../../mod/contacts.php:303 ../../mod/contacts.php:350
+#: ../../mod/admin.php:550

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

-#: ../../mod/contacts.php:297 ../../mod/contacts.php:344
-#: ../../mod/admin.php:489
+#: ../../mod/contacts.php:303 ../../mod/contacts.php:350
+#: ../../mod/admin.php:549

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

-#: ../../mod/contacts.php:302 ../../mod/contacts.php:345
+#: ../../mod/contacts.php:308 ../../mod/contacts.php:351

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

-#: ../../mod/contacts.php:307
+#: ../../mod/contacts.php:313

 msgid "Repair"
 msgstr ""
 
 msgid "Repair"
 msgstr ""
 

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

 msgid "Contact Editor"
 msgstr ""
 
 msgid "Contact Editor"
 msgstr ""
 

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

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

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

 #, 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:328

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

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

 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:334 ../../mod/contacts.php:507
+#: ../../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:335

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: ../../mod/contacts.php:341 ../../mod/admin.php:905
+#: ../../mod/contacts.php:347 ../../mod/admin.php:979

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

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

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

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

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

-#: ../../mod/contacts.php:350
+#: ../../mod/contacts.php:356

 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:179
+#: ../../mod/contacts.php:405
+msgid "Suggestions"
+msgstr ""
+
+#: ../../mod/contacts.php:410 ../../mod/group.php:191

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

-#: ../../mod/contacts.php:404
+#: ../../mod/contacts.php:415

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

-#: ../../mod/contacts.php:410
+#: ../../mod/contacts.php:421

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

-#: ../../mod/contacts.php:416
+#: ../../mod/contacts.php:427

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

-#: ../../mod/contacts.php:422
+#: ../../mod/contacts.php:433

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

-#: ../../mod/contacts.php:473
+#: ../../mod/contacts.php:483

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

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

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

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

 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:792
+#: ../../mod/contacts.php:508 ../../mod/nogroup.php:41

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

-#: ../../mod/contacts.php:519 ../../include/nav.php:132
+#: ../../mod/contacts.php:529 ../../view/theme/diabook-red/theme.php:241
+#: ../../view/theme/diabook-blue/theme.php:241
+#: ../../view/theme/diabook/theme.php:249
+#: ../../view/theme/diabook-aerith/theme.php:242 ../../include/nav.php:139

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

-#: ../../mod/contacts.php:523
+#: ../../mod/contacts.php:533

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

-#: ../../mod/contacts.php:524 ../../mod/directory.php:67
+#: ../../mod/contacts.php:534 ../../mod/directory.php:57

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

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

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


@@ -1572,510 +1633,558 @@ 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:726
-#: ../../include/items.php:2575
+#: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
+#: ../../mod/register.php:388 ../../mod/register.php:442
+#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732
+#: ../../addon/facebook/facebook.php:622
+#: ../../addon/facebook/facebook.php:1076
+#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2671

 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:809

 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:72
+#: ../../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
+msgid "Connected apps"
+msgstr ""
+
+#: ../../mod/settings.php:75
+msgid "Export personal data"
+msgstr ""
+
+#: ../../mod/settings.php:83 ../../mod/admin.php:631 ../../mod/admin.php:817
+#: ../../include/nav.php:137
+msgid "Settings"
+msgstr ""
+
+#: ../../mod/settings.php:126

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

-#: ../../mod/settings.php:75 ../../mod/settings.php:486 ../../mod/admin.php:75
+#: ../../mod/settings.php:129 ../../mod/settings.php:558
+#: ../../mod/admin.php:89

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

-#: ../../mod/settings.php:175
+#: ../../mod/settings.php:234

 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:180
+#: ../../mod/settings.php:239

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

-#: ../../mod/settings.php:198
+#: ../../mod/settings.php:298

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

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

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

-#: ../../mod/settings.php:214
+#: ../../mod/settings.php:314

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

-#: ../../mod/settings.php:216
+#: ../../mod/settings.php:316

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

-#: ../../mod/settings.php:280
+#: ../../mod/settings.php:379

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

-#: ../../mod/settings.php:282
+#: ../../mod/settings.php:381

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

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

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

-#: ../../mod/settings.php:290
+#: ../../mod/settings.php:389

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

-#: ../../mod/settings.php:358 ../../addon/facebook/facebook.php:321
-#: ../../addon/impressum/impressum.php:64
+#: ../../mod/settings.php:461 ../../addon/facebook/facebook.php:450
+#: ../../addon/impressum/impressum.php:75

 #: ../../addon/openstreetmap/openstreetmap.php:80
 #: ../../addon/openstreetmap/openstreetmap.php:80

-#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:350
+#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:370

 msgid "Settings updated."
 msgstr ""
 
 msgid "Settings updated."
 msgstr ""
 

-#: ../../mod/settings.php:422 ../../include/nav.php:130
-msgid "Account settings"
-msgstr ""
-
-#: ../../mod/settings.php:427
-msgid "Connector settings"
-msgstr ""
-
-#: ../../mod/settings.php:432
-msgid "Plugin settings"
-msgstr ""
-
-#: ../../mod/settings.php:437
-msgid "Connections"
-msgstr ""
-
-#: ../../mod/settings.php:442
-msgid "Export personal data"
-msgstr ""
-
-#: ../../mod/settings.php:459 ../../mod/settings.php:485
-#: ../../mod/settings.php:518
+#: ../../mod/settings.php:531 ../../mod/settings.php:557
+#: ../../mod/settings.php:593

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

-#: ../../mod/settings.php:463 ../../mod/settings.php:489
-#: ../../addon/statusnet/statusnet.php:526
+#: ../../mod/settings.php:535 ../../mod/settings.php:561
+#: ../../addon/statusnet/statusnet.php:547

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

-#: ../../mod/settings.php:464 ../../mod/settings.php:490
-#: ../../addon/statusnet/statusnet.php:525
+#: ../../mod/settings.php:536 ../../mod/settings.php:562
+#: ../../addon/statusnet/statusnet.php:546

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

-#: ../../mod/settings.php:465 ../../mod/settings.php:491
+#: ../../mod/settings.php:537 ../../mod/settings.php:563

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

-#: ../../mod/settings.php:466 ../../mod/settings.php:492
+#: ../../mod/settings.php:538 ../../mod/settings.php:564

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

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

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

-#: ../../mod/settings.php:517
+#: ../../mod/settings.php:592

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

-#: ../../mod/settings.php:521
+#: ../../mod/settings.php:596

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

-#: ../../mod/settings.php:522
+#: ../../mod/settings.php:597

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

-#: ../../mod/settings.php:523
+#: ../../mod/settings.php:598

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

-#: ../../mod/settings.php:535
+#: ../../mod/settings.php:609

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

-#: ../../mod/settings.php:542 ../../addon/widgets/widgets.php:122
+#: ../../mod/settings.php:617 ../../addon/widgets/widgets.php:123

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

-#: ../../mod/settings.php:555 ../../mod/settings.php:556
+#: ../../mod/settings.php:629 ../../mod/settings.php:630

 #, 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:555 ../../mod/settings.php:556
+#: ../../mod/settings.php:629 ../../mod/settings.php:630

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

-#: ../../mod/settings.php:555 ../../mod/settings.php:556
+#: ../../mod/settings.php:629 ../../mod/settings.php:630

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

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

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

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

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

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

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

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

 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:592
+#: ../../mod/settings.php:667

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

-#: ../../mod/settings.php:593
+#: ../../mod/settings.php:668

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

-#: ../../mod/settings.php:594
+#: ../../mod/settings.php:669

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

-#: ../../mod/settings.php:595
+#: ../../mod/settings.php:670

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

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

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

-#: ../../mod/settings.php:596 ../../mod/settings.php:601
+#: ../../mod/settings.php:671 ../../mod/settings.php:676

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

-#: ../../mod/settings.php:597
+#: ../../mod/settings.php:672

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

-#: ../../mod/settings.php:598
+#: ../../mod/settings.php:673

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

-#: ../../mod/settings.php:599
+#: ../../mod/settings.php:674

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

-#: ../../mod/settings.php:600
+#: ../../mod/settings.php:675

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

-#: ../../mod/settings.php:601
+#: ../../mod/settings.php:676

 msgid "Action after import:"
 msgstr ""
 
 msgid "Action after import:"
 msgstr ""
 

-#: ../../mod/settings.php:601
+#: ../../mod/settings.php:676

 msgid "Mark as seen"
 msgstr ""
 
 msgid "Mark as seen"
 msgstr ""
 

-#: ../../mod/settings.php:601
+#: ../../mod/settings.php:676

 msgid "Move to folder"
 msgstr ""
 
 msgid "Move to folder"
 msgstr ""
 

-#: ../../mod/settings.php:602
+#: ../../mod/settings.php:677

 msgid "Move to folder:"
 msgstr ""
 
 msgid "Move to folder:"
 msgstr ""
 

-#: ../../mod/settings.php:659 ../../mod/admin.php:142 ../../mod/admin.php:462
+#: ../../mod/settings.php:737
+msgid "Display Settings"
+msgstr ""
+
+#: ../../mod/settings.php:743
+msgid "Display Theme:"
+msgstr ""
+
+#: ../../mod/settings.php:744
+msgid "Update browser every xx seconds"
+msgstr ""
+
+#: ../../mod/settings.php:744
+msgid "Minimum of 10 seconds, no maximum"
+msgstr ""
+
+#: ../../mod/settings.php:745
+msgid "Number of items to display on the network page:"
+msgstr ""
+
+#: ../../mod/settings.php:745
+msgid "Maximum of 100 items"
+msgstr ""
+
+#: ../../mod/settings.php:746
+msgid "Don't show emoticons"
+msgstr ""
+
+#: ../../mod/settings.php:811 ../../mod/admin.php:162 ../../mod/admin.php:522

 msgid "Normal Account"
 msgstr ""
 
 msgid "Normal Account"
 msgstr ""
 

-#: ../../mod/settings.php:660
+#: ../../mod/settings.php:812

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

-#: ../../mod/settings.php:663 ../../mod/admin.php:143 ../../mod/admin.php:463
+#: ../../mod/settings.php:815 ../../mod/admin.php:163 ../../mod/admin.php:523

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

-#: ../../mod/settings.php:664
+#: ../../mod/settings.php:816

 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:667 ../../mod/admin.php:144 ../../mod/admin.php:464
+#: ../../mod/settings.php:819 ../../mod/admin.php:164 ../../mod/admin.php:524

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

-#: ../../mod/settings.php:668
+#: ../../mod/settings.php:820

 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:671 ../../mod/admin.php:145 ../../mod/admin.php:465
+#: ../../mod/settings.php:823 ../../mod/admin.php:165 ../../mod/admin.php:525

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

-#: ../../mod/settings.php:672
+#: ../../mod/settings.php:824

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

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

 msgid "OpenID:"
 msgstr ""
 
 msgid "OpenID:"
 msgstr ""
 

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

 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:692
+#: ../../mod/settings.php:844

 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:698
+#: ../../mod/settings.php:850

 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:706
+#: ../../mod/settings.php:858

 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:710
+#: ../../mod/settings.php:862

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

-#: ../../mod/settings.php:715
+#: ../../mod/settings.php:867

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

-#: ../../mod/settings.php:721
+#: ../../mod/settings.php:873

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

-#: ../../mod/settings.php:727
+#: ../../mod/settings.php:879

 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:736
+#: ../../mod/settings.php:885
+msgid "Permit unknown people to send you private mail?"
+msgstr ""
+
+#: ../../mod/settings.php:896

 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 

-#: ../../mod/settings.php:768 ../../mod/profile_photo.php:206
+#: ../../mod/settings.php:902 ../../mod/profile_photo.php:211

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

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

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

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

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

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

 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:785
+#: ../../mod/settings.php:919

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

-#: ../../mod/settings.php:786
+#: ../../mod/settings.php:920

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

-#: ../../mod/settings.php:787
+#: ../../mod/settings.php:921

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

-#: ../../mod/settings.php:788
+#: ../../mod/settings.php:922

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

-#: ../../mod/settings.php:789
+#: ../../mod/settings.php:923

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

-#: ../../mod/settings.php:790
+#: ../../mod/settings.php:924

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

-#: ../../mod/settings.php:795
+#: ../../mod/settings.php:928

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

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

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

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

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

-#: ../../mod/settings.php:805
+#: ../../mod/settings.php:939

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

-#: ../../mod/settings.php:805
+#: ../../mod/settings.php:939

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

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

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

-#: ../../mod/settings.php:810 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:944 ../../include/profile_advanced.php:15

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

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

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

-#: ../../mod/settings.php:812
+#: ../../mod/settings.php:946

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

-#: ../../mod/settings.php:813
+#: ../../mod/settings.php:947

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

-#: ../../mod/settings.php:814
+#: ../../mod/settings.php:948

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

-#: ../../mod/settings.php:815
-msgid "Display Theme:"
-msgstr ""
-
-#: ../../mod/settings.php:816
-msgid "Update browser every xx seconds"
-msgstr ""
-
-#: ../../mod/settings.php:816
-msgid "Minimum of 10 seconds, no maximum"
-msgstr ""
-
-#: ../../mod/settings.php:818
+#: ../../mod/settings.php:951

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

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

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

-#: ../../mod/settings.php:820
+#: ../../mod/settings.php:953 ../../mod/settings.php:968

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

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

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

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

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

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

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

-#: ../../mod/settings.php:838
+#: ../../mod/settings.php:972
+msgid "By default post a status message when:"
+msgstr ""
+
+#: ../../mod/settings.php:973
+msgid "accepting a friend request"
+msgstr ""
+
+#: ../../mod/settings.php:974
+msgid "making an <em>interesting</em> profile change"
+msgstr ""
+
+#: ../../mod/settings.php:975

 msgid "Send a notification email when:"
 msgstr ""
 
 msgid "Send a notification email when:"
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

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

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

-#: ../../mod/settings.php:845
+#: ../../mod/settings.php:982

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

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

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


@@ -2097,39 +2206,39 @@ 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:217

 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:176

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

-#: ../../mod/network.php:182
+#: ../../mod/network.php:187

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

-#: ../../mod/network.php:187
+#: ../../mod/network.php:192

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

-#: ../../mod/network.php:192
-msgid "Bookmarks"
+#: ../../mod/network.php:197
+msgid "Shared Links"

 msgstr ""
 
 msgstr ""
 

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

 #, 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 ""


@@ -2137,42 +2246,103 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

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

 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:298
+#: ../../mod/network.php:322

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

-#: ../../mod/network.php:309
+#: ../../mod/network.php:333

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

-#: ../../mod/network.php:313
+#: ../../mod/network.php:337

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

-#: ../../mod/network.php:323
+#: ../../mod/network.php:347

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

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

 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:330
+#: ../../mod/network.php:354

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

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

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

-#: ../../mod/notes.php:63 ../../include/text.php:645
+#: ../../mod/notes.php:63 ../../mod/filer.php:30
+#: ../../addon/facebook/facebook.php:680 ../../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:59
+msgid "No recipient selected."
+msgstr ""
+
+#: ../../mod/wallmessage.php:59
+msgid "Unable to check your home location."
+msgstr ""
+
+#: ../../mod/wallmessage.php:62 ../../mod/message.php:66
+msgid "Message could not be sent."
+msgstr ""
+
+#: ../../mod/wallmessage.php:65 ../../mod/message.php:69
+msgid "Message collection failure."
+msgstr ""
+
+#: ../../mod/wallmessage.php:68 ../../mod/message.php:72
+msgid "Message sent."
+msgstr ""
+
+#: ../../mod/wallmessage.php:86 ../../mod/wallmessage.php:95
+msgid "No recipient."
+msgstr ""
+
+#: ../../mod/wallmessage.php:124 ../../mod/message.php:169
+#: ../../include/conversation.php:914
+msgid "Please enter a link URL:"
+msgstr ""
+
+#: ../../mod/wallmessage.php:131 ../../mod/message.php:177
+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:178
+#: ../../mod/message.php:347
+msgid "To:"
+msgstr ""
+
+#: ../../mod/wallmessage.php:134 ../../mod/message.php:179
+#: ../../mod/message.php:348
+msgid "Subject:"
+msgstr ""
+
+#: ../../mod/wallmessage.php:140 ../../mod/message.php:183
+#: ../../mod/message.php:351 ../../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 ""


@@ -2191,12 +2361,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 "


@@ -2204,61 +2381,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 "


@@ -2267,14 +2444,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."


@@ -2288,51 +2465,51 @@ 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:127
+#: ../../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:308

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

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

 msgid "Create a group of contacts/friends."
 msgstr ""
 
 msgid "Create a group of contacts/friends."
 msgstr ""
 

-#: ../../mod/group.php:86 ../../mod/group.php:166
+#: ../../mod/group.php:91 ../../mod/group.php:177

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

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

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

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

 msgid "Unable to remove group."
 msgstr ""
 
 msgid "Unable to remove group."
 msgstr ""
 

-#: ../../mod/group.php:165
+#: ../../mod/group.php:176

 msgid "Group Editor"
 msgstr ""
 
 msgid "Group Editor"
 msgstr ""
 

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

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

-#: ../../mod/group.php:209 ../../mod/profperm.php:105
+#: ../../mod/group.php:221 ../../mod/profperm.php:105

 msgid "Click on a contact to add or remove."
 msgstr ""
 
 msgid "Click on a contact to add or remove."
 msgstr ""
 


@@ -2344,9 +2521,12 @@ 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-red/theme.php:240
+#: ../../view/theme/diabook-blue/theme.php:240
+#: ../../view/theme/diabook/theme.php:248
+#: ../../view/theme/diabook-aerith/theme.php:241
+#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:76
+#: ../../include/nav.php:50 ../../boot.php:1457

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


@@ -2362,157 +2542,163 @@ msgstr ""
 msgid "No contacts."
 msgstr ""
 
 msgid "No contacts."
 msgstr ""
 

-#: ../../mod/viewcontacts.php:74 ../../include/text.php:584
+#: ../../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:264

 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:182

 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:250

 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:286

 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:386 ../../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:394

 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:398

 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:403

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

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

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

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

 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:487

 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:513

 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:514

 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:515

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

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

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

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

 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:550

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

-#: ../../mod/register.php:540 ../../mod/admin.php:314
+#: ../../mod/register.php:553 ../../mod/admin.php:375

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

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

 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:562

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

-#: ../../mod/register.php:550
+#: ../../mod/register.php:563

 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:564

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

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

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


@@ -2521,18 +2707,29 @@ msgid "People Search"
 msgstr ""
 
 #: ../../mod/like.php:127 ../../mod/tagger.php:70
 msgstr ""
 
 #: ../../mod/like.php:127 ../../mod/tagger.php:70

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

 #: ../../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
+#: ../../view/theme/diabook-red/theme.php:80
+#: ../../view/theme/diabook-red/theme.php:89
+#: ../../view/theme/diabook-blue/theme.php:80
+#: ../../view/theme/diabook-blue/theme.php:89
+#: ../../view/theme/diabook/theme.php:84 ../../view/theme/diabook/theme.php:93
+#: ../../view/theme/diabook-aerith/theme.php:81
+#: ../../view/theme/diabook-aerith/theme.php:90
+#: ../../include/diaspora.php:1654 ../../include/conversation.php:48

 #: ../../include/conversation.php:57 ../../include/conversation.php:121
 #: ../../include/conversation.php:130
 msgid "status"
 msgstr ""
 
 #: ../../include/conversation.php:57 ../../include/conversation.php:121
 #: ../../include/conversation.php:130
 msgid "status"
 msgstr ""
 

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

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

-#: ../../include/diaspora.php:1616 ../../include/conversation.php:65
+#: ../../view/theme/diabook-red/theme.php:94
+#: ../../view/theme/diabook-blue/theme.php:94
+#: ../../view/theme/diabook/theme.php:98
+#: ../../view/theme/diabook-aerith/theme.php:95
+#: ../../include/diaspora.php:1670 ../../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 ""


@@ -2542,14 +2739,13 @@ 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:522 ../../mod/admin.php:700 ../../mod/display.php:29
-#: ../../mod/display.php:137 ../../mod/viewd.php:14
-#: ../../include/items.php:2942
+#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:141
+#: ../../mod/admin.php:582 ../../mod/admin.php:761 ../../mod/display.php:37
+#: ../../mod/display.php:142 ../../include/items.php:3054

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


@@ -2557,12 +2753,12 @@ msgstr ""
 msgid "Account approved."
 msgstr ""
 
 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 ""
 


@@ -2574,96 +2770,96 @@ msgstr ""
 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:372 ../../mod/wall_upload.php:85
+#: ../../mod/wall_upload.php:94 ../../mod/wall_upload.php:101
+#: ../../include/message.php:144

 msgid "Wall Photos"
 msgstr ""
 
 msgid "Wall Photos"
 msgstr ""
 

-#: ../../mod/item.php:833
+#: ../../mod/item.php:762

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

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

 #, 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:860
+#: ../../mod/item.php:789

 #, 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:861
+#: ../../mod/item.php:790

 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:863
+#: ../../mod/item.php:792

 #, 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:60

 #, 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 ""
 


@@ -2685,88 +2881,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:22 ../../include/nav.php:131
+msgid "New Message"

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/message.php:26
+#: ../../mod/message.php:63

 msgid "Unable to locate contact information."
 msgstr ""
 
 msgid "Unable to locate contact information."
 msgstr ""
 

-#: ../../mod/message.php:29
-msgid "Message could not be sent."
+#: ../../mod/message.php:117
+msgid "Message deleted."

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/message.php:32
-msgid "Message collection failure."
+#: ../../mod/message.php:147
+msgid "Conversation removed."

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/message.php:35
-msgid "Message sent."
+#: ../../mod/message.php:219
+msgid "No messages."

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/message.php:55
-msgid "Inbox"
+#: ../../mod/message.php:226
+#, php-format
+msgid "Unknown sender - %s"

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/message.php:60
-msgid "Outbox"
+#: ../../mod/message.php:229
+#, php-format
+msgid "You and %s"

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/message.php:65
-msgid "New Message"
+#: ../../mod/message.php:232
+#, php-format
+msgid "%s and You"

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/message.php:91
-msgid "Message deleted."
+#: ../../mod/message.php:242 ../../mod/message.php:340
+msgid "Delete conversation"

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/message.php:121
-msgid "Conversation removed."
-msgstr ""
-
-#: ../../mod/message.php:137 ../../include/conversation.php:887
-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:"
-msgstr ""
-
-#: ../../mod/message.php:147 ../../mod/message.php:288
-msgid "Subject:"
-msgstr ""
-
-#: ../../mod/message.php:150 ../../mod/message.php:291
-#: ../../mod/invite.php:101
-msgid "Your message:"
-msgstr ""
-
-#: ../../mod/message.php:188
-msgid "No messages."
-msgstr ""
-
-#: ../../mod/message.php:201
-msgid "Delete conversation"
-msgstr ""
-
-#: ../../mod/message.php:204
+#: ../../mod/message.php:245

 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:247
+#, php-format
+msgid "%d message"
+msgid_plural "%d messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../mod/message.php:282

 msgid "Message not available."
 msgstr ""
 
 msgid "Message not available."
 msgstr ""
 

-#: ../../mod/message.php:276
+#: ../../mod/message.php:324

 msgid "Delete message"
 msgstr ""
 
 msgid "Delete message"
 msgstr ""
 

-#: ../../mod/message.php:286
+#: ../../mod/message.php:342
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr ""
+
+#: ../../mod/message.php:346

 msgid "Send Reply"
 msgstr ""
 
 msgid "Send Reply"
 msgstr ""
 


@@ -2779,525 +2958,556 @@ msgstr ""
 msgid "No friends to display."
 msgstr ""
 
 msgid "No friends to display."
 msgstr ""
 

-#: ../../mod/admin.php:71 ../../mod/admin.php:312
+#: ../../mod/admin.php:51
+msgid "Theme settings updated."
+msgstr ""
+
+#: ../../mod/admin.php:85 ../../mod/admin.php:373

 msgid "Site"
 msgstr ""
 
 msgid "Site"
 msgstr ""
 

-#: ../../mod/admin.php:72 ../../mod/admin.php:480 ../../mod/admin.php:492
+#: ../../mod/admin.php:86 ../../mod/admin.php:540 ../../mod/admin.php:552

 msgid "Users"
 msgstr ""
 
 msgid "Users"
 msgstr ""
 

-#: ../../mod/admin.php:73 ../../mod/admin.php:569 ../../mod/admin.php:608
+#: ../../mod/admin.php:87 ../../mod/admin.php:629 ../../mod/admin.php:669

 msgid "Plugins"
 msgstr ""
 
 msgid "Plugins"
 msgstr ""
 

-#: ../../mod/admin.php:74 ../../mod/admin.php:742 ../../mod/admin.php:775
+#: ../../mod/admin.php:88 ../../mod/admin.php:815 ../../mod/admin.php:849

 msgid "Themes"
 msgstr ""
 
 msgid "Themes"
 msgstr ""
 

-#: ../../mod/admin.php:89 ../../mod/admin.php:855
+#: ../../mod/admin.php:103 ../../mod/admin.php:929

 msgid "Logs"
 msgstr ""
 
 msgid "Logs"
 msgstr ""
 

-#: ../../mod/admin.php:94
+#: ../../mod/admin.php:108

 msgid "User registrations waiting for confirmation"
 msgstr ""
 
 msgid "User registrations waiting for confirmation"
 msgstr ""
 

-#: ../../mod/admin.php:161 ../../mod/admin.php:311 ../../mod/admin.php:479
-#: ../../mod/admin.php:568 ../../mod/admin.php:607 ../../mod/admin.php:741
-#: ../../mod/admin.php:774 ../../mod/admin.php:854
+#: ../../mod/admin.php:177 ../../mod/admin.php:372 ../../mod/admin.php:539
+#: ../../mod/admin.php:628 ../../mod/admin.php:668 ../../mod/admin.php:814
+#: ../../mod/admin.php:848 ../../mod/admin.php:928

 msgid "Administration"
 msgstr ""
 
 msgid "Administration"
 msgstr ""
 

-#: ../../mod/admin.php:162
+#: ../../mod/admin.php:178

 msgid "Summary"
 msgstr ""
 
 msgid "Summary"
 msgstr ""
 

-#: ../../mod/admin.php:163
+#: ../../mod/admin.php:179

 msgid "Registered users"
 msgstr ""
 
 msgid "Registered users"
 msgstr ""
 

-#: ../../mod/admin.php:165
+#: ../../mod/admin.php:181

 msgid "Pending registrations"
 msgstr ""
 
 msgid "Pending registrations"
 msgstr ""
 

-#: ../../mod/admin.php:166
+#: ../../mod/admin.php:182

 msgid "Version"
 msgstr ""
 
 msgid "Version"
 msgstr ""
 

-#: ../../mod/admin.php:168
+#: ../../mod/admin.php:184

 msgid "Active plugins"
 msgstr ""
 
 msgid "Active plugins"
 msgstr ""
 

-#: ../../mod/admin.php:260
+#: ../../mod/admin.php:315

 msgid "Site settings updated."
 msgstr ""
 
 msgid "Site settings updated."
 msgstr ""
 

-#: ../../mod/admin.php:304
+#: ../../mod/admin.php:359

 msgid "Closed"
 msgstr ""
 
 msgid "Closed"
 msgstr ""
 

-#: ../../mod/admin.php:305
+#: ../../mod/admin.php:360

 msgid "Requires approval"
 msgstr ""
 
 msgid "Requires approval"
 msgstr ""
 

-#: ../../mod/admin.php:306
+#: ../../mod/admin.php:361

 msgid "Open"
 msgstr ""
 
 msgid "Open"
 msgstr ""
 

-#: ../../mod/admin.php:315
+#: ../../mod/admin.php:365
+msgid "No SSL policy, links will track page SSL state"
+msgstr ""
+
+#: ../../mod/admin.php:366
+msgid "Force all links to use SSL"
+msgstr ""
+
+#: ../../mod/admin.php:367
+msgid "Self-signed certificate, use SSL for local links only (discouraged)"
+msgstr ""
+
+#: ../../mod/admin.php:376

 msgid "File upload"
 msgstr ""
 
 msgid "File upload"
 msgstr ""
 

-#: ../../mod/admin.php:316
+#: ../../mod/admin.php:377

 msgid "Policies"
 msgstr ""
 
 msgid "Policies"
 msgstr ""
 

-#: ../../mod/admin.php:317
+#: ../../mod/admin.php:378

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

-#: ../../mod/admin.php:321 ../../addon/statusnet/statusnet.php:523
+#: ../../mod/admin.php:382 ../../addon/statusnet/statusnet.php:544

 msgid "Site name"
 msgstr ""
 
 msgid "Site name"
 msgstr ""
 

-#: ../../mod/admin.php:322
+#: ../../mod/admin.php:383

 msgid "Banner/Logo"
 msgstr ""
 
 msgid "Banner/Logo"
 msgstr ""
 

-#: ../../mod/admin.php:323
+#: ../../mod/admin.php:384

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

-#: ../../mod/admin.php:324
+#: ../../mod/admin.php:385

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

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

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/admin.php:326
+#: ../../mod/admin.php:386
+msgid "SSL link policy"
+msgstr ""
+
+#: ../../mod/admin.php:386
+msgid "Determines whether generated links should be forced to use SSL"
+msgstr ""
+
+#: ../../mod/admin.php:387

 msgid "Maximum image size"
 msgstr ""
 
 msgid "Maximum image size"
 msgstr ""
 

-#: ../../mod/admin.php:326
+#: ../../mod/admin.php:387

 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 

-#: ../../mod/admin.php:328
+#: ../../mod/admin.php:389

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

-#: ../../mod/admin.php:329
+#: ../../mod/admin.php:390

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

-#: ../../mod/admin.php:329
+#: ../../mod/admin.php:390

 msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
 msgid "Will be displayed prominently on the registration page."
 msgstr ""
 

-#: ../../mod/admin.php:330
+#: ../../mod/admin.php:391

 msgid "Accounts abandoned after x days"
 msgstr ""
 
 msgid "Accounts abandoned after x days"
 msgstr ""
 

-#: ../../mod/admin.php:330
+#: ../../mod/admin.php:391

 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:331
+#: ../../mod/admin.php:392

 msgid "Allowed friend domains"
 msgstr ""
 
 msgid "Allowed friend domains"
 msgstr ""
 

-#: ../../mod/admin.php:331
+#: ../../mod/admin.php:392

 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr ""
 
 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:332
+#: ../../mod/admin.php:393

 msgid "Allowed email domains"
 msgstr ""
 
 msgid "Allowed email domains"
 msgstr ""
 

-#: ../../mod/admin.php:332
+#: ../../mod/admin.php:393

 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 ""
 
 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:333
+#: ../../mod/admin.php:394

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

-#: ../../mod/admin.php:333
+#: ../../mod/admin.php:394

 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr ""
 
 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:334
+#: ../../mod/admin.php:395

 msgid "Force publish"
 msgstr ""
 
 msgid "Force publish"
 msgstr ""
 

-#: ../../mod/admin.php:334
+#: ../../mod/admin.php:395

 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 

-#: ../../mod/admin.php:335
+#: ../../mod/admin.php:396

 msgid "Global directory update URL"
 msgstr ""
 
 msgid "Global directory update URL"
 msgstr ""
 

-#: ../../mod/admin.php:335
+#: ../../mod/admin.php:396

 msgid ""
 "URL to update the global directory. If this is not set, the global directory "
 "is completely unavailable to the application."
 msgstr ""
 
 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:337
+#: ../../mod/admin.php:398

 msgid "Block multiple registrations"
 msgstr ""
 
 msgid "Block multiple registrations"
 msgstr ""
 

-#: ../../mod/admin.php:337
+#: ../../mod/admin.php:398

 msgid "Disallow users to register additional accounts for use as pages."
 msgstr ""
 
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr ""
 

-#: ../../mod/admin.php:338
+#: ../../mod/admin.php:399

 msgid "OpenID support"
 msgstr ""
 
 msgid "OpenID support"
 msgstr ""
 

-#: ../../mod/admin.php:338
+#: ../../mod/admin.php:399

 msgid "OpenID support for registration and logins."
 msgstr ""
 
 msgid "OpenID support for registration and logins."
 msgstr ""
 

-#: ../../mod/admin.php:339
-msgid "Gravatar support"
-msgstr ""
-
-#: ../../mod/admin.php:339
-msgid "Search new user's photo on Gravatar."
-msgstr ""
-
-#: ../../mod/admin.php:340
+#: ../../mod/admin.php:400

 msgid "Fullname check"
 msgstr ""
 
 msgid "Fullname check"
 msgstr ""
 

-#: ../../mod/admin.php:340
+#: ../../mod/admin.php:400

 msgid ""
 "Force users to register with a space between firstname and lastname in Full "
 "name, as an antispam measure"
 msgstr ""
 
 msgid ""
 "Force users to register with a space between firstname and lastname in Full "
 "name, as an antispam measure"
 msgstr ""
 

-#: ../../mod/admin.php:341
+#: ../../mod/admin.php:401

 msgid "UTF-8 Regular expressions"
 msgstr ""
 
 msgid "UTF-8 Regular expressions"
 msgstr ""
 

-#: ../../mod/admin.php:341
+#: ../../mod/admin.php:401

 msgid "Use PHP UTF8 regular expressions"
 msgstr ""
 
 msgid "Use PHP UTF8 regular expressions"
 msgstr ""
 

-#: ../../mod/admin.php:342
+#: ../../mod/admin.php:402

 msgid "Show Community Page"
 msgstr ""
 
 msgid "Show Community Page"
 msgstr ""
 

-#: ../../mod/admin.php:342
+#: ../../mod/admin.php:402

 msgid ""
 "Display a Community page showing all recent public postings on this site."
 msgstr ""
 
 msgid ""
 "Display a Community page showing all recent public postings on this site."
 msgstr ""
 

-#: ../../mod/admin.php:343
+#: ../../mod/admin.php:403

 msgid "Enable OStatus support"
 msgstr ""
 
 msgid "Enable OStatus support"
 msgstr ""
 

-#: ../../mod/admin.php:343
+#: ../../mod/admin.php:403

 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 ""
 
 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:344
+#: ../../mod/admin.php:404

 msgid "Enable Diaspora support"
 msgstr ""
 
 msgid "Enable Diaspora support"
 msgstr ""
 

-#: ../../mod/admin.php:344
+#: ../../mod/admin.php:404

 msgid "Provide built-in Diaspora network compatibility."
 msgstr ""
 
 msgid "Provide built-in Diaspora network compatibility."
 msgstr ""
 

-#: ../../mod/admin.php:345
+#: ../../mod/admin.php:405

 msgid "Only allow Friendica contacts"
 msgstr ""
 
 msgid "Only allow Friendica contacts"
 msgstr ""
 

-#: ../../mod/admin.php:345
+#: ../../mod/admin.php:405

 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr ""
 
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr ""
 

-#: ../../mod/admin.php:346
+#: ../../mod/admin.php:406

 msgid "Verify SSL"
 msgstr ""
 
 msgid "Verify SSL"
 msgstr ""
 

-#: ../../mod/admin.php:346
+#: ../../mod/admin.php:406

 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 ""
 
 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:347
+#: ../../mod/admin.php:407

 msgid "Proxy user"
 msgstr ""
 
 msgid "Proxy user"
 msgstr ""
 

-#: ../../mod/admin.php:348
+#: ../../mod/admin.php:408

 msgid "Proxy URL"
 msgstr ""
 
 msgid "Proxy URL"
 msgstr ""
 

-#: ../../mod/admin.php:349
+#: ../../mod/admin.php:409

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

-#: ../../mod/admin.php:349
+#: ../../mod/admin.php:409

 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 

-#: ../../mod/admin.php:370
+#: ../../mod/admin.php:430

 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../../mod/admin.php:377
+#: ../../mod/admin.php:437

 #, 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:411
+#: ../../mod/admin.php:471

 #, php-format
 msgid "User '%s' deleted"
 msgstr ""
 
 #, php-format
 msgid "User '%s' deleted"
 msgstr ""
 

-#: ../../mod/admin.php:418
+#: ../../mod/admin.php:478

 #, php-format
 msgid "User '%s' unblocked"
 msgstr ""
 
 #, php-format
 msgid "User '%s' unblocked"
 msgstr ""
 

-#: ../../mod/admin.php:418
+#: ../../mod/admin.php:478

 #, php-format
 msgid "User '%s' blocked"
 msgstr ""
 
 #, php-format
 msgid "User '%s' blocked"
 msgstr ""
 

-#: ../../mod/admin.php:482
+#: ../../mod/admin.php:542

 msgid "select all"
 msgstr ""
 
 msgid "select all"
 msgstr ""
 

-#: ../../mod/admin.php:483
+#: ../../mod/admin.php:543

 msgid "User registrations waiting for confirm"
 msgstr ""
 
 msgid "User registrations waiting for confirm"
 msgstr ""
 

-#: ../../mod/admin.php:484
+#: ../../mod/admin.php:544

 msgid "Request date"
 msgstr ""
 
 msgid "Request date"
 msgstr ""
 

-#: ../../mod/admin.php:484 ../../mod/admin.php:493
+#: ../../mod/admin.php:544 ../../mod/admin.php:553

 #: ../../include/contact_selectors.php:79
 msgid "Email"
 msgstr ""
 
 #: ../../include/contact_selectors.php:79
 msgid "Email"
 msgstr ""
 

-#: ../../mod/admin.php:485
+#: ../../mod/admin.php:545

 msgid "No registrations."
 msgstr ""
 
 msgid "No registrations."
 msgstr ""
 

-#: ../../mod/admin.php:487
+#: ../../mod/admin.php:547

 msgid "Deny"
 msgstr ""
 
 msgid "Deny"
 msgstr ""
 

-#: ../../mod/admin.php:493
+#: ../../mod/admin.php:553

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

-#: ../../mod/admin.php:493
+#: ../../mod/admin.php:553

 msgid "Last login"
 msgstr ""
 
 msgid "Last login"
 msgstr ""
 

-#: ../../mod/admin.php:493
+#: ../../mod/admin.php:553

 msgid "Last item"
 msgstr ""
 
 msgid "Last item"
 msgstr ""
 

-#: ../../mod/admin.php:493
+#: ../../mod/admin.php:553

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

-#: ../../mod/admin.php:495
+#: ../../mod/admin.php:555

 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:496
+#: ../../mod/admin.php:556

 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:532
+#: ../../mod/admin.php:592

 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 
 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 

-#: ../../mod/admin.php:536
+#: ../../mod/admin.php:596

 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 
 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 

-#: ../../mod/admin.php:546 ../../mod/admin.php:724
+#: ../../mod/admin.php:606 ../../mod/admin.php:785

 msgid "Disable"
 msgstr ""
 
 msgid "Disable"
 msgstr ""
 

-#: ../../mod/admin.php:548 ../../mod/admin.php:726
+#: ../../mod/admin.php:608 ../../mod/admin.php:787

 msgid "Enable"
 msgstr ""
 
 msgid "Enable"
 msgstr ""
 

-#: ../../mod/admin.php:570 ../../mod/admin.php:743
+#: ../../mod/admin.php:630 ../../mod/admin.php:816

 msgid "Toggle"
 msgstr ""
 
 msgid "Toggle"
 msgstr ""
 

-#: ../../mod/admin.php:571 ../../mod/admin.php:744 ../../include/nav.php:130
-msgid "Settings"
-msgstr ""
-
-#: ../../mod/admin.php:578 ../../mod/admin.php:753
+#: ../../mod/admin.php:638 ../../mod/admin.php:826

 msgid "Author: "
 msgstr ""
 
 msgid "Author: "
 msgstr ""
 

-#: ../../mod/admin.php:579 ../../mod/admin.php:754
+#: ../../mod/admin.php:639 ../../mod/admin.php:827

 msgid "Maintainer: "
 msgstr ""
 
 msgid "Maintainer: "
 msgstr ""
 

-#: ../../mod/admin.php:689
+#: ../../mod/admin.php:750

 msgid "No themes found."
 msgstr ""
 
 msgid "No themes found."
 msgstr ""
 

-#: ../../mod/admin.php:780
+#: ../../mod/admin.php:808
+msgid "Screenshot"
+msgstr ""
+
+#: ../../mod/admin.php:854

 msgid "[Experimental]"
 msgstr ""
 
 msgid "[Experimental]"
 msgstr ""
 

-#: ../../mod/admin.php:781
+#: ../../mod/admin.php:855

 msgid "[Unsupported]"
 msgstr ""
 
 msgid "[Unsupported]"
 msgstr ""
 

-#: ../../mod/admin.php:804
+#: ../../mod/admin.php:878

 msgid "Log settings updated."
 msgstr ""
 
 msgid "Log settings updated."
 msgstr ""
 

-#: ../../mod/admin.php:857
+#: ../../mod/admin.php:931

 msgid "Clear"
 msgstr ""
 
 msgid "Clear"
 msgstr ""
 

-#: ../../mod/admin.php:863
+#: ../../mod/admin.php:937

 msgid "Debugging"
 msgstr ""
 
 msgid "Debugging"
 msgstr ""
 

-#: ../../mod/admin.php:864
+#: ../../mod/admin.php:938

 msgid "Log file"
 msgstr ""
 
 msgid "Log file"
 msgstr ""
 

-#: ../../mod/admin.php:864
+#: ../../mod/admin.php:938

 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:865
+#: ../../mod/admin.php:939

 msgid "Log level"
 msgstr ""
 
 msgid "Log level"
 msgstr ""
 

-#: ../../mod/admin.php:906
+#: ../../mod/admin.php:980

 msgid "Close"
 msgstr ""
 
 msgid "Close"
 msgstr ""
 

-#: ../../mod/admin.php:912
+#: ../../mod/admin.php:986

 msgid "FTP Host"
 msgstr ""
 
 msgid "FTP Host"
 msgstr ""
 

-#: ../../mod/admin.php:913
+#: ../../mod/admin.php:987

 msgid "FTP Path"
 msgstr ""
 
 msgid "FTP Path"
 msgstr ""
 

-#: ../../mod/admin.php:914
+#: ../../mod/admin.php:988

 msgid "FTP User"
 msgstr ""
 
 msgid "FTP User"
 msgstr ""
 

-#: ../../mod/admin.php:915
+#: ../../mod/admin.php:989

 msgid "FTP Password"
 msgstr ""
 
 msgid "FTP Password"
 msgstr ""
 

-#: ../../mod/profile.php:15 ../../boot.php:845
+#: ../../mod/profile.php:20 ../../boot.php:939

 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:123 ../../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:144

 msgid "Tips for New Members"
 msgstr ""
 
 msgid "Tips for New Members"
 msgstr ""
 

-#: ../../mod/ping.php:174
+#: ../../mod/ping.php:175

 msgid "{0} wants to be your friend"
 msgstr ""
 
 msgid "{0} wants to be your friend"
 msgstr ""
 

-#: ../../mod/ping.php:179
+#: ../../mod/ping.php:180

 msgid "{0} sent you a message"
 msgstr ""
 
 msgid "{0} sent you a message"
 msgstr ""
 

-#: ../../mod/ping.php:184
+#: ../../mod/ping.php:185

 msgid "{0} requested registration"
 msgstr ""
 
 msgid "{0} requested registration"
 msgstr ""
 

-#: ../../mod/ping.php:190
+#: ../../mod/ping.php:191

 #, php-format
 msgid "{0} commented %s's post"
 msgstr ""
 
 #, php-format
 msgid "{0} commented %s's post"
 msgstr ""
 

-#: ../../mod/ping.php:195
+#: ../../mod/ping.php:196

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

-#: ../../mod/ping.php:200
+#: ../../mod/ping.php:201

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

-#: ../../mod/ping.php:205
+#: ../../mod/ping.php:206

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

-#: ../../mod/ping.php:210
+#: ../../mod/ping.php:211

 msgid "{0} posted"
 msgstr ""
 
 msgid "{0} posted"
 msgstr ""
 

-#: ../../mod/ping.php:215
+#: ../../mod/ping.php:216

 #, 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:221
+#: ../../mod/ping.php:222

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


@@ -3354,7 +3564,7 @@ msgstr ""
 msgid "No friends in common."
 msgstr ""
 
 msgid "No friends in common."
 msgstr ""
 

-#: ../../mod/display.php:130
+#: ../../mod/display.php:135

 msgid "Item has been removed."
 msgstr ""
 
 msgid "Item has been removed."
 msgstr ""
 


@@ -3370,222 +3580,279 @@ msgstr ""
 msgid "Search This Site"
 msgstr ""
 
 msgid "Search This Site"
 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:339
+#: ../../mod/profiles.php:453 ../../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:143
+msgid "Marital Status"
+msgstr ""
+
+#: ../../mod/profiles.php:144
+msgid "Romantic Partner"
+msgstr ""
+
+#: ../../mod/profiles.php:145
+msgid "Work/Employment"
+msgstr ""
+
+#: ../../mod/profiles.php:146
+msgid "Religion"
+msgstr ""
+
+#: ../../mod/profiles.php:147
+msgid "Political Views"
+msgstr ""
+
+#: ../../mod/profiles.php:148
+msgid "Gender"
+msgstr ""
+
+#: ../../mod/profiles.php:149
+msgid "Sexual Preference"
+msgstr ""
+
+#: ../../mod/profiles.php:150
+msgid "Homepage"
+msgstr ""
+
+#: ../../mod/profiles.php:151
+msgid "Interests"
+msgstr ""
+
+#: ../../mod/profiles.php:154
+msgid "Location"
+msgstr ""
+
+#: ../../mod/profiles.php:225

 msgid "Profile updated."
 msgstr ""
 
 msgid "Profile updated."
 msgstr ""
 

-#: ../../mod/profiles.php:256
+#: ../../mod/profiles.php:300
+msgid "public profile"
+msgstr ""
+
+#: ../../mod/profiles.php:302
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
+msgstr ""
+
+#: ../../mod/profiles.php:358

 msgid "Profile deleted."
 msgstr ""
 
 msgid "Profile deleted."
 msgstr ""
 

-#: ../../mod/profiles.php:272 ../../mod/profiles.php:303
+#: ../../mod/profiles.php:376 ../../mod/profiles.php:410

 msgid "Profile-"
 msgstr ""
 
 msgid "Profile-"
 msgstr ""
 

-#: ../../mod/profiles.php:291 ../../mod/profiles.php:330
+#: ../../mod/profiles.php:395 ../../mod/profiles.php:437

 msgid "New profile created."
 msgstr ""
 
 msgid "New profile created."
 msgstr ""
 

-#: ../../mod/profiles.php:309
+#: ../../mod/profiles.php:416

 msgid "Profile unavailable to clone."
 msgstr ""
 
 msgid "Profile unavailable to clone."
 msgstr ""
 

-#: ../../mod/profiles.php:356
+#: ../../mod/profiles.php:474

 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:497

 msgid "Edit Profile Details"
 msgstr ""
 
 msgid "Edit Profile Details"
 msgstr ""
 

-#: ../../mod/profiles.php:376
+#: ../../mod/profiles.php:499

 msgid "View this profile"
 msgstr ""
 
 msgid "View this profile"
 msgstr ""
 

-#: ../../mod/profiles.php:377
+#: ../../mod/profiles.php:500

 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:501

 msgid "Clone this profile"
 msgstr ""
 
 msgid "Clone this profile"
 msgstr ""
 

-#: ../../mod/profiles.php:379
+#: ../../mod/profiles.php:502

 msgid "Delete this profile"
 msgstr ""
 
 msgid "Delete this profile"
 msgstr ""
 

-#: ../../mod/profiles.php:380
+#: ../../mod/profiles.php:503

 msgid "Profile Name:"
 msgstr ""
 
 msgid "Profile Name:"
 msgstr ""
 

-#: ../../mod/profiles.php:381
+#: ../../mod/profiles.php:504

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

-#: ../../mod/profiles.php:382
+#: ../../mod/profiles.php:505

 msgid "Title/Description:"
 msgstr ""
 
 msgid "Title/Description:"
 msgstr ""
 

-#: ../../mod/profiles.php:383
+#: ../../mod/profiles.php:506

 msgid "Your Gender:"
 msgstr ""
 
 msgid "Your Gender:"
 msgstr ""
 

-#: ../../mod/profiles.php:384
+#: ../../mod/profiles.php:507

 #, php-format
 msgid "Birthday (%s):"
 msgstr ""
 
 #, php-format
 msgid "Birthday (%s):"
 msgstr ""
 

-#: ../../mod/profiles.php:385
+#: ../../mod/profiles.php:508

 msgid "Street Address:"
 msgstr ""
 
 msgid "Street Address:"
 msgstr ""
 

-#: ../../mod/profiles.php:386
+#: ../../mod/profiles.php:509

 msgid "Locality/City:"
 msgstr ""
 
 msgid "Locality/City:"
 msgstr ""
 

-#: ../../mod/profiles.php:387
+#: ../../mod/profiles.php:510

 msgid "Postal/Zip Code:"
 msgstr ""
 
 msgid "Postal/Zip Code:"
 msgstr ""
 

-#: ../../mod/profiles.php:388
+#: ../../mod/profiles.php:511

 msgid "Country:"
 msgstr ""
 
 msgid "Country:"
 msgstr ""
 

-#: ../../mod/profiles.php:389
+#: ../../mod/profiles.php:512

 msgid "Region/State:"
 msgstr ""
 
 msgid "Region/State:"
 msgstr ""
 

-#: ../../mod/profiles.php:390
+#: ../../mod/profiles.php:513

 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:514

 msgid "Who: (if applicable)"
 msgstr ""
 
 msgid "Who: (if applicable)"
 msgstr ""
 

-#: ../../mod/profiles.php:392
+#: ../../mod/profiles.php:515

 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:516 ../../include/profile_advanced.php:43

 msgid "Sexual Preference:"
 msgstr ""
 
 msgid "Sexual Preference:"
 msgstr ""
 

-#: ../../mod/profiles.php:394
+#: ../../mod/profiles.php:517

 msgid "Homepage URL:"
 msgstr ""
 
 msgid "Homepage URL:"
 msgstr ""
 

-#: ../../mod/profiles.php:395 ../../include/profile_advanced.php:49
+#: ../../mod/profiles.php:518 ../../include/profile_advanced.php:49

 msgid "Political Views:"
 msgstr ""
 
 msgid "Political Views:"
 msgstr ""
 

-#: ../../mod/profiles.php:396
+#: ../../mod/profiles.php:519

 msgid "Religious Views:"
 msgstr ""
 
 msgid "Religious Views:"
 msgstr ""
 

-#: ../../mod/profiles.php:397
+#: ../../mod/profiles.php:520

 msgid "Public Keywords:"
 msgstr ""
 
 msgid "Public Keywords:"
 msgstr ""
 

-#: ../../mod/profiles.php:398
+#: ../../mod/profiles.php:521

 msgid "Private Keywords:"
 msgstr ""
 
 msgid "Private Keywords:"
 msgstr ""
 

-#: ../../mod/profiles.php:399
+#: ../../mod/profiles.php:522

 msgid "Example: fishing photography software"
 msgstr ""
 
 msgid "Example: fishing photography software"
 msgstr ""
 

-#: ../../mod/profiles.php:400
+#: ../../mod/profiles.php:523

 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:524

 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:525

 msgid "Tell us about yourself..."
 msgstr ""
 
 msgid "Tell us about yourself..."
 msgstr ""
 

-#: ../../mod/profiles.php:403
+#: ../../mod/profiles.php:526

 msgid "Hobbies/Interests"
 msgstr ""
 
 msgid "Hobbies/Interests"
 msgstr ""
 

-#: ../../mod/profiles.php:404
+#: ../../mod/profiles.php:527

 msgid "Contact information and Social Networks"
 msgstr ""
 
 msgid "Contact information and Social Networks"
 msgstr ""
 

-#: ../../mod/profiles.php:405
+#: ../../mod/profiles.php:528

 msgid "Musical interests"
 msgstr ""
 
 msgid "Musical interests"
 msgstr ""
 

-#: ../../mod/profiles.php:406
+#: ../../mod/profiles.php:529

 msgid "Books, literature"
 msgstr ""
 
 msgid "Books, literature"
 msgstr ""
 

-#: ../../mod/profiles.php:407
+#: ../../mod/profiles.php:530

 msgid "Television"
 msgstr ""
 
 msgid "Television"
 msgstr ""
 

-#: ../../mod/profiles.php:408
+#: ../../mod/profiles.php:531

 msgid "Film/dance/culture/entertainment"
 msgstr ""
 
 msgid "Film/dance/culture/entertainment"
 msgstr ""
 

-#: ../../mod/profiles.php:409
+#: ../../mod/profiles.php:532

 msgid "Love/romance"
 msgstr ""
 
 msgid "Love/romance"
 msgstr ""
 

-#: ../../mod/profiles.php:410
+#: ../../mod/profiles.php:533

 msgid "Work/employment"
 msgstr ""
 
 msgid "Work/employment"
 msgstr ""
 

-#: ../../mod/profiles.php:411
+#: ../../mod/profiles.php:534

 msgid "School/education"
 msgstr ""
 
 msgid "School/education"
 msgstr ""
 

-#: ../../mod/profiles.php:416
+#: ../../mod/profiles.php:539

 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:549 ../../mod/directory.php:111

 msgid "Age: "
 msgstr ""
 
 msgid "Age: "
 msgstr ""
 

-#: ../../mod/profiles.php:461
+#: ../../mod/profiles.php:584

 msgid "Edit/Manage Profiles"
 msgstr ""
 
 msgid "Edit/Manage Profiles"
 msgstr ""
 

-#: ../../mod/profiles.php:462 ../../boot.php:946
+#: ../../mod/profiles.php:585 ../../boot.php:1048

 msgid "Change profile photo"
 msgstr ""
 
 msgid "Change profile photo"
 msgstr ""
 

-#: ../../mod/profiles.php:463 ../../boot.php:947
+#: ../../mod/profiles.php:586 ../../boot.php:1049

 msgid "Create New Profile"
 msgstr ""
 
 msgid "Create New Profile"
 msgstr ""
 

-#: ../../mod/profiles.php:473 ../../boot.php:957
+#: ../../mod/profiles.php:597 ../../boot.php:1059

 msgid "Profile Image"
 msgstr ""
 
 msgid "Profile Image"
 msgstr ""
 

-#: ../../mod/profiles.php:475 ../../boot.php:960
+#: ../../mod/profiles.php:599 ../../boot.php:1062

 msgid "visible to everybody"
 msgstr ""
 
 msgid "visible to everybody"
 msgstr ""
 

-#: ../../mod/profiles.php:476 ../../boot.php:961
+#: ../../mod/profiles.php:600 ../../boot.php:1063

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

+#: ../../mod/filer.php:29 ../../include/conversation.php:918
+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"


@@ -3626,7 +3893,11 @@ 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-red/theme.php:149
+#: ../../view/theme/diabook-blue/theme.php:149
+#: ../../view/theme/diabook/theme.php:153
+#: ../../view/theme/diabook-aerith/theme.php:150
+#: ../../include/contact_widgets.php:34

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


@@ -3640,31 +3911,26 @@ msgstr ""
 msgid "Ignore/Hide"
 msgstr ""
 
 msgid "Ignore/Hide"
 msgstr ""
 

-#: ../../mod/directory.php:51
+#: ../../mod/directory.php:47 ../../view/theme/diabook-red/theme.php:147
+#: ../../view/theme/diabook-blue/theme.php:147
+#: ../../view/theme/diabook/theme.php:151
+#: ../../view/theme/diabook-aerith/theme.php:148

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


@@ -3674,8 +3940,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


@@ -3694,179 +3959,212 @@ 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 ""
 
 msgstr ""
 

-#: ../../mod/invite.php:104
+#: ../../mod/invite.php:111
+msgid "Send invitations"
+msgstr ""
+
+#: ../../mod/invite.php:112
+msgid "Enter email addresses, one per line:"
+msgstr ""
+
+#: ../../mod/invite.php:114
+msgid ""
+"You are cordially invited to join me and other close friends on Friendica - "
+"and help us to create a better social web."
+msgstr ""
+
+#: ../../mod/invite.php: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/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:119
 msgid ""
 "This may occasionally happen if contact was requested by both persons and it "
 "has already been approved."
 msgstr ""
 

-#: ../../mod/dfrn_confirm.php:239
+#: ../../mod/dfrn_confirm.php:242

 msgid "Response from remote site was not understood."
 msgstr ""
 
 msgid "Response from remote site was not understood."
 msgstr ""
 

-#: ../../mod/dfrn_confirm.php:248
+#: ../../mod/dfrn_confirm.php:251

 msgid "Unexpected response from remote site: "
 msgstr ""
 
 msgid "Unexpected response from remote site: "
 msgstr ""
 

-#: ../../mod/dfrn_confirm.php:256
+#: ../../mod/dfrn_confirm.php:259

 msgid "Confirmation completed successfully."
 msgstr ""
 
 msgid "Confirmation completed successfully."
 msgstr ""
 

-#: ../../mod/dfrn_confirm.php:258 ../../mod/dfrn_confirm.php:272
-#: ../../mod/dfrn_confirm.php:279
+#: ../../mod/dfrn_confirm.php:261 ../../mod/dfrn_confirm.php:275
+#: ../../mod/dfrn_confirm.php:282

 msgid "Remote site reported: "
 msgstr ""
 
 msgid "Remote site reported: "
 msgstr ""
 

-#: ../../mod/dfrn_confirm.php:270
+#: ../../mod/dfrn_confirm.php:273

 msgid "Temporary failure. Please wait and try again."
 msgstr ""
 
 msgid "Temporary failure. Please wait and try again."
 msgstr ""
 

-#: ../../mod/dfrn_confirm.php:277
+#: ../../mod/dfrn_confirm.php:280

 msgid "Introduction failed or was revoked."
 msgstr ""
 
 msgid "Introduction failed or was revoked."
 msgstr ""
 

-#: ../../mod/dfrn_confirm.php:422
+#: ../../mod/dfrn_confirm.php:425

 msgid "Unable to set contact photo."
 msgstr ""
 
 msgid "Unable to set contact photo."
 msgstr ""
 

-#: ../../mod/dfrn_confirm.php:474 ../../include/diaspora.php:495
+#: ../../mod/dfrn_confirm.php:477 ../../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:544
+#: ../../mod/dfrn_confirm.php:548

 #, php-format
 msgid "No user record found for '%s' "
 msgstr ""
 
 #, php-format
 msgid "No user record found for '%s' "
 msgstr ""
 

-#: ../../mod/dfrn_confirm.php:554
+#: ../../mod/dfrn_confirm.php:558

 msgid "Our site encryption key is apparently messed up."
 msgstr ""
 
 msgid "Our site encryption key is apparently messed up."
 msgstr ""
 

-#: ../../mod/dfrn_confirm.php:565
+#: ../../mod/dfrn_confirm.php:569

 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:586
+#: ../../mod/dfrn_confirm.php:590

 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:600
+#: ../../mod/dfrn_confirm.php:604

 #, 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:620
+#: ../../mod/dfrn_confirm.php:624

 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:631
+#: ../../mod/dfrn_confirm.php:635

 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:694
+#: ../../mod/dfrn_confirm.php:700

 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:724
+#: ../../mod/dfrn_confirm.php:730

 #, php-format
 msgid "Connection accepted at %s"
 msgstr ""
 
 #, php-format
 msgid "Connection accepted at %s"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:338
+#: ../../addon/facebook/facebook.php:467

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

-#: ../../addon/facebook/facebook.php:343
+#: ../../addon/facebook/facebook.php:472

 msgid "Updating contacts"
 msgstr ""
 
 msgid "Updating contacts"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:352
+#: ../../addon/facebook/facebook.php:493

 msgid "Facebook API key is missing."
 msgstr ""
 
 msgid "Facebook API key is missing."
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:359
+#: ../../addon/facebook/facebook.php:500

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

-#: ../../addon/facebook/facebook.php:365
+#: ../../addon/facebook/facebook.php:506

 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:513

 msgid "Remove Facebook connector"
 msgstr ""
 
 msgid "Remove Facebook connector"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:377
+#: ../../addon/facebook/facebook.php:518

 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:525

 msgid "Post to Facebook by default"
 msgstr ""
 
 msgid "Post to Facebook by default"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:388
+#: ../../addon/facebook/facebook.php:529

 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:531

 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:532

 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:533

 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:537

 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:542

 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:544

 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 "


@@ -3874,44 +4172,121 @@ msgid ""
 "who may see the conversations."
 msgstr ""
 
 "who may see the conversations."
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:408
+#: ../../addon/facebook/facebook.php:549

 msgid "Comma separated applications to ignore"
 msgstr ""
 
 msgid "Comma separated applications to ignore"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:476
+#: ../../addon/facebook/facebook.php:620
+msgid "Problems with Facebook Real-Time Updates"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:644

 #: ../../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:645

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

-#: ../../addon/facebook/facebook.php:491
+#: ../../addon/facebook/facebook.php:656
+msgid "Facebook API Key"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:665
+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:670
+msgid ""
+"Error: the given API Key seems to be incorrect (the application access token "
+"could not be retrieved)."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:672
+msgid "The given API Key seems to work correctly."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:674
+msgid ""
+"The correctness of the API Key could not be detected. Somthing strange's "
+"going on."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:677
+msgid "App-ID / API-Key"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:678
+msgid "Application secret"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:679
+#, php-format
+msgid "Polling Interval (min. %1$s minutes)"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:683
+msgid "Real-Time Updates"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:687
+msgid "Real-Time Updates are activated."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:688
+msgid "Deactivate Real-Time Updates"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:690
+msgid "Real-Time Updates not activated."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:690
+msgid "Activate Real-Time Updates"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:704
+msgid "The new values have been saved."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:723

 msgid "Post to Facebook"
 msgstr ""
 
 msgid "Post to Facebook"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:582
+#: ../../addon/facebook/facebook.php:815

 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:1033

 msgid "View on Friendica"
 msgstr ""
 
 msgid "View on Friendica"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:752
+#: ../../addon/facebook/facebook.php:1058

 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:102
-msgid "link"
+#: ../../addon/facebook/facebook.php:1094
+msgid "Your Facebook connection became invalid. Please Re-authenticate."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:1095
+msgid "Facebook connection became invalid"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:1096
+#, 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/widgets/widget_like.php:58
 msgstr ""
 
 #: ../../addon/widgets/widget_like.php:58


@@ -3928,15 +4303,15 @@ msgid_plural "%d people don't like this"
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../../addon/widgets/widgets.php:55
+#: ../../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 ""
 


@@ -3968,40 +4343,50 @@ msgstr ""
 msgid "yourls Settings saved."
 msgstr ""
 
 msgid "yourls Settings saved."
 msgstr ""
 

-#: ../../addon/ljpost/ljpost.php:38
+#: ../../addon/ljpost/ljpost.php:39

 msgid "Post to LiveJournal"
 msgstr ""
 
 msgid "Post to LiveJournal"
 msgstr ""
 

-#: ../../addon/ljpost/ljpost.php:69
+#: ../../addon/ljpost/ljpost.php:70

 msgid "LiveJournal Post Settings"
 msgstr ""
 
 msgid "LiveJournal Post Settings"
 msgstr ""
 

-#: ../../addon/ljpost/ljpost.php:71
+#: ../../addon/ljpost/ljpost.php:72

 msgid "Enable LiveJournal Post Plugin"
 msgstr ""
 
 msgid "Enable LiveJournal Post Plugin"
 msgstr ""
 

-#: ../../addon/ljpost/ljpost.php:76
+#: ../../addon/ljpost/ljpost.php:77

 msgid "LiveJournal username"
 msgstr ""
 
 msgid "LiveJournal username"
 msgstr ""
 

-#: ../../addon/ljpost/ljpost.php:81
+#: ../../addon/ljpost/ljpost.php:82

 msgid "LiveJournal password"
 msgstr ""
 
 msgid "LiveJournal password"
 msgstr ""
 

-#: ../../addon/ljpost/ljpost.php:86
+#: ../../addon/ljpost/ljpost.php:87

 msgid "Post to LiveJournal by default"
 msgstr ""
 
 #: ../../addon/nsfw/nsfw.php:47
 msgid "Post to LiveJournal by default"
 msgstr ""
 
 #: ../../addon/nsfw/nsfw.php:47

-msgid "\"Not Safe For Work\" Settings"
+msgid "Not Safe For Work (General Purpose Content Filter) settings"
+msgstr ""
+
+#: ../../addon/nsfw/nsfw.php:49
+msgid ""
+"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


@@ -4017,11 +4402,23 @@ msgstr ""
 msgid "%s - Click to open/close"
 msgstr ""
 
 msgid "%s - Click to open/close"
 msgstr ""
 

+#: ../../addon/page/page.php:47
+msgid "Forums"
+msgstr ""
+
+#: ../../addon/planets/planets.php:150
+msgid "Planets Settings"
+msgstr ""
+
+#: ../../addon/planets/planets.php:152
+msgid "Enable Planets Plugin"
+msgstr ""
+

 #: ../../addon/communityhome/communityhome.php:28
 #: ../../addon/communityhome/communityhome.php:34
 #: ../../addon/communityhome/twillingham/communityhome.php:28
 #: ../../addon/communityhome/twillingham/communityhome.php:34
 #: ../../addon/communityhome/communityhome.php:28
 #: ../../addon/communityhome/communityhome.php:34
 #: ../../addon/communityhome/twillingham/communityhome.php:28
 #: ../../addon/communityhome/twillingham/communityhome.php:34

-#: ../../include/nav.php:62 ../../boot.php:710
+#: ../../include/nav.php:64 ../../boot.php:796

 msgid "Login"
 msgstr ""
 
 msgid "Login"
 msgstr ""
 


@@ -4031,7 +4428,8 @@ msgid "OpenID"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:38
 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


@@ -4040,22 +4438,22 @@ msgid "Most active users"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:98
 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 ""
 
 msgstr ""
 

-#: ../../addon/communityhome/communityhome.php:155 ../../include/text.php:1224
+#: ../../addon/communityhome/communityhome.php:155
+#: ../../view/theme/diabook-red/theme.php:77
+#: ../../view/theme/diabook-blue/theme.php:77
+#: ../../view/theme/diabook/theme.php:81
+#: ../../view/theme/diabook-aerith/theme.php:78 ../../include/text.php:1302

 #: ../../include/conversation.php:45 ../../include/conversation.php:118
 msgid "event"
 msgstr ""
 
 #: ../../include/conversation.php:45 ../../include/conversation.php:118
 msgid "event"
 msgstr ""
 

-#: ../../addon/communityhome/twillingham/communityhome.php:38
-msgid "Latest users"
-msgstr ""
-

 #: ../../addon/uhremotestorage/uhremotestorage.php:84
 #, php-format
 msgid ""
 #: ../../addon/uhremotestorage/uhremotestorage.php:84
 #, php-format
 msgid ""


@@ -4134,35 +4532,35 @@ 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:38
+#: ../../addon/dwpost/dwpost.php:39

 msgid "Post to Dreamwidth"
 msgstr ""
 
 msgid "Post to Dreamwidth"
 msgstr ""
 

-#: ../../addon/dwpost/dwpost.php:69
+#: ../../addon/dwpost/dwpost.php:70

 msgid "Dreamwidth Post Settings"
 msgstr ""
 
 msgid "Dreamwidth Post Settings"
 msgstr ""
 

-#: ../../addon/dwpost/dwpost.php:71
+#: ../../addon/dwpost/dwpost.php:72

 msgid "Enable dreamwidth Post Plugin"
 msgstr ""
 
 msgid "Enable dreamwidth Post Plugin"
 msgstr ""
 

-#: ../../addon/dwpost/dwpost.php:76
+#: ../../addon/dwpost/dwpost.php:77

 msgid "dreamwidth username"
 msgstr ""
 
 msgid "dreamwidth username"
 msgstr ""
 

-#: ../../addon/dwpost/dwpost.php:81
+#: ../../addon/dwpost/dwpost.php:82

 msgid "dreamwidth password"
 msgstr ""
 
 msgid "dreamwidth password"
 msgstr ""
 

-#: ../../addon/dwpost/dwpost.php:86
+#: ../../addon/dwpost/dwpost.php:87

 msgid "Post to dreamwidth by default"
 msgstr ""
 
 msgid "Post to dreamwidth by default"
 msgstr ""
 


@@ -4202,8 +4600,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:190
+#: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:173

 msgid "Post from Friendica"
 msgstr ""
 
 msgid "Post from Friendica"
 msgstr ""
 


@@ -4259,41 +4657,69 @@ msgstr ""
 msgid "URL to embed:"
 msgstr ""
 
 msgid "URL to embed:"
 msgstr ""
 

-#: ../../addon/impressum/impressum.php:25
+#: ../../addon/impressum/impressum.php:34

 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:47
+#: ../../addon/impressum/impressum.php:49
+#: ../../addon/impressum/impressum.php:81

 msgid "Site Owner"
 msgstr ""
 
 msgid "Site Owner"
 msgstr ""
 

-#: ../../addon/impressum/impressum.php:38
-#: ../../addon/impressum/impressum.php:74
+#: ../../addon/impressum/impressum.php:47
+#: ../../addon/impressum/impressum.php:85

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

-#: ../../addon/impressum/impressum.php:43
-#: ../../addon/impressum/impressum.php:72
+#: ../../addon/impressum/impressum.php:52
+#: ../../addon/impressum/impressum.php:83

 msgid "Postal Address"
 msgstr ""
 
 msgid "Postal Address"
 msgstr ""
 

-#: ../../addon/impressum/impressum.php:49
+#: ../../addon/impressum/impressum.php:58

 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:81
+msgid "The page operators name."
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:82

 msgid "Site Owners Profile"
 msgstr ""
 
 msgid "Site Owners Profile"
 msgstr ""
 

-#: ../../addon/impressum/impressum.php:73
+#: ../../addon/impressum/impressum.php:82
+msgid "Profile address of the operator."
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:83
+msgid "How to contact the operator via snail mail."
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:84

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

+#: ../../addon/impressum/impressum.php:84
+msgid "Additional notes that are displayed beneath the contact information."
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:85
+msgid "How to contact the operator via email. (will be displayed obfuscated)"
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:86
+msgid "Footer note"
+msgstr ""
+
+#: ../../addon/impressum/impressum.php:86
+msgid "Text for the footer."
+msgstr ""
+

 #: ../../addon/buglink/buglink.php:15
 msgid "Report Bug"
 msgstr ""
 #: ../../addon/buglink/buglink.php:15
 msgid "Report Bug"
 msgstr ""


@@ -4387,15 +4813,101 @@ 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:85
+#, php-format
+msgid "Your account on %s will expire in a few days."
+msgstr ""
+
+#: ../../addon/testdrive/testdrive.php:86
+msgid "Your Friendica test account is about to expire."
+msgstr ""
+
+#: ../../addon/testdrive/testdrive.php:87
+#, 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 ""
 


@@ -4403,40 +4915,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 "


@@ -4445,19 +4957,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 "


@@ -4465,38 +4977,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 "


@@ -4504,19 +5016,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 #tag links 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:545

 msgid "API URL"
 msgstr ""
 
 msgid "API URL"
 msgstr ""
 


@@ -4619,12 +5135,13 @@ 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"
+#: ../../addon/showmore/showmore.php:87 ../../include/conversation.php:466
+#: ../../boot.php:496
+msgid "show more"

 msgstr ""
 
 #: ../../addon/piwik/piwik.php:79
 msgstr ""
 
 #: ../../addon/piwik/piwik.php:79


@@ -4667,21 +5184,21 @@ msgstr ""
 msgid "Post to Twitter"
 msgstr ""
 
 msgid "Post to Twitter"
 msgstr ""
 

-#: ../../addon/twitter/twitter.php:119
+#: ../../addon/twitter/twitter.php:122

 msgid "Twitter settings updated."
 msgstr ""
 
 msgid "Twitter settings updated."
 msgstr ""
 

-#: ../../addon/twitter/twitter.php:141
+#: ../../addon/twitter/twitter.php:146

 msgid "Twitter Posting Settings"
 msgstr ""
 
 msgid "Twitter Posting Settings"
 msgstr ""
 

-#: ../../addon/twitter/twitter.php:148
+#: ../../addon/twitter/twitter.php:153

 msgid ""
 "No consumer key pair for Twitter found. Please contact your site "
 "administrator."
 msgstr ""
 
 msgid ""
 "No consumer key pair for Twitter found. Please contact your site "
 "administrator."
 msgstr ""
 

-#: ../../addon/twitter/twitter.php:167
+#: ../../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 "
 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 "


@@ -4690,22 +5207,22 @@ msgid ""
 "be posted to Twitter."
 msgstr ""
 
 "be posted to Twitter."
 msgstr ""
 

-#: ../../addon/twitter/twitter.php:168
+#: ../../addon/twitter/twitter.php:173

 msgid "Log in with Twitter"
 msgstr ""
 
 msgid "Log in with Twitter"
 msgstr ""
 

-#: ../../addon/twitter/twitter.php:170
+#: ../../addon/twitter/twitter.php:175

 msgid "Copy the PIN from Twitter here"
 msgstr ""
 
 msgid "Copy the PIN from Twitter here"
 msgstr ""
 

-#: ../../addon/twitter/twitter.php:185
+#: ../../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 ""
 
 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:187
+#: ../../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 "
 msgid ""
 "<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
 "details from unknown viewers?</em>) the link potentially included in public "


@@ -4713,24 +5230,76 @@ msgid ""
 "the visitor that the access to your profile has been restricted."
 msgstr ""
 
 "the visitor that the access to your profile has been restricted."
 msgstr ""
 

-#: ../../addon/twitter/twitter.php:190
+#: ../../addon/twitter/twitter.php:195

 msgid "Allow posting to Twitter"
 msgstr ""
 
 msgid "Allow posting to Twitter"
 msgstr ""
 

-#: ../../addon/twitter/twitter.php:193
+#: ../../addon/twitter/twitter.php:198

 msgid "Send public postings to Twitter by default"
 msgstr ""
 
 msgid "Send public postings to Twitter by default"
 msgstr ""
 

-#: ../../addon/twitter/twitter.php:357
+#: ../../addon/twitter/twitter.php:201
+msgid "Send #tag links to Twitter"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:377

 msgid "Consumer key"
 msgstr ""
 
 msgid "Consumer key"
 msgstr ""
 

-#: ../../addon/twitter/twitter.php:358
+#: ../../addon/twitter/twitter.php:378

 msgid "Consumer secret"
 msgstr ""
 
 msgid "Consumer secret"
 msgstr ""
 

-#: ../../addon/irc/irc.php:20
-msgid "irc Chatroom"
+#: ../../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:36
 msgstr ""
 
 #: ../../addon/posterous/posterous.php:36


@@ -4757,23 +5326,200 @@ msgstr ""
 msgid "Post to Posterous by default"
 msgstr ""
 
 msgid "Post to Posterous by default"
 msgstr ""
 

-#: ../../view/theme/quattro/theme.php:17
+#: ../../view/theme/diabook-red/theme.php:26
+#: ../../view/theme/diabook-blue/theme.php:26
+#: ../../view/theme/diabook/theme.php:30
+#: ../../view/theme/diabook-aerith/theme.php:27
+msgid "Last users"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:55
+#: ../../view/theme/diabook-blue/theme.php:55
+#: ../../view/theme/diabook/theme.php:59
+#: ../../view/theme/diabook-aerith/theme.php:56
+msgid "Last likes"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:100
+#: ../../view/theme/diabook-blue/theme.php:100
+#: ../../view/theme/diabook/theme.php:104
+#: ../../view/theme/diabook-aerith/theme.php:101
+msgid "Last photos"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:145
+#: ../../view/theme/diabook-blue/theme.php:145
+#: ../../view/theme/diabook/theme.php:149
+#: ../../view/theme/diabook-aerith/theme.php:146
+msgid "Find Friends"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:146
+#: ../../view/theme/diabook-blue/theme.php:146
+#: ../../view/theme/diabook/theme.php:150
+#: ../../view/theme/diabook-aerith/theme.php:147
+msgid "Local Directory"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:148
+#: ../../view/theme/diabook-blue/theme.php:148
+#: ../../view/theme/diabook/theme.php:152
+#: ../../view/theme/diabook-aerith/theme.php:149
+#: ../../include/contact_widgets.php:35
+msgid "Similar Interests"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:150
+#: ../../view/theme/diabook-blue/theme.php:150
+#: ../../view/theme/diabook/theme.php:154
+#: ../../view/theme/diabook-aerith/theme.php:151
+#: ../../include/contact_widgets.php:37
+msgid "Invite Friends"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:165
+#: ../../view/theme/diabook-red/theme.php:246
+#: ../../view/theme/diabook-blue/theme.php:165
+#: ../../view/theme/diabook-blue/theme.php:246
+#: ../../view/theme/diabook/theme.php:170
+#: ../../view/theme/diabook/theme.php:254
+#: ../../view/theme/diabook-aerith/theme.php:166
+#: ../../view/theme/diabook-aerith/theme.php:247
+msgid "Community Pages"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:198
+#: ../../view/theme/diabook-blue/theme.php:198
+#: ../../view/theme/diabook/theme.php:203
+#: ../../view/theme/diabook-aerith/theme.php:199
+msgid "Help or @NewHere ?"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:204
+#: ../../view/theme/diabook-blue/theme.php:204
+#: ../../view/theme/diabook/theme.php:209
+#: ../../view/theme/diabook-aerith/theme.php:205
+msgid "Connect Services"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:210
+#: ../../view/theme/diabook-blue/theme.php:210
+#: ../../view/theme/diabook/theme.php:215
+#: ../../view/theme/diabook-aerith/theme.php:211
+msgid "PostIt to Friendica"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:210
+#: ../../view/theme/diabook-blue/theme.php:210
+#: ../../view/theme/diabook/theme.php:215
+#: ../../view/theme/diabook-aerith/theme.php:211
+msgid "Post to Friendica"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:211
+#: ../../view/theme/diabook-blue/theme.php:211
+#: ../../view/theme/diabook/theme.php:216
+#: ../../view/theme/diabook-aerith/theme.php:212
+msgid " from anywhere by bookmarking this Link."
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:239
+#: ../../view/theme/diabook-blue/theme.php:239
+#: ../../view/theme/diabook/theme.php:247
+#: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:49
+#: ../../include/nav.php:115
+msgid "Your posts and conversations"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:240
+#: ../../view/theme/diabook-blue/theme.php:240
+#: ../../view/theme/diabook/theme.php:248
+#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:50
+msgid "Your profile page"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:241
+#: ../../view/theme/diabook-blue/theme.php:241
+#: ../../view/theme/diabook/theme.php:249
+#: ../../view/theme/diabook-aerith/theme.php:242
+msgid "Your contacts"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:242
+#: ../../view/theme/diabook-blue/theme.php:242
+#: ../../view/theme/diabook/theme.php:250
+#: ../../view/theme/diabook-aerith/theme.php:243 ../../include/nav.php:51
+#: ../../boot.php:1462
+msgid "Photos"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:242
+#: ../../view/theme/diabook-blue/theme.php:242
+#: ../../view/theme/diabook/theme.php:250
+#: ../../view/theme/diabook-aerith/theme.php:243 ../../include/nav.php:51
+msgid "Your photos"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:243
+#: ../../view/theme/diabook-blue/theme.php:243
+#: ../../view/theme/diabook/theme.php:251
+#: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:52
+msgid "Your events"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:244
+#: ../../view/theme/diabook-blue/theme.php:244
+#: ../../view/theme/diabook/theme.php:252
+#: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:53
+msgid "Personal notes"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:244
+#: ../../view/theme/diabook-blue/theme.php:244
+#: ../../view/theme/diabook/theme.php:252
+#: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:53
+msgid "Your personal photos"
+msgstr ""
+
+#: ../../view/theme/diabook-red/config.php:66
+#: ../../view/theme/diabook-blue/config.php:66
+#: ../../view/theme/diabook/config.php:66
+#: ../../view/theme/quattro/config.php:54
+#: ../../view/theme/diabook-aerith/config.php:66

 msgid "Theme settings"
 msgstr ""
 
 msgid "Theme settings"
 msgstr ""
 

-#: ../../view/theme/quattro/theme.php:18
+#: ../../view/theme/diabook-red/config.php:67
+#: ../../view/theme/diabook-blue/config.php:67
+#: ../../view/theme/diabook/config.php:67
+#: ../../view/theme/diabook-aerith/config.php:67
+msgid "Set font-size for posts and comments"
+msgstr ""
+
+#: ../../view/theme/diabook-red/config.php:68
+#: ../../view/theme/diabook-blue/config.php:68
+#: ../../view/theme/diabook/config.php:68
+#: ../../view/theme/diabook-aerith/config.php:68
+msgid "Set line-height for posts and comments"
+msgstr ""
+
+#: ../../view/theme/quattro/config.php:55

 msgid "Alignment"
 msgstr ""
 
 msgid "Alignment"
 msgstr ""
 

-#: ../../view/theme/quattro/theme.php:18
+#: ../../view/theme/quattro/config.php:55

 msgid "Left"
 msgstr ""
 
 msgid "Left"
 msgstr ""
 

-#: ../../view/theme/quattro/theme.php:18
+#: ../../view/theme/quattro/config.php:55

 msgid "Center"
 msgstr ""
 
 msgid "Center"
 msgstr ""
 

-#: ../../include/profile_advanced.php:17 ../../boot.php:982
+#: ../../view/theme/quattro/config.php:56
+msgid "Color scheme"
+msgstr ""
+
+#: ../../include/profile_advanced.php:17 ../../boot.php:1084

 msgid "Gender:"
 msgstr ""
 
 msgid "Gender:"
 msgstr ""
 


@@ -4785,8 +5531,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:1402

 msgid "Birthday:"
 msgstr ""
 
 msgid "Birthday:"
 msgstr ""
 


@@ -4794,11 +5540,11 @@ msgstr ""
 msgid "Age:"
 msgstr ""
 
 msgid "Age:"
 msgstr ""
 

-#: ../../include/profile_advanced.php:37 ../../boot.php:985
+#: ../../include/profile_advanced.php:37 ../../boot.php:1087

 msgid "Status:"
 msgstr ""
 
 msgid "Status:"
 msgstr ""
 

-#: ../../include/profile_advanced.php:45 ../../boot.php:987
+#: ../../include/profile_advanced.php:45 ../../boot.php:1089

 msgid "Homepage:"
 msgstr ""
 
 msgid "Homepage:"
 msgstr ""
 


@@ -5046,6 +5792,14 @@ msgstr ""
 msgid "Unavailable"
 msgstr ""
 
 msgid "Unavailable"
 msgstr ""
 

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

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


@@ -5078,6 +5832,10 @@ msgstr ""
 msgid "Married"
 msgstr ""
 
 msgid "Married"
 msgstr ""
 

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

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


@@ -5086,12 +5844,16 @@ msgstr ""
 msgid "Cohabiting"
 msgstr ""
 
 msgid "Cohabiting"
 msgstr ""
 

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

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

-msgid "Not Looking"
+msgid "Not looking"

 msgstr ""
 
 #: ../../include/profile_selectors.php:33
 msgstr ""
 
 #: ../../include/profile_selectors.php:33


@@ -5114,6 +5876,10 @@ msgstr ""
 msgid "Divorced"
 msgstr ""
 
 msgid "Divorced"
 msgstr ""
 

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

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


@@ -5123,7 +5889,7 @@ msgid "Uncertain"
 msgstr ""
 
 #: ../../include/profile_selectors.php:33
 msgstr ""
 
 #: ../../include/profile_selectors.php:33

-msgid "Complicated"
+msgid "It's complicated"

 msgstr ""
 
 #: ../../include/profile_selectors.php:33
 msgstr ""
 
 #: ../../include/profile_selectors.php:33


@@ -5142,43 +5908,43 @@ msgstr ""
 msgid "Finishes:"
 msgstr ""
 
 msgid "Finishes:"
 msgstr ""
 

-#: ../../include/delivery.php:425 ../../include/notifier.php:638
+#: ../../include/delivery.php:434 ../../include/notifier.php:651

 msgid "(no subject)"
 msgstr ""
 
 msgid "(no subject)"
 msgstr ""
 

-#: ../../include/delivery.php:432 ../../include/enotify.php:17
-#: ../../include/notifier.php:645
+#: ../../include/delivery.php:441 ../../include/enotify.php:23
+#: ../../include/notifier.php:658

 msgid "noreply"
 msgstr ""
 
 msgid "noreply"
 msgstr ""
 

-#: ../../include/text.php:238
+#: ../../include/text.php:243

 msgid "prev"
 msgstr ""
 
 msgid "prev"
 msgstr ""
 

-#: ../../include/text.php:240
+#: ../../include/text.php:245

 msgid "first"
 msgstr ""
 
 msgid "first"
 msgstr ""
 

-#: ../../include/text.php:269
+#: ../../include/text.php:274

 msgid "last"
 msgstr ""
 
 msgid "last"
 msgstr ""
 

-#: ../../include/text.php:272
+#: ../../include/text.php:277

 msgid "next"
 msgstr ""
 
 msgid "next"
 msgstr ""
 

-#: ../../include/text.php:563
+#: ../../include/text.php:568

 msgid "No contacts"
 msgstr ""
 
 msgid "No contacts"
 msgstr ""
 

-#: ../../include/text.php:572
+#: ../../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:643 ../../include/nav.php:87
+#: ../../include/text.php:650 ../../include/nav.php:91

 msgid "Search"
 msgstr ""
 
 msgid "Search"
 msgstr ""
 


@@ -5258,52 +6024,76 @@ msgstr ""
 msgid "December"
 msgstr ""
 
 msgid "December"
 msgstr ""
 

-#: ../../include/text.php:905
+#: ../../include/text.php:919

 msgid "bytes"
 msgstr ""
 
 msgid "bytes"
 msgstr ""
 

-#: ../../include/text.php:1000
-msgid "Select an alternate language"
+#: ../../include/text.php:936
+msgid "Categories:"
+msgstr ""
+
+#: ../../include/text.php:948
+msgid "remove"
+msgstr ""
+
+#: ../../include/text.php:948
+msgid "[remove]"
+msgstr ""
+
+#: ../../include/text.php:951
+msgid "Filed under:"
+msgstr ""
+
+#: ../../include/text.php:967 ../../include/text.php:979
+msgid "Click to open/close"

 msgstr ""
 
 msgstr ""
 

-#: ../../include/text.php:1012
+#: ../../include/text.php:1084

 msgid "default"
 msgstr ""
 
 msgid "default"
 msgstr ""
 

-#: ../../include/text.php:1228
+#: ../../include/text.php:1096
+msgid "Select an alternate language"
+msgstr ""
+
+#: ../../include/text.php:1306

 msgid "activity"
 msgstr ""
 
 msgid "activity"
 msgstr ""
 

-#: ../../include/text.php:1230
+#: ../../include/text.php:1308

 msgid "comment"
 msgstr ""
 
 msgid "comment"
 msgstr ""
 

-#: ../../include/text.php:1231
+#: ../../include/text.php:1309

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

-#: ../../include/diaspora.php:570
+#: ../../include/text.php:1464
+msgid "Item filed"
+msgstr ""
+
+#: ../../include/diaspora.php:582

 msgid "Sharing notification from Diaspora network"
 msgstr ""
 
 msgid "Sharing notification from Diaspora network"
 msgstr ""
 

-#: ../../include/diaspora.php:1911
+#: ../../include/diaspora.php:1969

 msgid "Attachments:"
 msgstr ""
 
 msgid "Attachments:"
 msgstr ""
 

-#: ../../include/diaspora.php:2094
+#: ../../include/diaspora.php:2152

 #, 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/network.php:814
+#: ../../include/network.php:823

 msgid "view full size"
 msgstr ""
 
 msgid "view full size"
 msgstr ""
 

-#: ../../include/oembed.php:128
+#: ../../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 ""
 


@@ -5334,135 +6124,119 @@ msgstr ""
 msgid "Create a new group"
 msgstr ""
 
 msgid "Create a new group"
 msgstr ""
 

-#: ../../include/nav.php:44 ../../boot.php:709
+#: ../../include/group.php:215
+msgid "Contacts not in any group"
+msgstr ""
+
+#: ../../include/nav.php:46 ../../boot.php:795

 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:1452

 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:1042

 msgid "Profiles"
 msgstr ""
 
 msgid "Profiles"
 msgstr ""
 

-#: ../../include/nav.php:131 ../../boot.php:940
+#: ../../include/nav.php:138 ../../boot.php:1042

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


@@ -5478,35 +6252,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


@@ -5517,309 +6287,331 @@ 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:513
+#: ../../include/poller.php:543

 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:304

 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:284
+#: ../../include/acl_selectors.php:286

 msgid "Visible to everybody"
 msgstr ""
 
 msgid "Visible to everybody"
 msgstr ""
 

-#: ../../include/acl_selectors.php:285
+#: ../../include/acl_selectors.php:287

 msgid "show"
 msgstr ""
 
 msgid "show"
 msgstr ""
 

-#: ../../include/acl_selectors.php:286
+#: ../../include/acl_selectors.php:288

 msgid "don't show"
 msgstr ""
 
 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:29
+#: ../../include/enotify.php:35

 #, php-format
 msgid "%s <!item_type!>"
 msgstr ""
 
 #, php-format
 msgid "%s <!item_type!>"
 msgstr ""
 

-#: ../../include/enotify.php:33
+#: ../../include/enotify.php:39

 #, php-format
 msgid "[Friendica:Notify] New mail received at %s"
 msgstr ""
 
 #, php-format
 msgid "[Friendica:Notify] New mail received at %s"
 msgstr ""
 

-#: ../../include/enotify.php:35
+#: ../../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:36
+#: ../../include/enotify.php:42

 #, php-format
 msgid "%s sent you %s."
 msgstr ""
 
 #, php-format
 msgid "%s sent you %s."
 msgstr ""
 

-#: ../../include/enotify.php:36
+#: ../../include/enotify.php:42

 msgid "a private message"
 msgstr ""
 
 msgid "a private message"
 msgstr ""
 

-#: ../../include/enotify.php:37
+#: ../../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:67
+#: ../../include/enotify.php:73

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

-#: ../../include/enotify.php:71
+#: ../../include/enotify.php:77

 msgid "your"
 msgstr ""
 
 msgid "your"
 msgstr ""
 

-#: ../../include/enotify.php:78
+#: ../../include/enotify.php:84

 #, php-format
 msgid "[Friendica:Notify] Comment to conversation #%d by %s"
 msgstr ""
 
 #, php-format
 msgid "[Friendica:Notify] Comment to conversation #%d by %s"
 msgstr ""
 

-#: ../../include/enotify.php:79
+#: ../../include/enotify.php:85

 #, php-format
 msgid "%s commented on an item/conversation you have been following."
 msgstr ""
 
 #, php-format
 msgid "%s commented on an item/conversation you have been following."
 msgstr ""
 

-#: ../../include/enotify.php:80
+#: ../../include/enotify.php:86

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

-#: ../../include/enotify.php:82 ../../include/enotify.php:95
-#: ../../include/enotify.php:106 ../../include/enotify.php:117
+#: ../../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:89
+#: ../../include/enotify.php:95

 #, php-format
 msgid "[Friendica:Notify] %s posted to your profile wall"
 msgstr ""
 
 #, php-format
 msgid "[Friendica:Notify] %s posted to your profile wall"
 msgstr ""
 

-#: ../../include/enotify.php:91
+#: ../../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:93
+#: ../../include/enotify.php:99

 #, php-format
 msgid "%s posted to %s"
 msgstr ""
 
 #, php-format
 msgid "%s posted to %s"
 msgstr ""
 

-#: ../../include/enotify.php:93
+#: ../../include/enotify.php:99

 msgid "your profile wall."
 msgstr ""
 
 msgid "your profile wall."
 msgstr ""
 

-#: ../../include/enotify.php:102
+#: ../../include/enotify.php:108

 #, php-format
 msgid "[Friendica:Notify] %s tagged you"
 msgstr ""
 
 #, php-format
 msgid "[Friendica:Notify] %s tagged you"
 msgstr ""
 

-#: ../../include/enotify.php:103
+#: ../../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:104
+#: ../../include/enotify.php:110

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

-#: ../../include/enotify.php:104
+#: ../../include/enotify.php:110

 msgid "tagged you"
 msgstr ""
 
 msgid "tagged you"
 msgstr ""
 

-#: ../../include/enotify.php:113
+#: ../../include/enotify.php:119

 #, php-format
 msgid "[Friendica:Notify] %s tagged your post"
 msgstr ""
 
 #, php-format
 msgid "[Friendica:Notify] %s tagged your post"
 msgstr ""
 

-#: ../../include/enotify.php:114
+#: ../../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:115
+#: ../../include/enotify.php:121

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

-#: ../../include/enotify.php:115
+#: ../../include/enotify.php:121

 msgid "your post"
 msgstr ""
 
 msgid "your post"
 msgstr ""
 

-#: ../../include/enotify.php:124
+#: ../../include/enotify.php:130

 msgid "[Friendica:Notify] Introduction received"
 msgstr ""
 
 msgid "[Friendica:Notify] Introduction received"
 msgstr ""
 

-#: ../../include/enotify.php:125
+#: ../../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:126
+#: ../../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:126
+#: ../../include/enotify.php:132

 msgid "an introduction"
 msgstr ""
 
 msgid "an introduction"
 msgstr ""
 

-#: ../../include/enotify.php:127 ../../include/enotify.php:144
+#: ../../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:129
+#: ../../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:136
+#: ../../include/enotify.php:142

 msgid "[Friendica:Notify] Friend suggestion received"
 msgstr ""
 
 msgid "[Friendica:Notify] Friend suggestion received"
 msgstr ""
 

-#: ../../include/enotify.php:137
+#: ../../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:138
+#: ../../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:139
+#: ../../include/enotify.php:145

 msgid "a friend suggestion"
 msgstr ""
 
 msgid "a friend suggestion"
 msgstr ""
 

-#: ../../include/enotify.php:142
+#: ../../include/enotify.php:148

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

-#: ../../include/enotify.php:143
+#: ../../include/enotify.php:149

 msgid "Photo:"
 msgstr ""
 
 msgid "Photo:"
 msgstr ""
 

-#: ../../include/enotify.php:146
+#: ../../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:2573
+#: ../../include/items.php:2669

 msgid "A new person is sharing with you at "
 msgstr ""
 
 msgid "A new person is sharing with you at "
 msgstr ""
 

-#: ../../include/items.php:2573
+#: ../../include/items.php:2669

 msgid "You have a new follower at "
 msgstr ""
 
 msgid "You have a new follower at "
 msgstr ""
 


@@ -5828,37 +6620,51 @@ msgstr ""
 msgid "image/photo"
 msgstr ""
 
 msgid "image/photo"
 msgstr ""
 

-#: ../../include/security.php:20
-msgid "Welcome "
+#: ../../include/bb2diaspora.php:102
+msgid "link"

 msgstr ""
 
 #: ../../include/security.php:21
 msgstr ""
 
 #: ../../include/security.php:21

+msgid "Welcome "
+msgstr ""
+
+#: ../../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:788
-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:145 ../../include/conversation.php:813
+msgid "View Status"
+msgstr ""
+
+#: ../../include/Contact.php:146 ../../include/conversation.php:814
+msgid "View Profile"

 msgstr ""
 
 msgstr ""
 

-#: ../../include/Contact.php:132 ../../include/conversation.php:789
-msgid "View profile"
+#: ../../include/Contact.php:147 ../../include/conversation.php:815
+msgid "View Photos"

 msgstr ""
 
 msgstr ""
 

-#: ../../include/Contact.php:133 ../../include/conversation.php:790
-msgid "View photos"
+#: ../../include/Contact.php:148 ../../include/Contact.php:161
+#: ../../include/conversation.php:816
+msgid "Network Posts"

 msgstr ""
 
 msgstr ""
 

-#: ../../include/Contact.php:134 ../../include/Contact.php:147
-#: ../../include/conversation.php:791
-msgid "View recent"
+#: ../../include/Contact.php:149 ../../include/conversation.php:817
+msgid "Edit Contact"

 msgstr ""
 
 msgstr ""
 

-#: ../../include/Contact.php:136 ../../include/Contact.php:147
-#: ../../include/conversation.php:793
+#: ../../include/Contact.php:150 ../../include/Contact.php:161
+#: ../../include/conversation.php:818

 msgid "Send PM"
 msgstr ""
 
 msgid "Send PM"
 msgstr ""
 


@@ -5871,36 +6677,32 @@ 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:303 ../../include/conversation.php:572
+#: ../../include/conversation.php:317 ../../include/conversation.php:575

 msgid "Select"
 msgstr ""
 
 msgid "Select"
 msgstr ""
 

-#: ../../include/conversation.php:320 ../../include/conversation.php:665
-#: ../../include/conversation.php:666
+#: ../../include/conversation.php:334 ../../include/conversation.php:672
+#: ../../include/conversation.php:673

 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 

-#: ../../include/conversation.php:330 ../../include/conversation.php:677
+#: ../../include/conversation.php:344 ../../include/conversation.php:684

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

-#: ../../include/conversation.php:346
+#: ../../include/conversation.php:360

 msgid "View in context"
 msgstr ""
 
 msgid "View in context"
 msgstr ""
 

-#: ../../include/conversation.php:467
+#: ../../include/conversation.php:465

 #, 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:468 ../../boot.php:448
-msgid "show more"
-msgstr ""
-

 #: ../../include/conversation.php:529
 msgid "like"
 msgstr ""
 #: ../../include/conversation.php:529
 msgid "like"
 msgstr ""


@@ -5917,205 +6719,209 @@ msgstr ""
 msgid "share"
 msgstr ""
 
 msgid "share"
 msgstr ""
 

-#: ../../include/conversation.php:582
+#: ../../include/conversation.php:588

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

-#: ../../include/conversation.php:583
+#: ../../include/conversation.php:589

 msgid "remove star"
 msgstr ""
 
 msgid "remove star"
 msgstr ""
 

-#: ../../include/conversation.php:584
+#: ../../include/conversation.php:590

 msgid "toggle star status"
 msgstr ""
 
 msgid "toggle star status"
 msgstr ""
 

-#: ../../include/conversation.php:587
+#: ../../include/conversation.php:593

 msgid "starred"
 msgstr ""
 
 msgid "starred"
 msgstr ""
 

-#: ../../include/conversation.php:588
+#: ../../include/conversation.php:594

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

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

 msgid "to"
 msgstr ""
 
 msgid "to"
 msgstr ""
 

-#: ../../include/conversation.php:668
+#: ../../include/conversation.php:675

 msgid "Wall-to-Wall"
 msgstr ""
 
 msgid "Wall-to-Wall"
 msgstr ""
 

-#: ../../include/conversation.php:669
+#: ../../include/conversation.php:676

 msgid "via Wall-To-Wall:"
 msgstr ""
 
 msgid "via Wall-To-Wall:"
 msgstr ""
 

-#: ../../include/conversation.php:713
+#: ../../include/conversation.php:721

 msgid "Delete Selected Items"
 msgstr ""
 
 msgid "Delete Selected Items"
 msgstr ""
 

-#: ../../include/conversation.php:845
+#: ../../include/conversation.php:872

 #, php-format
 msgid "%s likes this."
 msgstr ""
 
 #, php-format
 msgid "%s likes this."
 msgstr ""
 

-#: ../../include/conversation.php:845
+#: ../../include/conversation.php:872

 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 

-#: ../../include/conversation.php:849
+#: ../../include/conversation.php:876

 #, 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:851
+#: ../../include/conversation.php:878

 #, 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:857
+#: ../../include/conversation.php:884

 msgid "and"
 msgstr ""
 
 msgid "and"
 msgstr ""
 

-#: ../../include/conversation.php:860
+#: ../../include/conversation.php:887

 #, php-format
 msgid ", and %d other people"
 msgstr ""
 
 #, php-format
 msgid ", and %d other people"
 msgstr ""
 

-#: ../../include/conversation.php:861
+#: ../../include/conversation.php:888

 #, php-format
 msgid "%s like this."
 msgstr ""
 
 #, php-format
 msgid "%s like this."
 msgstr ""
 

-#: ../../include/conversation.php:861
+#: ../../include/conversation.php:888

 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 

-#: ../../include/conversation.php:886
+#: ../../include/conversation.php:913

 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 

-#: ../../include/conversation.php:888
+#: ../../include/conversation.php:915

 msgid "Please enter a video link/URL:"
 msgstr ""
 
 msgid "Please enter a video link/URL:"
 msgstr ""
 

-#: ../../include/conversation.php:889
+#: ../../include/conversation.php:916

 msgid "Please enter an audio link/URL:"
 msgstr ""
 
 msgid "Please enter an audio link/URL:"
 msgstr ""
 

-#: ../../include/conversation.php:890
+#: ../../include/conversation.php:917

 msgid "Tag term:"
 msgstr ""
 
 msgid "Tag term:"
 msgstr ""
 

-#: ../../include/conversation.php:891
+#: ../../include/conversation.php:919

 msgid "Where are you right now?"
 msgstr ""
 
 msgid "Where are you right now?"
 msgstr ""
 

-#: ../../include/conversation.php:892
-msgid "Enter a title for this item"
-msgstr ""
-
-#: ../../include/conversation.php:935
+#: ../../include/conversation.php:962

 msgid "upload photo"
 msgstr ""
 
 msgid "upload photo"
 msgstr ""
 

-#: ../../include/conversation.php:937
+#: ../../include/conversation.php:964

 msgid "attach file"
 msgstr ""
 
 msgid "attach file"
 msgstr ""
 

-#: ../../include/conversation.php:939
+#: ../../include/conversation.php:966

 msgid "web link"
 msgstr ""
 
 msgid "web link"
 msgstr ""
 

-#: ../../include/conversation.php:940
+#: ../../include/conversation.php:967

 msgid "Insert video link"
 msgstr ""
 
 msgid "Insert video link"
 msgstr ""
 

-#: ../../include/conversation.php:941
+#: ../../include/conversation.php:968

 msgid "video link"
 msgstr ""
 
 msgid "video link"
 msgstr ""
 

-#: ../../include/conversation.php:942
+#: ../../include/conversation.php:969

 msgid "Insert audio link"
 msgstr ""
 
 msgid "Insert audio link"
 msgstr ""
 

-#: ../../include/conversation.php:943
+#: ../../include/conversation.php:970

 msgid "audio link"
 msgstr ""
 
 msgid "audio link"
 msgstr ""
 

-#: ../../include/conversation.php:945
+#: ../../include/conversation.php:972

 msgid "set location"
 msgstr ""
 
 msgid "set location"
 msgstr ""
 

-#: ../../include/conversation.php:947
+#: ../../include/conversation.php:974

 msgid "clear location"
 msgstr ""
 
 msgid "clear location"
 msgstr ""
 

-#: ../../include/conversation.php:952
+#: ../../include/conversation.php:981

 msgid "permissions"
 msgstr ""
 
 msgid "permissions"
 msgstr ""
 

-#: ../../boot.php:446
+#: ../../boot.php:494

 msgid "Delete this item?"
 msgstr ""
 
 msgid "Delete this item?"
 msgstr ""
 

-#: ../../boot.php:449
+#: ../../boot.php:497

 msgid "show fewer"
 msgstr ""
 
 msgid "show fewer"
 msgstr ""
 

-#: ../../boot.php:692
+#: ../../boot.php:774

 msgid "Create a New Account"
 msgstr ""
 
 msgid "Create a New Account"
 msgstr ""
 

-#: ../../boot.php:712
+#: ../../boot.php:798

 msgid "Nickname or Email address: "
 msgstr ""
 
 msgid "Nickname or Email address: "
 msgstr ""
 

-#: ../../boot.php:713
+#: ../../boot.php:799

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

-#: ../../boot.php:716
+#: ../../boot.php:802

 msgid "Or login using OpenID: "
 msgstr ""
 
 msgid "Or login using OpenID: "
 msgstr ""
 

-#: ../../boot.php:722
+#: ../../boot.php:808

 msgid "Forgot your password?"
 msgstr ""
 
 msgid "Forgot your password?"
 msgstr ""
 

-#: ../../boot.php:879
+#: ../../boot.php:974

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

-#: ../../boot.php:1046 ../../boot.php:1117
+#: ../../boot.php:1034
+msgid "Message"
+msgstr ""
+
+#: ../../boot.php:1150 ../../boot.php:1222

 msgid "g A l F d"
 msgstr ""
 
 msgid "g A l F d"
 msgstr ""
 

-#: ../../boot.php:1047 ../../boot.php:1118
+#: ../../boot.php:1151 ../../boot.php:1223

 msgid "F d"
 msgstr ""
 
 msgid "F d"
 msgstr ""
 

-#: ../../boot.php:1072
+#: ../../boot.php:1176

 msgid "Birthday Reminders"
 msgstr ""
 
 msgid "Birthday Reminders"
 msgstr ""
 

-#: ../../boot.php:1073
+#: ../../boot.php:1177

 msgid "Birthdays this week:"
 msgstr ""
 
 msgid "Birthdays this week:"
 msgstr ""
 

-#: ../../boot.php:1096 ../../boot.php:1160
+#: ../../boot.php:1200 ../../boot.php:1265

 msgid "[today]"
 msgstr ""
 
 msgid "[today]"
 msgstr ""
 

-#: ../../boot.php:1141
+#: ../../boot.php:1246

 msgid "Event Reminders"
 msgstr ""
 
 msgid "Event Reminders"
 msgstr ""
 

-#: ../../boot.php:1142
+#: ../../boot.php:1247

 msgid "Events this week:"
 msgstr ""
 
 msgid "Events this week:"
 msgstr ""
 

-#: ../../boot.php:1154
+#: ../../boot.php:1259

 msgid "[No description]"
 msgstr ""
 msgid "[No description]"
 msgstr ""