Merge remote branch 'upstream/master'

author: zottel <github@zottel.net> 2012-04-08 10:33:32 +0200
committer: zottel <github@zottel.net> 2012-04-08 10:33:32 +0200
commit: aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b (patch)
tree: 1d7e5f2b575b8836fefe76660f466cb176585d5c /util
parent: 64a1367525ac920721943a08adec1124657df70d (diff)
parent: e3b2ac0735c908357dafb8670339fd34d3e2e6c0 (diff)
download: volse-hubzilla-aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b.tar.gz
volse-hubzilla-aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b.tar.bz2
volse-hubzilla-aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b.zip
11 files changed, 1034 insertions, 744 deletions
diff --git a/util/.htaccess b/util/.htaccess
index b311c14c2..b311c14c2 100755..100644
--- a/util/.htaccess
+++ b/util/.htaccess
diff --git a/util/README b/util/README
index aceade3e2..aceade3e2 100755..100644
--- a/util/README
+++ b/util/README
diff --git a/util/db_update.php b/util/db_update.php
index 35620e80b..35620e80b 100755..100644
--- a/util/db_update.php
+++ b/util/db_update.php
diff --git a/util/extract.php b/util/extract.php
index 90127f3c1..90127f3c1 100755..100644
--- a/util/extract.php
+++ b/util/extract.php
diff --git a/util/messages.po b/util/messages.po
index 132a784dc..0cb9d094d 100755..100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.3.1296\n"
+"Project-Id-Version: 2.3.1304\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-30 04:52-0700\n"
+"POT-Creation-Date: 2012-04-06 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"
@@ -38,22 +38,24 @@ msgstr ""
 #: ../../mod/fsuggest.php:78 ../../mod/events.php:110 ../../mod/api.php:26
 #: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:866
 #: ../../mod/editpost.php:10 ../../mod/install.php:171
-#: ../../mod/notifications.php:62 ../../mod/contacts.php:125
-#: ../../mod/settings.php:49 ../../mod/settings.php:428
-#: ../../mod/settings.php:433 ../../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: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:91
-#: ../../mod/allfriends.php:9 ../../mod/wall_upload.php:42
-#: ../../mod/follow.php:8 ../../mod/common.php:9 ../../mod/display.php:138
-#: ../../mod/profiles.php:7 ../../mod/profiles.php:232
-#: ../../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:452 ../../include/items.php:3110
-#: ../../index.php:291
+#: ../../mod/notifications.php:66 ../../mod/contacts.php:125
+#: ../../mod/settings.php:62 ../../mod/settings.php:473
+#: ../../mod/settings.php:478 ../../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:91 ../../mod/allfriends.php:9
+#: ../../mod/wall_upload.php:42 ../../mod/follow.php:8 ../../mod/common.php:9
+#: ../../mod/display.php:138 ../../mod/profiles.php:7
+#: ../../mod/profiles.php:232 ../../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:456
+#: ../../include/items.php:3118 ../../index.php:294
 msgid "Permission denied."
 msgstr ""
 
@@ -82,8 +84,8 @@ msgstr ""
 msgid "Return to contact editor"
 msgstr ""
 
-#: ../../mod/crepair.php:148 ../../mod/settings.php:480
-#: ../../mod/settings.php:507 ../../mod/admin.php:487 ../../mod/admin.php:496
+#: ../../mod/crepair.php:148 ../../mod/settings.php:531
+#: ../../mod/settings.php:558 ../../mod/admin.php:528 ../../mod/admin.php:537
 msgid "Name"
 msgstr ""
 
@@ -125,34 +127,33 @@ msgstr ""
 #: ../../mod/photos.php:1274 ../../mod/photos.php:1305
 #: ../../mod/install.php:251 ../../mod/install.php:289
 #: ../../mod/localtime.php:45 ../../mod/contacts.php:319
-#: ../../mod/settings.php:478 ../../mod/settings.php:628
-#: ../../mod/settings.php:826 ../../mod/manage.php:109 ../../mod/group.php:85
-#: ../../mod/admin.php:316 ../../mod/admin.php:484 ../../mod/admin.php:613
-#: ../../mod/admin.php:785 ../../mod/admin.php:865 ../../mod/profiles.php:390
-#: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:531
-#: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93
-#: ../../addon/nsfw/nsfw.php:57
+#: ../../mod/settings.php:529 ../../mod/settings.php:679
+#: ../../mod/settings.php:741 ../../mod/settings.php:926
+#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:357
+#: ../../mod/admin.php:525 ../../mod/admin.php:654 ../../mod/admin.php:826
+#: ../../mod/admin.php:906 ../../mod/profiles.php:390 ../../mod/invite.php:119
+#: ../../addon/facebook/facebook.php:547 ../../addon/yourls/yourls.php:76
+#: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57
 #: ../../addon/uhremotestorage/uhremotestorage.php:89
 #: ../../addon/randplace/randplace.php:179 ../../addon/dwpost/dwpost.php:93
-#: ../../addon/drpost/drpost.php:110 ../../addon/frown/frown.php:84
-#: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41
-#: ../../addon/impressum/impressum.php:69 ../../addon/blockem/blockem.php:57
-#: ../../addon/qcomment/qcomment.php:61
+#: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187
+#: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:69
+#: ../../addon/blockem/blockem.php:57 ../../addon/qcomment/qcomment.php:61
 #: ../../addon/openstreetmap/openstreetmap.php:70
 #: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:94
-#: ../../addon/pageheader/pageheader.php:52 ../../addon/ijpost/ijpost.php:93
-#: ../../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/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:547 ../../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/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:369
 #: ../../addon/posterous/posterous.php:90
-#: ../../view/theme/quattro/theme.php:15 ../../include/conversation.php:555
+#: ../../view/theme/quattro/config.php:21 ../../include/conversation.php:555
 msgid "Submit"
 msgstr ""
 
@@ -164,11 +165,11 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
-#: ../../mod/help.php:38 ../../index.php:224
+#: ../../mod/help.php:38 ../../index.php:225
 msgid "Not Found"
 msgstr ""
 
-#: ../../mod/help.php:41 ../../index.php:227
+#: ../../mod/help.php:41 ../../index.php:228
 msgid "Page not found."
 msgstr ""
 
@@ -206,13 +207,15 @@ msgstr ""
 msgid "Edit event"
 msgstr ""
 
-#: ../../mod/events.php:272 ../../include/text.php:1044
+#: ../../mod/events.php:272 ../../include/text.php:1053
 msgid "link to source"
 msgstr ""
 
-#: ../../mod/events.php:296 ../../view/theme/diabook-blue/theme.php:219
-#: ../../view/theme/diabook/theme.php:225 ../../include/nav.php:52
-#: ../../boot.php:1399
+#: ../../mod/events.php:296 ../../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:240 ../../include/nav.php:52
+#: ../../boot.php:1421
 msgid "Events"
 msgstr ""
 
@@ -262,7 +265,7 @@ msgid "Description:"
 msgstr ""
 
 #: ../../mod/events.php:395 ../../include/event.php:37
-#: ../../include/bb2diaspora.php:260 ../../boot.php:1030
+#: ../../include/bb2diaspora.php:260 ../../boot.php:1042
 msgid "Location:"
 msgstr ""
 
@@ -271,8 +274,8 @@ msgid "Share this event"
 msgstr ""
 
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/dfrn_request.php:707 ../../mod/settings.php:479
-#: ../../mod/settings.php:506 ../../addon/js_upload/js_upload.php:45
+#: ../../mod/dfrn_request.php:707 ../../mod/settings.php:530
+#: ../../mod/settings.php:557 ../../addon/js_upload/js_upload.php:45
 msgid "Cancel"
 msgstr ""
 
@@ -316,24 +319,24 @@ msgid ""
 msgstr ""
 
 #: ../../mod/api.php:105 ../../mod/dfrn_request.php:695
-#: ../../mod/settings.php:721 ../../mod/settings.php:727
-#: ../../mod/settings.php:735 ../../mod/settings.php:739
-#: ../../mod/settings.php:744 ../../mod/settings.php:750
-#: ../../mod/settings.php:756 ../../mod/settings.php:816
-#: ../../mod/settings.php:817 ../../mod/settings.php:818
-#: ../../mod/settings.php:819 ../../mod/register.php:534
-#: ../../mod/profiles.php:369
+#: ../../mod/settings.php:841 ../../mod/settings.php:847
+#: ../../mod/settings.php:855 ../../mod/settings.php:859
+#: ../../mod/settings.php:864 ../../mod/settings.php:870
+#: ../../mod/settings.php:876 ../../mod/settings.php:882
+#: ../../mod/settings.php:916 ../../mod/settings.php:917
+#: ../../mod/settings.php:918 ../../mod/settings.php:919
+#: ../../mod/register.php:536 ../../mod/profiles.php:369
 msgid "Yes"
 msgstr ""
 
 #: ../../mod/api.php:106 ../../mod/dfrn_request.php:696
-#: ../../mod/settings.php:721 ../../mod/settings.php:727
-#: ../../mod/settings.php:735 ../../mod/settings.php:739
-#: ../../mod/settings.php:744 ../../mod/settings.php:750
-#: ../../mod/settings.php:756 ../../mod/settings.php:816
-#: ../../mod/settings.php:817 ../../mod/settings.php:818
-#: ../../mod/settings.php:819 ../../mod/register.php:535
-#: ../../mod/profiles.php:370
+#: ../../mod/settings.php:841 ../../mod/settings.php:847
+#: ../../mod/settings.php:855 ../../mod/settings.php:859
+#: ../../mod/settings.php:864 ../../mod/settings.php:870
+#: ../../mod/settings.php:876 ../../mod/settings.php:882
+#: ../../mod/settings.php:916 ../../mod/settings.php:917
+#: ../../mod/settings.php:918 ../../mod/settings.php:919
+#: ../../mod/register.php:537 ../../mod/profiles.php:370
 msgid "No"
 msgstr ""
 
@@ -344,8 +347,10 @@ msgstr ""
 #: ../../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:110
 #: ../../view/theme/diabook-blue/theme.php:110
-#: ../../view/theme/diabook/theme.php:113
+#: ../../view/theme/diabook/theme.php:114
+#: ../../view/theme/diabook-aerith/theme.php:110
 msgid "Contact Photos"
 msgstr ""
 
@@ -353,7 +358,7 @@ msgstr ""
 msgid "Upload New Photos"
 msgstr ""
 
-#: ../../mod/photos.php:69 ../../mod/settings.php:11
+#: ../../mod/photos.php:69 ../../mod/settings.php:24
 msgid "everybody"
 msgstr ""
 
@@ -362,14 +367,16 @@ msgid "Contact information unavailable"
 msgstr ""
 
 #: ../../mod/photos.php:151 ../../mod/photos.php:598 ../../mod/photos.php:951
-#: ../../mod/photos.php:966 ../../mod/register.php:337
-#: ../../mod/register.php:344 ../../mod/register.php:351
+#: ../../mod/photos.php:966 ../../mod/register.php:339
+#: ../../mod/register.php:346 ../../mod/register.php:353
 #: ../../mod/profile_photo.php:60 ../../mod/profile_photo.php:67
 #: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174
 #: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261
 #: ../../addon/communityhome/communityhome.php:111
+#: ../../view/theme/diabook-red/theme.php:111
 #: ../../view/theme/diabook-blue/theme.php:111
-#: ../../view/theme/diabook/theme.php:114
+#: ../../view/theme/diabook/theme.php:115
+#: ../../view/theme/diabook-aerith/theme.php:111
 msgid "Profile Photos"
 msgstr ""
 
@@ -391,9 +398,11 @@ msgstr ""
 
 #: ../../mod/photos.php:529 ../../mod/like.php:127 ../../mod/tagger.php:70
 #: ../../addon/communityhome/communityhome.php:163
+#: ../../view/theme/diabook-red/theme.php:82
 #: ../../view/theme/diabook-blue/theme.php:82
-#: ../../view/theme/diabook/theme.php:85 ../../include/text.php:1288
-#: ../../include/diaspora.php:1642 ../../include/conversation.php:53
+#: ../../view/theme/diabook/theme.php:86
+#: ../../view/theme/diabook-aerith/theme.php:82 ../../include/text.php:1297
+#: ../../include/diaspora.php:1654 ../../include/conversation.php:53
 #: ../../include/conversation.php:126
 msgid "photo"
 msgstr ""
@@ -527,9 +536,9 @@ msgid "Share"
 msgstr ""
 
 #: ../../mod/photos.php:1215 ../../mod/editpost.php:104
-#: ../../mod/message.php:189 ../../mod/message.php:352
-#: ../../include/conversation.php:362 ../../include/conversation.php:702
-#: ../../include/conversation.php:977
+#: ../../mod/wallmessage.php:145 ../../mod/message.php:189
+#: ../../mod/message.php:358 ../../include/conversation.php:362
+#: ../../include/conversation.php:702 ../../include/conversation.php:979
 msgid "Please wait"
 msgstr ""
 
@@ -540,17 +549,17 @@ msgstr ""
 
 #: ../../mod/photos.php:1233 ../../mod/photos.php:1273
 #: ../../mod/photos.php:1304 ../../include/conversation.php:554
-#: ../../boot.php:488
+#: ../../boot.php:494
 msgid "Comment"
 msgstr ""
 
-#: ../../mod/photos.php:1235 ../../mod/editpost.php:123
-#: ../../include/conversation.php:556 ../../include/conversation.php:995
+#: ../../mod/photos.php:1235 ../../mod/editpost.php:125
+#: ../../include/conversation.php:556 ../../include/conversation.php:997
 msgid "Preview"
 msgstr ""
 
-#: ../../mod/photos.php:1332 ../../mod/settings.php:542
-#: ../../mod/settings.php:626 ../../mod/group.php:168 ../../mod/admin.php:491
+#: ../../mod/photos.php:1332 ../../mod/settings.php:593
+#: ../../mod/settings.php:677 ../../mod/group.php:168 ../../mod/admin.php:532
 #: ../../include/conversation.php:318 ../../include/conversation.php:576
 msgid "Delete"
 msgstr ""
@@ -568,12 +577,14 @@ msgid "Not available."
 msgstr ""
 
 #: ../../mod/community.php:30 ../../addon/pages/pages.php:75
-#: ../../view/theme/diabook-blue/theme.php:221
-#: ../../view/theme/diabook/theme.php:227 ../../include/nav.php:101
+#: ../../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:242 ../../include/nav.php:101
 msgid "Community"
 msgstr ""
 
-#: ../../mod/community.php:61 ../../mod/search.php:119
+#: ../../mod/community.php:61 ../../mod/search.php:115
 msgid "No results."
 msgstr ""
 
@@ -621,13 +632,14 @@ msgstr ""
 msgid "Post to Email"
 msgstr ""
 
-#: ../../mod/editpost.php:95 ../../mod/settings.php:541
+#: ../../mod/editpost.php:95 ../../mod/settings.php:592
 #: ../../include/conversation.php:563
 msgid "Edit"
 msgstr ""
 
-#: ../../mod/editpost.php:96 ../../mod/message.php:187
-#: ../../mod/message.php:350 ../../include/conversation.php:961
+#: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143
+#: ../../mod/message.php:187 ../../mod/message.php:356
+#: ../../include/conversation.php:961
 msgid "Upload photo"
 msgstr ""
 
@@ -635,8 +647,9 @@ msgstr ""
 msgid "Attach file"
 msgstr ""
 
-#: ../../mod/editpost.php:98 ../../mod/message.php:188
-#: ../../mod/message.php:351 ../../include/conversation.php:965
+#: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144
+#: ../../mod/message.php:188 ../../mod/message.php:357
+#: ../../include/conversation.php:965
 msgid "Insert web link"
 msgstr ""
 
@@ -660,15 +673,15 @@ msgstr ""
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:978
+#: ../../mod/editpost.php:105 ../../include/conversation.php:980
 msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:987
+#: ../../mod/editpost.php:113 ../../include/conversation.php:989
 msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/editpost.php:114 ../../include/conversation.php:988
+#: ../../mod/editpost.php:114 ../../include/conversation.php:990
 msgid "Public post"
 msgstr ""
 
@@ -676,7 +689,11 @@ msgstr ""
 msgid "Set title"
 msgstr ""
 
-#: ../../mod/editpost.php:118 ../../include/conversation.php:990
+#: ../../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 ""
 
@@ -785,17 +802,10 @@ msgstr ""
 msgid "Confirm"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:583 ../../include/items.php:2641
+#: ../../mod/dfrn_request.php:583 ../../include/items.php:2649
 msgid "[Name Withheld]"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:667
-#, php-format
-msgid ""
-"Diaspora members: Please do not use this form. Instead, enter \"%s\" into "
-"your Diaspora search bar."
-msgstr ""
-
 #: ../../mod/dfrn_request.php:670
 msgid ""
 "Please enter your 'Identity Address' from one of the following supported "
@@ -844,13 +854,16 @@ msgstr ""
 msgid "StatusNet/Federated Social Web"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:701 ../../mod/settings.php:578
+#: ../../mod/dfrn_request.php:701 ../../mod/settings.php:629
 #: ../../include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr ""
 
 #: ../../mod/dfrn_request.php:702
-msgid "- please share from your own site as noted above"
+#, php-format
+msgid ""
+" - please do not use this form.  Instead, enter %s into your Diaspora search "
+"bar."
 msgstr ""
 
 #: ../../mod/dfrn_request.php:703
@@ -997,7 +1010,7 @@ msgid "This is required for message delivery to work."
 msgstr ""
 
 #: ../../mod/install.php:343
-msgid "PHP \"register_argc_argv\""
+msgid "PHP register_argc_argv"
 msgstr ""
 
 #: ../../mod/install.php:364
@@ -1152,7 +1165,7 @@ msgid "is interested in:"
 msgstr ""
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:980
+#: ../../include/contact_widgets.php:9 ../../boot.php:986
 msgid "Connect"
 msgstr ""
 
@@ -1177,185 +1190,187 @@ 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 ""
 
-#: ../../mod/notifications.php:47 ../../mod/notifications.php:156
-#: ../../mod/notifications.php:202 ../../mod/contacts.php:302
+#: ../../mod/notifications.php:51 ../../mod/notifications.php:160
+#: ../../mod/notifications.php:206 ../../mod/contacts.php:302
 #: ../../mod/contacts.php:345
 msgid "Ignore"
 msgstr ""
 
-#: ../../mod/notifications.php:71
+#: ../../mod/notifications.php:75
 msgid "System"
 msgstr ""
 
-#: ../../mod/notifications.php:76 ../../include/nav.php:113
+#: ../../mod/notifications.php:80 ../../include/nav.php:113
 msgid "Network"
 msgstr ""
 
-#: ../../mod/notifications.php:81 ../../mod/network.php:182
+#: ../../mod/notifications.php:85 ../../mod/network.php:182
 msgid "Personal"
 msgstr ""
 
-#: ../../mod/notifications.php:86 ../../view/theme/diabook-blue/theme.php:215
-#: ../../view/theme/diabook/theme.php:221 ../../include/nav.php:77
+#: ../../mod/notifications.php:90 ../../view/theme/diabook-red/theme.php:236
+#: ../../view/theme/diabook-blue/theme.php:236
+#: ../../view/theme/diabook/theme.php:244
+#: ../../view/theme/diabook-aerith/theme.php:236 ../../include/nav.php:77
 #: ../../include/nav.php:115
 msgid "Home"
 msgstr ""
 
-#: ../../mod/notifications.php:91 ../../include/nav.php:121
+#: ../../mod/notifications.php:95 ../../include/nav.php:121
 msgid "Introductions"
 msgstr ""
 
-#: ../../mod/notifications.php:96 ../../mod/message.php:103
+#: ../../mod/notifications.php:100 ../../mod/message.php:103
 #: ../../include/nav.php:128
 msgid "Messages"
 msgstr ""
 
-#: ../../mod/notifications.php:115
+#: ../../mod/notifications.php:119
 msgid "Show Ignored Requests"
 msgstr ""
 
-#: ../../mod/notifications.php:115
+#: ../../mod/notifications.php:119
 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 ""
 
-#: ../../mod/notifications.php:142
+#: ../../mod/notifications.php:146
 msgid "Friend Suggestion"
 msgstr ""
 
-#: ../../mod/notifications.php:144
+#: ../../mod/notifications.php:148
 #, php-format
 msgid "suggested by %s"
 msgstr ""
 
-#: ../../mod/notifications.php:149 ../../mod/notifications.php:196
+#: ../../mod/notifications.php:153 ../../mod/notifications.php:200
 #: ../../mod/contacts.php:350
 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 ""
 
-#: ../../mod/notifications.php:150 ../../mod/notifications.php:197
+#: ../../mod/notifications.php:154 ../../mod/notifications.php:201
 msgid "if applicable"
 msgstr ""
 
-#: ../../mod/notifications.php:153 ../../mod/notifications.php:200
-#: ../../mod/admin.php:489
+#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
+#: ../../mod/admin.php:530
 msgid "Approve"
 msgstr ""
 
-#: ../../mod/notifications.php:173
+#: ../../mod/notifications.php:177
 msgid "Claims to be known to you: "
 msgstr ""
 
-#: ../../mod/notifications.php:173
+#: ../../mod/notifications.php:177
 msgid "yes"
 msgstr ""
 
-#: ../../mod/notifications.php:173
+#: ../../mod/notifications.php:177
 msgid "no"
 msgstr ""
 
-#: ../../mod/notifications.php:180
+#: ../../mod/notifications.php:184
 msgid "Approve as: "
 msgstr ""
 
-#: ../../mod/notifications.php:181
+#: ../../mod/notifications.php:185
 msgid "Friend"
 msgstr ""
 
-#: ../../mod/notifications.php:182
+#: ../../mod/notifications.php:186
 msgid "Sharer"
 msgstr ""
 
-#: ../../mod/notifications.php:182
+#: ../../mod/notifications.php:186
 msgid "Fan/Admirer"
 msgstr ""
 
-#: ../../mod/notifications.php:188
+#: ../../mod/notifications.php:192
 msgid "Friend/Connect Request"
 msgstr ""
 
-#: ../../mod/notifications.php:188
+#: ../../mod/notifications.php:192
 msgid "New Follower"
 msgstr ""
 
-#: ../../mod/notifications.php:209
+#: ../../mod/notifications.php:213
 msgid "No introductions."
 msgstr ""
 
-#: ../../mod/notifications.php:212 ../../include/nav.php:122
+#: ../../mod/notifications.php:216 ../../include/nav.php:122
 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 ""
 
-#: ../../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 ""
 
-#: ../../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 ""
 
-#: ../../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 ""
 
-#: ../../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 ""
 
-#: ../../mod/notifications.php:294
+#: ../../mod/notifications.php:298
 msgid "No more network notifications."
 msgstr ""
 
-#: ../../mod/notifications.php:298
+#: ../../mod/notifications.php:302
 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 ""
 
-#: ../../mod/notifications.php:328 ../../mod/notify.php:65
+#: ../../mod/notifications.php:332 ../../mod/notify.php:65
 msgid "System Notifications"
 msgstr ""
 
-#: ../../mod/notifications.php:419
+#: ../../mod/notifications.php:423
 msgid "No more personal notifications."
 msgstr ""
 
-#: ../../mod/notifications.php:423
+#: ../../mod/notifications.php:427
 msgid "Personal Notifications"
 msgstr ""
 
-#: ../../mod/notifications.php:500
+#: ../../mod/notifications.php:504
 msgid "No more home notifications."
 msgstr ""
 
-#: ../../mod/notifications.php:504
+#: ../../mod/notifications.php:508
 msgid "Home Notifications"
 msgstr ""
 
@@ -1447,12 +1462,12 @@ msgid "View all contacts"
 msgstr ""
 
 #: ../../mod/contacts.php:297 ../../mod/contacts.php:344
-#: ../../mod/admin.php:493
+#: ../../mod/admin.php:534
 msgid "Unblock"
 msgstr ""
 
 #: ../../mod/contacts.php:297 ../../mod/contacts.php:344
-#: ../../mod/admin.php:492
+#: ../../mod/admin.php:533
 msgid "Block"
 msgstr ""
 
@@ -1521,7 +1536,7 @@ msgstr ""
 msgid "Update public posts"
 msgstr ""
 
-#: ../../mod/contacts.php:341 ../../mod/admin.php:914
+#: ../../mod/contacts.php:341 ../../mod/admin.php:955
 msgid "Update now"
 msgstr ""
 
@@ -1579,8 +1594,10 @@ msgstr ""
 msgid "Edit contact"
 msgstr ""
 
-#: ../../mod/contacts.php:523 ../../view/theme/diabook-blue/theme.php:217
-#: ../../view/theme/diabook/theme.php:223 ../../include/nav.php:139
+#: ../../mod/contacts.php:523 ../../view/theme/diabook-red/theme.php:238
+#: ../../view/theme/diabook-blue/theme.php:238
+#: ../../view/theme/diabook/theme.php:246
+#: ../../view/theme/diabook-aerith/theme.php:238 ../../include/nav.php:139
 msgid "Contacts"
 msgstr ""
 
@@ -1611,9 +1628,10 @@ msgid "Password reset requested at %s"
 msgstr ""
 
 #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
-#: ../../mod/register.php:390 ../../mod/register.php:444
+#: ../../mod/register.php:392 ../../mod/register.php:446
 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732
-#: ../../addon/facebook/facebook.php:601 ../../include/items.php:2650
+#: ../../addon/facebook/facebook.php:617
+#: ../../addon/facebook/facebook.php:1069 ../../include/items.php:2658
 msgid "Administrator"
 msgstr ""
 
@@ -1623,7 +1641,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:83 ../../boot.php:773
+#: ../../mod/lostpass.php:83 ../../boot.php:779
 msgid "Password Reset"
 msgstr ""
 
@@ -1667,456 +1685,490 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
-#: ../../mod/settings.php:76
+#: ../../mod/settings.php:89
 msgid "Missing some important data!"
 msgstr ""
 
-#: ../../mod/settings.php:79 ../../mod/settings.php:505 ../../mod/admin.php:75
+#: ../../mod/settings.php:92 ../../mod/settings.php:556 ../../mod/admin.php:75
 msgid "Update"
 msgstr ""
 
-#: ../../mod/settings.php:184
+#: ../../mod/settings.php:197
 msgid "Failed to connect with email account using the settings provided."
 msgstr ""
 
-#: ../../mod/settings.php:189
+#: ../../mod/settings.php:202
 msgid "Email settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:208
+#: ../../mod/settings.php:261
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:213
+#: ../../mod/settings.php:266
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:224
+#: ../../mod/settings.php:277
 msgid "Password changed."
 msgstr ""
 
-#: ../../mod/settings.php:226
+#: ../../mod/settings.php:279
 msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/settings.php:294
+#: ../../mod/settings.php:340
 msgid " Please use a shorter name."
 msgstr ""
 
-#: ../../mod/settings.php:296
+#: ../../mod/settings.php:342
 msgid " Name too short."
 msgstr ""
 
-#: ../../mod/settings.php:302
+#: ../../mod/settings.php:348
 msgid " Not valid email."
 msgstr ""
 
-#: ../../mod/settings.php:304
+#: ../../mod/settings.php:350
 msgid " Cannot change to that email."
 msgstr ""
 
-#: ../../mod/settings.php:375 ../../addon/facebook/facebook.php:441
+#: ../../mod/settings.php:420 ../../addon/facebook/facebook.php:445
 #: ../../addon/impressum/impressum.php:64
 #: ../../addon/openstreetmap/openstreetmap.php:80
-#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:350
+#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:364
 msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:439 ../../include/nav.php:137
+#: ../../mod/settings.php:484 ../../view/theme/diabook-red/theme.php:284
+#: ../../view/theme/diabook-blue/theme.php:283
+#: ../../view/theme/diabook/theme.php:293
+#: ../../view/theme/diabook-aerith/theme.php:283 ../../include/nav.php:137
 msgid "Account settings"
 msgstr ""
 
-#: ../../mod/settings.php:444
+#: ../../mod/settings.php:489 ../../view/theme/diabook-red/theme.php:289
+#: ../../view/theme/diabook-blue/theme.php:288
+#: ../../view/theme/diabook/theme.php:298
+#: ../../view/theme/diabook-aerith/theme.php:288
+msgid "Display settings"
+msgstr ""
+
+#: ../../mod/settings.php:495 ../../view/theme/diabook-red/theme.php:298
+#: ../../view/theme/diabook-blue/theme.php:297
+#: ../../view/theme/diabook/theme.php:307
+#: ../../view/theme/diabook-aerith/theme.php:297
 msgid "Connector settings"
 msgstr ""
 
-#: ../../mod/settings.php:449
+#: ../../mod/settings.php:500 ../../view/theme/diabook-red/theme.php:303
+#: ../../view/theme/diabook-blue/theme.php:302
+#: ../../view/theme/diabook/theme.php:312
+#: ../../view/theme/diabook-aerith/theme.php:302
 msgid "Plugin settings"
 msgstr ""
 
-#: ../../mod/settings.php:454
+#: ../../mod/settings.php:505 ../../view/theme/diabook-red/theme.php:308
+#: ../../view/theme/diabook-blue/theme.php:307
+#: ../../view/theme/diabook/theme.php:317
+#: ../../view/theme/diabook-aerith/theme.php:307
 msgid "Connections"
 msgstr ""
 
-#: ../../mod/settings.php:459
+#: ../../mod/settings.php:510 ../../view/theme/diabook-red/theme.php:313
+#: ../../view/theme/diabook-blue/theme.php:312
+#: ../../view/theme/diabook/theme.php:322
+#: ../../view/theme/diabook-aerith/theme.php:312
 msgid "Export personal data"
 msgstr ""
 
-#: ../../mod/settings.php:477 ../../mod/settings.php:504
-#: ../../mod/settings.php:540
+#: ../../mod/settings.php:528 ../../mod/settings.php:555
+#: ../../mod/settings.php:591
 msgid "Add application"
 msgstr ""
 
-#: ../../mod/settings.php:481 ../../mod/settings.php:508
-#: ../../addon/statusnet/statusnet.php:526
+#: ../../mod/settings.php:532 ../../mod/settings.php:559
+#: ../../addon/statusnet/statusnet.php:541
 msgid "Consumer Key"
 msgstr ""
 
-#: ../../mod/settings.php:482 ../../mod/settings.php:509
-#: ../../addon/statusnet/statusnet.php:525
+#: ../../mod/settings.php:533 ../../mod/settings.php:560
+#: ../../addon/statusnet/statusnet.php:540
 msgid "Consumer Secret"
 msgstr ""
 
-#: ../../mod/settings.php:483 ../../mod/settings.php:510
+#: ../../mod/settings.php:534 ../../mod/settings.php:561
 msgid "Redirect"
 msgstr ""
 
-#: ../../mod/settings.php:484 ../../mod/settings.php:511
+#: ../../mod/settings.php:535 ../../mod/settings.php:562
 msgid "Icon url"
 msgstr ""
 
-#: ../../mod/settings.php:495
+#: ../../mod/settings.php:546
 msgid "You can't edit this application."
 msgstr ""
 
-#: ../../mod/settings.php:539
+#: ../../mod/settings.php:590
 msgid "Connected Apps"
 msgstr ""
 
-#: ../../mod/settings.php:543
+#: ../../mod/settings.php:594
 msgid "Client key starts with"
 msgstr ""
 
-#: ../../mod/settings.php:544
+#: ../../mod/settings.php:595
 msgid "No name"
 msgstr ""
 
-#: ../../mod/settings.php:545
+#: ../../mod/settings.php:596
 msgid "Remove authorization"
 msgstr ""
 
-#: ../../mod/settings.php:557
+#: ../../mod/settings.php:608
 msgid "No Plugin settings configured"
 msgstr ""
 
-#: ../../mod/settings.php:565 ../../addon/widgets/widgets.php:123
+#: ../../mod/settings.php:616 ../../addon/widgets/widgets.php:123
 msgid "Plugin Settings"
 msgstr ""
 
-#: ../../mod/settings.php:578 ../../mod/settings.php:579
+#: ../../mod/settings.php:629 ../../mod/settings.php:630
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr ""
 
-#: ../../mod/settings.php:578 ../../mod/settings.php:579
+#: ../../mod/settings.php:629 ../../mod/settings.php:630
 msgid "enabled"
 msgstr ""
 
-#: ../../mod/settings.php:578 ../../mod/settings.php:579
+#: ../../mod/settings.php:629 ../../mod/settings.php:630
 msgid "disabled"
 msgstr ""
 
-#: ../../mod/settings.php:579
+#: ../../mod/settings.php:630
 msgid "StatusNet"
 msgstr ""
 
-#: ../../mod/settings.php:609
+#: ../../mod/settings.php:660
 msgid "Connector Settings"
 msgstr ""
 
-#: ../../mod/settings.php:615
+#: ../../mod/settings.php:666
 msgid "Email/Mailbox Setup"
 msgstr ""
 
-#: ../../mod/settings.php:616
+#: ../../mod/settings.php:667
 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:617
+#: ../../mod/settings.php:668
 msgid "Last successful email check:"
 msgstr ""
 
-#: ../../mod/settings.php:618
+#: ../../mod/settings.php:669
 msgid "Email access is disabled on this site."
 msgstr ""
 
-#: ../../mod/settings.php:619
+#: ../../mod/settings.php:670
 msgid "IMAP server name:"
 msgstr ""
 
-#: ../../mod/settings.php:620
+#: ../../mod/settings.php:671
 msgid "IMAP port:"
 msgstr ""
 
-#: ../../mod/settings.php:621
+#: ../../mod/settings.php:672
 msgid "Security:"
 msgstr ""
 
-#: ../../mod/settings.php:621 ../../mod/settings.php:626
+#: ../../mod/settings.php:672 ../../mod/settings.php:677
 msgid "None"
 msgstr ""
 
-#: ../../mod/settings.php:622
+#: ../../mod/settings.php:673
 msgid "Email login name:"
 msgstr ""
 
-#: ../../mod/settings.php:623
+#: ../../mod/settings.php:674
 msgid "Email password:"
 msgstr ""
 
-#: ../../mod/settings.php:624
+#: ../../mod/settings.php:675
 msgid "Reply-to address:"
 msgstr ""
 
-#: ../../mod/settings.php:625
+#: ../../mod/settings.php:676
 msgid "Send public posts to all email contacts:"
 msgstr ""
 
-#: ../../mod/settings.php:626
+#: ../../mod/settings.php:677
 msgid "Action after import:"
 msgstr ""
 
-#: ../../mod/settings.php:626
+#: ../../mod/settings.php:677
 msgid "Mark as seen"
 msgstr ""
 
-#: ../../mod/settings.php:626
+#: ../../mod/settings.php:677
 msgid "Move to folder"
 msgstr ""
 
-#: ../../mod/settings.php:627
+#: ../../mod/settings.php:678
 msgid "Move to folder:"
 msgstr ""
 
-#: ../../mod/settings.php:688 ../../mod/admin.php:142 ../../mod/admin.php:465
+#: ../../mod/settings.php:739
+msgid "Display Settings"
+msgstr ""
+
+#: ../../mod/settings.php:745
+msgid "Display Theme:"
+msgstr ""
+
+#: ../../mod/settings.php:746
+msgid "Update browser every xx seconds"
+msgstr ""
+
+#: ../../mod/settings.php:746
+msgid "Minimum of 10 seconds, no maximum"
+msgstr ""
+
+#: ../../mod/settings.php:747
+msgid "Number of items to display on the network page:"
+msgstr ""
+
+#: ../../mod/settings.php:747
+msgid "Maximum of 100 items"
+msgstr ""
+
+#: ../../mod/settings.php:748
+msgid "Don't show emoticons"
+msgstr ""
+
+#: ../../mod/settings.php:808 ../../mod/admin.php:142 ../../mod/admin.php:506
 msgid "Normal Account"
 msgstr ""
 
-#: ../../mod/settings.php:689
+#: ../../mod/settings.php:809
 msgid "This account is a normal personal profile"
 msgstr ""
 
-#: ../../mod/settings.php:692 ../../mod/admin.php:143 ../../mod/admin.php:466
+#: ../../mod/settings.php:812 ../../mod/admin.php:143 ../../mod/admin.php:507
 msgid "Soapbox Account"
 msgstr ""
 
-#: ../../mod/settings.php:693
+#: ../../mod/settings.php:813
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr ""
 
-#: ../../mod/settings.php:696 ../../mod/admin.php:144 ../../mod/admin.php:467
+#: ../../mod/settings.php:816 ../../mod/admin.php:144 ../../mod/admin.php:508
 msgid "Community/Celebrity Account"
 msgstr ""
 
-#: ../../mod/settings.php:697
+#: ../../mod/settings.php:817
 msgid "Automatically approve all connection/friend requests as read-write fans"
 msgstr ""
 
-#: ../../mod/settings.php:700 ../../mod/admin.php:145 ../../mod/admin.php:468
+#: ../../mod/settings.php:820 ../../mod/admin.php:145 ../../mod/admin.php:509
 msgid "Automatic Friend Account"
 msgstr ""
 
-#: ../../mod/settings.php:701
+#: ../../mod/settings.php:821
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr ""
 
-#: ../../mod/settings.php:711
+#: ../../mod/settings.php:831
 msgid "OpenID:"
 msgstr ""
 
-#: ../../mod/settings.php:711
+#: ../../mod/settings.php:831
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: ../../mod/settings.php:721
+#: ../../mod/settings.php:841
 msgid "Publish your default profile in your local site directory?"
 msgstr ""
 
-#: ../../mod/settings.php:727
+#: ../../mod/settings.php:847
 msgid "Publish your default profile in the global social directory?"
 msgstr ""
 
-#: ../../mod/settings.php:735
+#: ../../mod/settings.php:855
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr ""
 
-#: ../../mod/settings.php:739
+#: ../../mod/settings.php:859
 msgid "Hide your profile details from unknown viewers?"
 msgstr ""
 
-#: ../../mod/settings.php:744
+#: ../../mod/settings.php:864
 msgid "Allow friends to post to your profile page?"
 msgstr ""
 
-#: ../../mod/settings.php:750
+#: ../../mod/settings.php:870
 msgid "Allow friends to tag your posts?"
 msgstr ""
 
-#: ../../mod/settings.php:756
+#: ../../mod/settings.php:876
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../mod/settings.php:765
+#: ../../mod/settings.php:882
+msgid "Permit unknown people to send you private mail?"
+msgstr ""
+
+#: ../../mod/settings.php:891
 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: ../../mod/settings.php:797 ../../mod/profile_photo.php:211
+#: ../../mod/settings.php:897 ../../mod/profile_photo.php:211
 msgid "or"
 msgstr ""
 
-#: ../../mod/settings.php:802
+#: ../../mod/settings.php:902
 msgid "Your Identity Address is"
 msgstr ""
 
-#: ../../mod/settings.php:813
+#: ../../mod/settings.php:913
 msgid "Automatically expire posts after this many days:"
 msgstr ""
 
-#: ../../mod/settings.php:813
+#: ../../mod/settings.php:913
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr ""
 
-#: ../../mod/settings.php:814
+#: ../../mod/settings.php:914
 msgid "Advanced expiration settings"
 msgstr ""
 
-#: ../../mod/settings.php:815
+#: ../../mod/settings.php:915
 msgid "Advanced Expiration"
 msgstr ""
 
-#: ../../mod/settings.php:816
+#: ../../mod/settings.php:916
 msgid "Expire posts:"
 msgstr ""
 
-#: ../../mod/settings.php:817
+#: ../../mod/settings.php:917
 msgid "Expire personal notes:"
 msgstr ""
 
-#: ../../mod/settings.php:818
+#: ../../mod/settings.php:918
 msgid "Expire starred posts:"
 msgstr ""
 
-#: ../../mod/settings.php:819
+#: ../../mod/settings.php:919
 msgid "Expire photos:"
 msgstr ""
 
-#: ../../mod/settings.php:824
+#: ../../mod/settings.php:924
 msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/settings.php:833
+#: ../../mod/settings.php:933
 msgid "Password Settings"
 msgstr ""
 
-#: ../../mod/settings.php:834
+#: ../../mod/settings.php:934
 msgid "New Password:"
 msgstr ""
 
-#: ../../mod/settings.php:835
+#: ../../mod/settings.php:935
 msgid "Confirm:"
 msgstr ""
 
-#: ../../mod/settings.php:835
+#: ../../mod/settings.php:935
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/settings.php:839
+#: ../../mod/settings.php:939
 msgid "Basic Settings"
 msgstr ""
 
-#: ../../mod/settings.php:840 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:940 ../../include/profile_advanced.php:15
 msgid "Full Name:"
 msgstr ""
 
-#: ../../mod/settings.php:841
+#: ../../mod/settings.php:941
 msgid "Email Address:"
 msgstr ""
 
-#: ../../mod/settings.php:842
+#: ../../mod/settings.php:942
 msgid "Your Timezone:"
 msgstr ""
 
-#: ../../mod/settings.php:843
+#: ../../mod/settings.php:943
 msgid "Default Post Location:"
 msgstr ""
 
-#: ../../mod/settings.php:844
+#: ../../mod/settings.php:944
 msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../mod/settings.php:845
-msgid "Display Theme:"
-msgstr ""
-
-#: ../../mod/settings.php:846
-msgid "Update browser every xx seconds"
-msgstr ""
-
-#: ../../mod/settings.php:846
-msgid "Minimum of 10 seconds, no maximum"
-msgstr ""
-
-#: ../../mod/settings.php:847
-msgid "Number of items to display on the network page:"
-msgstr ""
-
-#: ../../mod/settings.php:847
-msgid "Maximum of 100 items"
-msgstr ""
-
-#: ../../mod/settings.php:848
-msgid "Don't show emoticons"
-msgstr ""
-
-#: ../../mod/settings.php:850
+#: ../../mod/settings.php:947
 msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../mod/settings.php:852
+#: ../../mod/settings.php:949
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/settings.php:852
+#: ../../mod/settings.php:949 ../../mod/settings.php:964
 msgid "(to prevent spam abuse)"
 msgstr ""
 
-#: ../../mod/settings.php:853
+#: ../../mod/settings.php:950
 msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:854
+#: ../../mod/settings.php:951
 msgid "(click to open/close)"
 msgstr ""
 
-#: ../../mod/settings.php:869
+#: ../../mod/settings.php:964
+msgid "Maximum private messages per day from unknown people:"
+msgstr ""
+
+#: ../../mod/settings.php:967
 msgid "Notification Settings"
 msgstr ""
 
-#: ../../mod/settings.php:870
+#: ../../mod/settings.php:968
 msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../mod/settings.php:871
+#: ../../mod/settings.php:969
 msgid "You receive an introduction"
 msgstr ""
 
-#: ../../mod/settings.php:872
+#: ../../mod/settings.php:970
 msgid "Your introductions are confirmed"
 msgstr ""
 
-#: ../../mod/settings.php:873
+#: ../../mod/settings.php:971
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../mod/settings.php:874
+#: ../../mod/settings.php:972
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../mod/settings.php:875
+#: ../../mod/settings.php:973
 msgid "You receive a private message"
 msgstr ""
 
-#: ../../mod/settings.php:876
+#: ../../mod/settings.php:974
 msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../mod/settings.php:877
+#: ../../mod/settings.php:975
 msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../mod/settings.php:880
+#: ../../mod/settings.php:978
 msgid "Advanced Page Settings"
 msgstr ""
 
@@ -2170,7 +2222,7 @@ msgstr ""
 msgid "Shared Links"
 msgstr ""
 
-#: ../../mod/network.php:270
+#: ../../mod/network.php:274
 #, php-format
 msgid "Warning: This group contains %s member from an insecure network."
 msgid_plural ""
@@ -2178,42 +2230,103 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/network.php:273
+#: ../../mod/network.php:277
 msgid "Private messages to this group are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/network.php:318
+#: ../../mod/network.php:322
 msgid "No such group"
 msgstr ""
 
-#: ../../mod/network.php:329
+#: ../../mod/network.php:333
 msgid "Group is empty"
 msgstr ""
 
-#: ../../mod/network.php:333
+#: ../../mod/network.php:337
 msgid "Group: "
 msgstr ""
 
-#: ../../mod/network.php:343
+#: ../../mod/network.php:347
 msgid "Contact: "
 msgstr ""
 
-#: ../../mod/network.php:345
+#: ../../mod/network.php:349
 msgid "Private messages to this person are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/network.php:350
+#: ../../mod/network.php:354
 msgid "Invalid contact."
 msgstr ""
 
-#: ../../mod/notes.php:44 ../../boot.php:1404
+#: ../../mod/notes.php:44 ../../boot.php:1426
 msgid "Personal Notes"
 msgstr ""
 
-#: ../../mod/notes.php:63 ../../mod/filer.php:29 ../../include/text.php:647
+#: ../../mod/notes.php:63 ../../mod/filer.php:30
+#: ../../addon/facebook/facebook.php:673 ../../include/text.php:652
 msgid "Save"
 msgstr ""
 
+#: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112
+#, php-format
+msgid "Number of daily wall messages for %s exceeded. Message failed."
+msgstr ""
+
+#: ../../mod/wallmessage.php:56 ../../mod/message.php:60
+msgid "No recipient selected."
+msgstr ""
+
+#: ../../mod/wallmessage.php:59
+msgid "Unable to check your home location."
+msgstr ""
+
+#: ../../mod/wallmessage.php:62 ../../mod/message.php:67
+msgid "Message could not be sent."
+msgstr ""
+
+#: ../../mod/wallmessage.php:65 ../../mod/message.php:70
+msgid "Message collection failure."
+msgstr ""
+
+#: ../../mod/wallmessage.php:68 ../../mod/message.php:73
+msgid "Message sent."
+msgstr ""
+
+#: ../../mod/wallmessage.php:86 ../../mod/wallmessage.php:95
+msgid "No recipient."
+msgstr ""
+
+#: ../../mod/wallmessage.php:124 ../../mod/message.php:170
+#: ../../include/conversation.php:914
+msgid "Please enter a link URL:"
+msgstr ""
+
+#: ../../mod/wallmessage.php:131 ../../mod/message.php:178
+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:179
+#: ../../mod/message.php:348
+msgid "To:"
+msgstr ""
+
+#: ../../mod/wallmessage.php:134 ../../mod/message.php:180
+#: ../../mod/message.php:349
+msgid "Subject:"
+msgstr ""
+
+#: ../../mod/wallmessage.php:140 ../../mod/message.php:184
+#: ../../mod/message.php:352 ../../mod/invite.php:113
+msgid "Your message:"
+msgstr ""
+
 #: ../../mod/newmember.php:6
 msgid "Welcome to Friendica"
 msgstr ""
@@ -2232,12 +2345,19 @@ msgstr ""
 
 #: ../../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 ""
 
-#: ../../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 "
@@ -2245,61 +2365,61 @@ msgid ""
 "potential friends know exactly how to find you."
 msgstr ""
 
-#: ../../mod/newmember.php:20
+#: ../../mod/newmember.php:22
 msgid ""
 "Upload a profile photo if you have not done so already. Studies have shown "
 "that people with real photos of themselves are ten times more likely to make "
 "friends than people who do not."
 msgstr ""
 
-#: ../../mod/newmember.php:23
+#: ../../mod/newmember.php:25
 msgid ""
 "Authorise the Facebook Connector if you currently have a Facebook account "
 "and we will (optionally) import all your Facebook friends and conversations."
 msgstr ""
 
-#: ../../mod/newmember.php: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 ""
 
-#: ../../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 ""
 
-#: ../../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 ""
 
-#: ../../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 ""
 
-#: ../../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 ""
 
-#: ../../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 ""
 
-#: ../../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 "
@@ -2308,14 +2428,14 @@ msgid ""
 "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 ""
 
-#: ../../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."
@@ -2345,7 +2465,7 @@ msgstr ""
 msgid "Group name changed."
 msgstr ""
 
-#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:290
+#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:293
 msgid "Permission denied"
 msgstr ""
 
@@ -2385,10 +2505,12 @@ msgstr ""
 msgid "Profile Visibility Editor"
 msgstr ""
 
-#: ../../mod/profperm.php:103 ../../view/theme/diabook-blue/theme.php:216
-#: ../../view/theme/diabook/theme.php:222 ../../include/profile_advanced.php:7
-#: ../../include/profile_advanced.php:76 ../../include/nav.php:50
-#: ../../boot.php:1386
+#: ../../mod/profperm.php:103 ../../view/theme/diabook-red/theme.php:237
+#: ../../view/theme/diabook-blue/theme.php:237
+#: ../../view/theme/diabook/theme.php:245
+#: ../../view/theme/diabook-aerith/theme.php:237
+#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:76
+#: ../../include/nav.php:50 ../../boot.php:1408
 msgid "Profile"
 msgstr ""
 
@@ -2404,163 +2526,163 @@ msgstr ""
 msgid "No contacts."
 msgstr ""
 
-#: ../../mod/viewcontacts.php:76 ../../include/text.php:584
+#: ../../mod/viewcontacts.php:76 ../../include/text.php:589
 msgid "View Contacts"
 msgstr ""
 
-#: ../../mod/register.php:62
+#: ../../mod/register.php:64
 msgid "An invitation is required."
 msgstr ""
 
-#: ../../mod/register.php:67
+#: ../../mod/register.php:69
 msgid "Invitation could not be verified."
 msgstr ""
 
-#: ../../mod/register.php:75
+#: ../../mod/register.php:77
 msgid "Invalid OpenID url"
 msgstr ""
 
-#: ../../mod/register.php:90
+#: ../../mod/register.php:92
 msgid "Please enter the required information."
 msgstr ""
 
-#: ../../mod/register.php:104
+#: ../../mod/register.php:106
 msgid "Please use a shorter name."
 msgstr ""
 
-#: ../../mod/register.php:106
+#: ../../mod/register.php:108
 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 ""
 
-#: ../../mod/register.php:126
+#: ../../mod/register.php:128
 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 ""
 
-#: ../../mod/register.php:139
+#: ../../mod/register.php:141
 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 ""
 
-#: ../../mod/register.php:151 ../../mod/register.php:262
+#: ../../mod/register.php:153 ../../mod/register.php:264
 msgid "Nickname is already registered. Please choose another."
 msgstr ""
 
-#: ../../mod/register.php:161
+#: ../../mod/register.php:163
 msgid ""
 "Nickname was once registered here and may not be re-used. Please choose "
 "another."
 msgstr ""
 
-#: ../../mod/register.php:180
+#: ../../mod/register.php:182
 msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr ""
 
-#: ../../mod/register.php:248
+#: ../../mod/register.php:250
 msgid "An error occurred during registration. Please try again."
 msgstr ""
 
-#: ../../mod/register.php:284
+#: ../../mod/register.php:286
 msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
 
-#: ../../mod/register.php:388 ../../mod/regmod.php:52
+#: ../../mod/register.php:390 ../../mod/regmod.php:52
 #, php-format
 msgid "Registration details for %s"
 msgstr ""
 
-#: ../../mod/register.php:396
+#: ../../mod/register.php:398
 msgid ""
 "Registration successful. Please check your email for further instructions."
 msgstr ""
 
-#: ../../mod/register.php:400
+#: ../../mod/register.php:402
 msgid "Failed to send email message. Here is the message that failed."
 msgstr ""
 
-#: ../../mod/register.php:405
+#: ../../mod/register.php:407
 msgid "Your registration can not be processed."
 msgstr ""
 
-#: ../../mod/register.php:442
+#: ../../mod/register.php:444
 #, php-format
 msgid "Registration request at %s"
 msgstr ""
 
-#: ../../mod/register.php:451
+#: ../../mod/register.php:453
 msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: ../../mod/register.php:489
+#: ../../mod/register.php:491
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr ""
 
-#: ../../mod/register.php:515
+#: ../../mod/register.php:517
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
 msgstr ""
 
-#: ../../mod/register.php:516
+#: ../../mod/register.php:518
 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:517
+#: ../../mod/register.php:519
 msgid "Your OpenID (optional): "
 msgstr ""
 
-#: ../../mod/register.php:531
+#: ../../mod/register.php:533
 msgid "Include your profile in member directory?"
 msgstr ""
 
-#: ../../mod/register.php:546
+#: ../../mod/register.php:553
 msgid "Membership on this site is by invitation only."
 msgstr ""
 
-#: ../../mod/register.php:547
+#: ../../mod/register.php:554
 msgid "Your invitation ID: "
 msgstr ""
 
-#: ../../mod/register.php:550 ../../mod/admin.php:317
+#: ../../mod/register.php:557 ../../mod/admin.php:358
 msgid "Registration"
 msgstr ""
 
-#: ../../mod/register.php:558
+#: ../../mod/register.php:565
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr ""
 
-#: ../../mod/register.php:559
+#: ../../mod/register.php:566
 msgid "Your Email Address: "
 msgstr ""
 
-#: ../../mod/register.php:560
+#: ../../mod/register.php:567
 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:561
+#: ../../mod/register.php:568
 msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/register.php:564 ../../include/nav.php:81 ../../boot.php:739
+#: ../../mod/register.php:571 ../../include/nav.php:81 ../../boot.php:745
 msgid "Register"
 msgstr ""
 
@@ -2569,23 +2691,29 @@ msgid "People Search"
 msgstr ""
 
 #: ../../mod/like.php:127 ../../mod/tagger.php:70
-#: ../../addon/facebook/facebook.php:1327
+#: ../../addon/facebook/facebook.php:1440
 #: ../../addon/communityhome/communityhome.php:158
 #: ../../addon/communityhome/communityhome.php:167
+#: ../../view/theme/diabook-red/theme.php:77
+#: ../../view/theme/diabook-red/theme.php:86
 #: ../../view/theme/diabook-blue/theme.php:77
 #: ../../view/theme/diabook-blue/theme.php:86
-#: ../../view/theme/diabook/theme.php:80 ../../view/theme/diabook/theme.php:89
-#: ../../include/diaspora.php:1642 ../../include/conversation.php:48
+#: ../../view/theme/diabook/theme.php:81 ../../view/theme/diabook/theme.php:90
+#: ../../view/theme/diabook-aerith/theme.php:77
+#: ../../view/theme/diabook-aerith/theme.php:86
+#: ../../include/diaspora.php:1654 ../../include/conversation.php:48
 #: ../../include/conversation.php:57 ../../include/conversation.php:121
 #: ../../include/conversation.php:130
 msgid "status"
 msgstr ""
 
-#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1331
+#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1444
 #: ../../addon/communityhome/communityhome.php:172
+#: ../../view/theme/diabook-red/theme.php:91
 #: ../../view/theme/diabook-blue/theme.php:91
-#: ../../view/theme/diabook/theme.php:94 ../../include/diaspora.php:1658
-#: ../../include/conversation.php:65
+#: ../../view/theme/diabook/theme.php:95
+#: ../../view/theme/diabook-aerith/theme.php:91
+#: ../../include/diaspora.php:1670 ../../include/conversation.php:65
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr ""
@@ -2596,8 +2724,8 @@ 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:525 ../../mod/admin.php:704 ../../mod/display.php:37
-#: ../../mod/display.php:142 ../../include/items.php:3022
+#: ../../mod/admin.php:566 ../../mod/admin.php:745 ../../mod/display.php:37
+#: ../../mod/display.php:142 ../../include/items.php:3030
 msgid "Item not found."
 msgstr ""
 
@@ -2622,38 +2750,38 @@ msgstr ""
 msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../mod/item.php:251
+#: ../../mod/item.php:249
 msgid "Empty post discarded."
 msgstr ""
 
-#: ../../mod/item.php:362 ../../mod/wall_upload.php:81
+#: ../../mod/item.php:373 ../../mod/wall_upload.php:81
 #: ../../mod/wall_upload.php:90 ../../mod/wall_upload.php:97
-#: ../../include/message.php:143
+#: ../../include/message.php:144
 msgid "Wall Photos"
 msgstr ""
 
-#: ../../mod/item.php:745
+#: ../../mod/item.php:763
 msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/item.php:770
+#: ../../mod/item.php:788
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social network."
 msgstr ""
 
-#: ../../mod/item.php:772
+#: ../../mod/item.php:790
 #, php-format
 msgid "You may visit them online at %s"
 msgstr ""
 
-#: ../../mod/item.php:773
+#: ../../mod/item.php:791
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr ""
 
-#: ../../mod/item.php:775
+#: ../../mod/item.php:793
 #, php-format
 msgid "%s posted an update."
 msgstr ""
@@ -2741,26 +2869,10 @@ msgstr ""
 msgid "New Message"
 msgstr ""
 
-#: ../../mod/message.php:60
-msgid "No recipient selected."
-msgstr ""
-
 #: ../../mod/message.php:64
 msgid "Unable to locate contact information."
 msgstr ""
 
-#: ../../mod/message.php:67
-msgid "Message could not be sent."
-msgstr ""
-
-#: ../../mod/message.php:70
-msgid "Message collection failure."
-msgstr ""
-
-#: ../../mod/message.php:73
-msgid "Message sent."
-msgstr ""
-
 #: ../../mod/message.php:118
 msgid "Message deleted."
 msgstr ""
@@ -2769,29 +2881,13 @@ msgstr ""
 msgid "Conversation removed."
 msgstr ""
 
-#: ../../mod/message.php:170 ../../include/conversation.php:914
-msgid "Please enter a link URL:"
-msgstr ""
-
-#: ../../mod/message.php:178
-msgid "Send Private Message"
-msgstr ""
-
-#: ../../mod/message.php:179 ../../mod/message.php:342
-msgid "To:"
-msgstr ""
-
-#: ../../mod/message.php:180 ../../mod/message.php:343
-msgid "Subject:"
-msgstr ""
-
-#: ../../mod/message.php:184 ../../mod/message.php:346
-#: ../../mod/invite.php:113
-msgid "Your message:"
+#: ../../mod/message.php:220
+msgid "No messages."
 msgstr ""
 
-#: ../../mod/message.php:223
-msgid "No messages."
+#: ../../mod/message.php:227
+#, php-format
+msgid "Unknown sender - %s"
 msgstr ""
 
 #: ../../mod/message.php:230
@@ -2799,35 +2895,41 @@ msgstr ""
 msgid "You and %s"
 msgstr ""
 
-#: ../../mod/message.php:232
+#: ../../mod/message.php:233
 #, php-format
 msgid "%s and You"
 msgstr ""
 
-#: ../../mod/message.php:242 ../../mod/message.php:336
+#: ../../mod/message.php:243 ../../mod/message.php:341
 msgid "Delete conversation"
 msgstr ""
 
-#: ../../mod/message.php:245
+#: ../../mod/message.php:246
 msgid "D, d M Y - g:i A"
 msgstr ""
 
-#: ../../mod/message.php:247
+#: ../../mod/message.php:248
 #, php-format
 msgid "%d message"
 msgid_plural "%d messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/message.php:282
+#: ../../mod/message.php:283
 msgid "Message not available."
 msgstr ""
 
-#: ../../mod/message.php:320
+#: ../../mod/message.php:325
 msgid "Delete message"
 msgstr ""
 
-#: ../../mod/message.php:341
+#: ../../mod/message.php:343
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr ""
+
+#: ../../mod/message.php:347
 msgid "Send Reply"
 msgstr ""
 
@@ -2840,23 +2942,23 @@ msgstr ""
 msgid "No friends to display."
 msgstr ""
 
-#: ../../mod/admin.php:71 ../../mod/admin.php:315
+#: ../../mod/admin.php:71 ../../mod/admin.php:356
 msgid "Site"
 msgstr ""
 
-#: ../../mod/admin.php:72 ../../mod/admin.php:483 ../../mod/admin.php:495
+#: ../../mod/admin.php:72 ../../mod/admin.php:524 ../../mod/admin.php:536
 msgid "Users"
 msgstr ""
 
-#: ../../mod/admin.php:73 ../../mod/admin.php:572 ../../mod/admin.php:612
+#: ../../mod/admin.php:73 ../../mod/admin.php:613 ../../mod/admin.php:653
 msgid "Plugins"
 msgstr ""
 
-#: ../../mod/admin.php:74 ../../mod/admin.php:750 ../../mod/admin.php:784
+#: ../../mod/admin.php:74 ../../mod/admin.php:791 ../../mod/admin.php:825
 msgid "Themes"
 msgstr ""
 
-#: ../../mod/admin.php:89 ../../mod/admin.php:864
+#: ../../mod/admin.php:89 ../../mod/admin.php:905
 msgid "Logs"
 msgstr ""
 
@@ -2864,9 +2966,9 @@ msgstr ""
 msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: ../../mod/admin.php:157 ../../mod/admin.php:314 ../../mod/admin.php:482
-#: ../../mod/admin.php:571 ../../mod/admin.php:611 ../../mod/admin.php:749
-#: ../../mod/admin.php:783 ../../mod/admin.php:863
+#: ../../mod/admin.php:157 ../../mod/admin.php:355 ../../mod/admin.php:523
+#: ../../mod/admin.php:612 ../../mod/admin.php:652 ../../mod/admin.php:790
+#: ../../mod/admin.php:824 ../../mod/admin.php:904
 msgid "Administration"
 msgstr ""
 
@@ -2890,449 +2992,449 @@ msgstr ""
 msgid "Active plugins"
 msgstr ""
 
-#: ../../mod/admin.php:257
+#: ../../mod/admin.php:298
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:301
+#: ../../mod/admin.php:342
 msgid "Closed"
 msgstr ""
 
-#: ../../mod/admin.php:302
+#: ../../mod/admin.php:343
 msgid "Requires approval"
 msgstr ""
 
-#: ../../mod/admin.php:303
+#: ../../mod/admin.php:344
 msgid "Open"
 msgstr ""
 
-#: ../../mod/admin.php:307
+#: ../../mod/admin.php:348
 msgid "No SSL policy, links will track page SSL state"
 msgstr ""
 
-#: ../../mod/admin.php:308
+#: ../../mod/admin.php:349
 msgid "Force all links to use SSL"
 msgstr ""
 
-#: ../../mod/admin.php:309
+#: ../../mod/admin.php:350
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr ""
 
-#: ../../mod/admin.php:318
+#: ../../mod/admin.php:359
 msgid "File upload"
 msgstr ""
 
-#: ../../mod/admin.php:319
+#: ../../mod/admin.php:360
 msgid "Policies"
 msgstr ""
 
-#: ../../mod/admin.php:320
+#: ../../mod/admin.php:361
 msgid "Advanced"
 msgstr ""
 
-#: ../../mod/admin.php:324 ../../addon/statusnet/statusnet.php:523
+#: ../../mod/admin.php:365 ../../addon/statusnet/statusnet.php:538
 msgid "Site name"
 msgstr ""
 
-#: ../../mod/admin.php:325
+#: ../../mod/admin.php:366
 msgid "Banner/Logo"
 msgstr ""
 
-#: ../../mod/admin.php:326
+#: ../../mod/admin.php:367
 msgid "System language"
 msgstr ""
 
-#: ../../mod/admin.php:327
+#: ../../mod/admin.php:368
 msgid "System theme"
 msgstr ""
 
-#: ../../mod/admin.php:327
+#: ../../mod/admin.php:368
 msgid "Default system theme - may be over-ridden by user profiles"
 msgstr ""
 
-#: ../../mod/admin.php:328
+#: ../../mod/admin.php:369
 msgid "SSL link policy"
 msgstr ""
 
-#: ../../mod/admin.php:328
+#: ../../mod/admin.php:369
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr ""
 
-#: ../../mod/admin.php:329
+#: ../../mod/admin.php:370
 msgid "Maximum image size"
 msgstr ""
 
-#: ../../mod/admin.php:329
+#: ../../mod/admin.php:370
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
-#: ../../mod/admin.php:331
+#: ../../mod/admin.php:372
 msgid "Register policy"
 msgstr ""
 
-#: ../../mod/admin.php:332
+#: ../../mod/admin.php:373
 msgid "Register text"
 msgstr ""
 
-#: ../../mod/admin.php:332
+#: ../../mod/admin.php:373
 msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: ../../mod/admin.php:333
+#: ../../mod/admin.php:374
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: ../../mod/admin.php:333
+#: ../../mod/admin.php:374
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: ../../mod/admin.php:334
+#: ../../mod/admin.php:375
 msgid "Allowed friend domains"
 msgstr ""
 
-#: ../../mod/admin.php:334
+#: ../../mod/admin.php:375
 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:335
+#: ../../mod/admin.php:376
 msgid "Allowed email domains"
 msgstr ""
 
-#: ../../mod/admin.php:335
+#: ../../mod/admin.php:376
 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:336
+#: ../../mod/admin.php:377
 msgid "Block public"
 msgstr ""
 
-#: ../../mod/admin.php:336
+#: ../../mod/admin.php:377
 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:337
+#: ../../mod/admin.php:378
 msgid "Force publish"
 msgstr ""
 
-#: ../../mod/admin.php:337
+#: ../../mod/admin.php:378
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: ../../mod/admin.php:338
+#: ../../mod/admin.php:379
 msgid "Global directory update URL"
 msgstr ""
 
-#: ../../mod/admin.php:338
+#: ../../mod/admin.php:379
 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:340
+#: ../../mod/admin.php:381
 msgid "Block multiple registrations"
 msgstr ""
 
-#: ../../mod/admin.php:340
+#: ../../mod/admin.php:381
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr ""
 
-#: ../../mod/admin.php:341
+#: ../../mod/admin.php:382
 msgid "OpenID support"
 msgstr ""
 
-#: ../../mod/admin.php:341
+#: ../../mod/admin.php:382
 msgid "OpenID support for registration and logins."
 msgstr ""
 
-#: ../../mod/admin.php:342
+#: ../../mod/admin.php:383
 msgid "Gravatar support"
 msgstr ""
 
-#: ../../mod/admin.php:342
+#: ../../mod/admin.php:383
 msgid "Search new user's photo on Gravatar."
 msgstr ""
 
-#: ../../mod/admin.php:343
+#: ../../mod/admin.php:384
 msgid "Fullname check"
 msgstr ""
 
-#: ../../mod/admin.php:343
+#: ../../mod/admin.php:384
 msgid ""
 "Force users to register with a space between firstname and lastname in Full "
 "name, as an antispam measure"
 msgstr ""
 
-#: ../../mod/admin.php:344
+#: ../../mod/admin.php:385
 msgid "UTF-8 Regular expressions"
 msgstr ""
 
-#: ../../mod/admin.php:344
+#: ../../mod/admin.php:385
 msgid "Use PHP UTF8 regular expressions"
 msgstr ""
 
-#: ../../mod/admin.php:345
+#: ../../mod/admin.php:386
 msgid "Show Community Page"
 msgstr ""
 
-#: ../../mod/admin.php:345
+#: ../../mod/admin.php:386
 msgid ""
 "Display a Community page showing all recent public postings on this site."
 msgstr ""
 
-#: ../../mod/admin.php:346
+#: ../../mod/admin.php:387
 msgid "Enable OStatus support"
 msgstr ""
 
-#: ../../mod/admin.php:346
+#: ../../mod/admin.php:387
 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:347
+#: ../../mod/admin.php:388
 msgid "Enable Diaspora support"
 msgstr ""
 
-#: ../../mod/admin.php:347
+#: ../../mod/admin.php:388
 msgid "Provide built-in Diaspora network compatibility."
 msgstr ""
 
-#: ../../mod/admin.php:348
+#: ../../mod/admin.php:389
 msgid "Only allow Friendica contacts"
 msgstr ""
 
-#: ../../mod/admin.php:348
+#: ../../mod/admin.php:389
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr ""
 
-#: ../../mod/admin.php:349
+#: ../../mod/admin.php:390
 msgid "Verify SSL"
 msgstr ""
 
-#: ../../mod/admin.php:349
+#: ../../mod/admin.php:390
 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:350
+#: ../../mod/admin.php:391
 msgid "Proxy user"
 msgstr ""
 
-#: ../../mod/admin.php:351
+#: ../../mod/admin.php:392
 msgid "Proxy URL"
 msgstr ""
 
-#: ../../mod/admin.php:352
+#: ../../mod/admin.php:393
 msgid "Network timeout"
 msgstr ""
 
-#: ../../mod/admin.php:352
+#: ../../mod/admin.php:393
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: ../../mod/admin.php:373
+#: ../../mod/admin.php:414
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:380
+#: ../../mod/admin.php:421
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:414
+#: ../../mod/admin.php:455
 #, php-format
 msgid "User '%s' deleted"
 msgstr ""
 
-#: ../../mod/admin.php:421
+#: ../../mod/admin.php:462
 #, php-format
 msgid "User '%s' unblocked"
 msgstr ""
 
-#: ../../mod/admin.php:421
+#: ../../mod/admin.php:462
 #, php-format
 msgid "User '%s' blocked"
 msgstr ""
 
-#: ../../mod/admin.php:485
+#: ../../mod/admin.php:526
 msgid "select all"
 msgstr ""
 
-#: ../../mod/admin.php:486
+#: ../../mod/admin.php:527
 msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../mod/admin.php:487
+#: ../../mod/admin.php:528
 msgid "Request date"
 msgstr ""
 
-#: ../../mod/admin.php:487 ../../mod/admin.php:496
+#: ../../mod/admin.php:528 ../../mod/admin.php:537
 #: ../../include/contact_selectors.php:79
 msgid "Email"
 msgstr ""
 
-#: ../../mod/admin.php:488
+#: ../../mod/admin.php:529
 msgid "No registrations."
 msgstr ""
 
-#: ../../mod/admin.php:490
+#: ../../mod/admin.php:531
 msgid "Deny"
 msgstr ""
 
-#: ../../mod/admin.php:496
+#: ../../mod/admin.php:537
 msgid "Register date"
 msgstr ""
 
-#: ../../mod/admin.php:496
+#: ../../mod/admin.php:537
 msgid "Last login"
 msgstr ""
 
-#: ../../mod/admin.php:496
+#: ../../mod/admin.php:537
 msgid "Last item"
 msgstr ""
 
-#: ../../mod/admin.php:496
+#: ../../mod/admin.php:537
 msgid "Account"
 msgstr ""
 
-#: ../../mod/admin.php:498
+#: ../../mod/admin.php:539
 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:499
+#: ../../mod/admin.php:540
 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:535
+#: ../../mod/admin.php:576
 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../mod/admin.php:539
+#: ../../mod/admin.php:580
 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../mod/admin.php:549 ../../mod/admin.php:728
+#: ../../mod/admin.php:590 ../../mod/admin.php:769
 msgid "Disable"
 msgstr ""
 
-#: ../../mod/admin.php:551 ../../mod/admin.php:730
+#: ../../mod/admin.php:592 ../../mod/admin.php:771
 msgid "Enable"
 msgstr ""
 
-#: ../../mod/admin.php:573 ../../mod/admin.php:751
+#: ../../mod/admin.php:614 ../../mod/admin.php:792
 msgid "Toggle"
 msgstr ""
 
-#: ../../mod/admin.php:574 ../../mod/admin.php:752 ../../include/nav.php:137
+#: ../../mod/admin.php:615 ../../mod/admin.php:793 ../../include/nav.php:137
 msgid "Settings"
 msgstr ""
 
-#: ../../mod/admin.php:581 ../../mod/admin.php:761
+#: ../../mod/admin.php:622 ../../mod/admin.php:802
 msgid "Author: "
 msgstr ""
 
-#: ../../mod/admin.php:582 ../../mod/admin.php:762
+#: ../../mod/admin.php:623 ../../mod/admin.php:803
 msgid "Maintainer: "
 msgstr ""
 
-#: ../../mod/admin.php:693
+#: ../../mod/admin.php:734
 msgid "No themes found."
 msgstr ""
 
-#: ../../mod/admin.php:743
+#: ../../mod/admin.php:784
 msgid "Screenshot"
 msgstr ""
 
-#: ../../mod/admin.php:789
+#: ../../mod/admin.php:830
 msgid "[Experimental]"
 msgstr ""
 
-#: ../../mod/admin.php:790
+#: ../../mod/admin.php:831
 msgid "[Unsupported]"
 msgstr ""
 
-#: ../../mod/admin.php:813
+#: ../../mod/admin.php:854
 msgid "Log settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:866
+#: ../../mod/admin.php:907
 msgid "Clear"
 msgstr ""
 
-#: ../../mod/admin.php:872
+#: ../../mod/admin.php:913
 msgid "Debugging"
 msgstr ""
 
-#: ../../mod/admin.php:873
+#: ../../mod/admin.php:914
 msgid "Log file"
 msgstr ""
 
-#: ../../mod/admin.php:873
+#: ../../mod/admin.php:914
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr ""
 
-#: ../../mod/admin.php:874
+#: ../../mod/admin.php:915
 msgid "Log level"
 msgstr ""
 
-#: ../../mod/admin.php:915
+#: ../../mod/admin.php:956
 msgid "Close"
 msgstr ""
 
-#: ../../mod/admin.php:921
+#: ../../mod/admin.php:962
 msgid "FTP Host"
 msgstr ""
 
-#: ../../mod/admin.php:922
+#: ../../mod/admin.php:963
 msgid "FTP Path"
 msgstr ""
 
-#: ../../mod/admin.php:923
+#: ../../mod/admin.php:964
 msgid "FTP User"
 msgstr ""
 
-#: ../../mod/admin.php:924
+#: ../../mod/admin.php:965
 msgid "FTP Password"
 msgstr ""
 
-#: ../../mod/profile.php:15 ../../boot.php:895
+#: ../../mod/profile.php:20 ../../boot.php:901
 msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../mod/profile.php:111 ../../mod/display.php:75
+#: ../../mod/profile.php:123 ../../mod/display.php:75
 msgid "Access to this profile has been restricted."
 msgstr ""
 
-#: ../../mod/profile.php:131
+#: ../../mod/profile.php:144
 msgid "Tips for New Members"
 msgstr ""
 
@@ -3391,7 +3493,7 @@ msgid ""
 msgstr ""
 
 #: ../../mod/openid.php:93 ../../include/auth.php:90
-#: ../../include/auth.php:149
+#: ../../include/auth.php:153
 msgid "Login failed."
 msgstr ""
 
@@ -3656,35 +3758,38 @@ msgstr ""
 msgid "Age: "
 msgstr ""
 
-#: ../../mod/profiles.php:476
+#: ../../mod/profiles.php:476 ../../view/theme/diabook-red/theme.php:294
+#: ../../view/theme/diabook-blue/theme.php:293
+#: ../../view/theme/diabook/theme.php:303
+#: ../../view/theme/diabook-aerith/theme.php:293
 msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/profiles.php:477 ../../boot.php:996
+#: ../../mod/profiles.php:477 ../../boot.php:1008
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/profiles.php:478 ../../boot.php:997
+#: ../../mod/profiles.php:478 ../../boot.php:1009
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/profiles.php:489 ../../boot.php:1007
+#: ../../mod/profiles.php:489 ../../boot.php:1019
 msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/profiles.php:491 ../../boot.php:1010
+#: ../../mod/profiles.php:491 ../../boot.php:1022
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../mod/profiles.php:492 ../../boot.php:1011
+#: ../../mod/profiles.php:492 ../../boot.php:1023
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../mod/filer.php:28 ../../include/conversation.php:918
+#: ../../mod/filer.php:29 ../../include/conversation.php:918
 msgid "Save to Folder:"
 msgstr ""
 
-#: ../../mod/filer.php:28
+#: ../../mod/filer.php:29
 msgid "- select -"
 msgstr ""
 
@@ -3728,8 +3833,11 @@ msgstr ""
 msgid "No entries."
 msgstr ""
 
-#: ../../mod/suggest.php:38 ../../view/theme/diabook-blue/theme.php:144
-#: ../../view/theme/diabook/theme.php:147 ../../include/contact_widgets.php:33
+#: ../../mod/suggest.php:38 ../../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:146
+#: ../../include/contact_widgets.php:33
 msgid "Friend Suggestions"
 msgstr ""
 
@@ -3743,7 +3851,10 @@ msgstr ""
 msgid "Ignore/Hide"
 msgstr ""
 
-#: ../../mod/directory.php:47
+#: ../../mod/directory.php:47 ../../view/theme/diabook-red/theme.php:144
+#: ../../view/theme/diabook-blue/theme.php:144
+#: ../../view/theme/diabook/theme.php:148
+#: ../../view/theme/diabook-aerith/theme.php:144
 msgid "Global Directory"
 msgstr ""
 
@@ -3882,7 +3993,7 @@ msgstr ""
 msgid "Unable to set contact photo."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:477 ../../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"
@@ -3929,71 +4040,71 @@ msgstr ""
 msgid "Connection accepted at %s"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:458
+#: ../../addon/facebook/facebook.php:462
 msgid "Facebook disabled"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:463
+#: ../../addon/facebook/facebook.php:467
 msgid "Updating contacts"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:472
+#: ../../addon/facebook/facebook.php:488
 msgid "Facebook API key is missing."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:479
+#: ../../addon/facebook/facebook.php:495
 msgid "Facebook Connect"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:485
+#: ../../addon/facebook/facebook.php:501
 msgid "Install Facebook connector for this account."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:492
+#: ../../addon/facebook/facebook.php:508
 msgid "Remove Facebook connector"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:497
+#: ../../addon/facebook/facebook.php:513
 msgid ""
 "Re-authenticate [This is necessary whenever your Facebook password is "
 "changed.]"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:504
+#: ../../addon/facebook/facebook.php:520
 msgid "Post to Facebook by default"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:508
+#: ../../addon/facebook/facebook.php:524
 msgid "Link all your Facebook friends and conversations on this website"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:510
+#: ../../addon/facebook/facebook.php:526
 msgid ""
 "Facebook conversations consist of your <em>profile wall</em> and your friend "
 "<em>stream</em>."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:511
+#: ../../addon/facebook/facebook.php:527
 msgid "On this website, your Facebook friend stream is only visible to you."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:512
+#: ../../addon/facebook/facebook.php:528
 msgid ""
 "The following settings determine the privacy of your Facebook profile wall "
 "on this website."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:516
+#: ../../addon/facebook/facebook.php:532
 msgid ""
 "On this website your Facebook profile wall conversations will only be "
 "visible to you"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:521
+#: ../../addon/facebook/facebook.php:537
 msgid "Do not import your Facebook profile wall conversations"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:523
+#: ../../addon/facebook/facebook.php:539
 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 "
@@ -4001,67 +4112,125 @@ msgid ""
 "who may see the conversations."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:528
+#: ../../addon/facebook/facebook.php:544
 msgid "Comma separated applications to ignore"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:599
+#: ../../addon/facebook/facebook.php:615
 msgid "Problems with Facebook Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:623
+#: ../../addon/facebook/facebook.php:639
 #: ../../include/contact_selectors.php:81
 msgid "Facebook"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:624
+#: ../../addon/facebook/facebook.php:640
 msgid "Facebook Connector Settings"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:634
+#: ../../addon/facebook/facebook.php:649
+msgid "Facebook API Key"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:658
+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:663
+msgid ""
+"Error: the given API Key seems to be incorrect (the application access token "
+"could not be retrieved)."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:665
+msgid "The given API Key seems to work correctly."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:667
+msgid ""
+"The correctness of the API Key could not be detected. Somthing strange's "
+"going on."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:670
+msgid "App-ID / API-Key"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:671
+msgid "Application secret"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:672
+#, php-format
+msgid "Polling Interval (min. %1$s minutes)"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:676
+msgid "Real-Time Updates"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:680
 msgid "Real-Time Updates are activated."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:635
+#: ../../addon/facebook/facebook.php:681
 msgid "Deactivate Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:637
+#: ../../addon/facebook/facebook.php:683
 msgid "Real-Time Updates not activated."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:637
+#: ../../addon/facebook/facebook.php:683
 msgid "Activate Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:659
+#: ../../addon/facebook/facebook.php:697
+msgid "The new values have been saved."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:716
 msgid "Post to Facebook"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:751
+#: ../../addon/facebook/facebook.php:808
 msgid ""
 "Post to Facebook cancelled because of multi-network access permission "
 "conflict."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:923
+#: ../../addon/facebook/facebook.php:1026
 msgid "View on Friendica"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:948
+#: ../../addon/facebook/facebook.php:1051
 msgid "Facebook post failed. Queued for retry."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:981
+#: ../../addon/facebook/facebook.php:1087
 msgid "Your Facebook connection became invalid. Please Re-authenticate."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:982
+#: ../../addon/facebook/facebook.php:1088
 msgid "Facebook connection became invalid"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1107
-#: ../../addon/facebook/facebook.php:1116 ../../include/bb2diaspora.php:102
+#: ../../addon/facebook/facebook.php:1089
+#, 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/facebook/facebook.php:1214
+#: ../../addon/facebook/facebook.php:1223 ../../include/bb2diaspora.php:102
 msgid "link"
 msgstr ""
 
@@ -4144,15 +4313,25 @@ 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
-msgid "Enable NSFW filter"
+msgid "Enable Content filter"
 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
@@ -4176,7 +4355,7 @@ msgstr ""
 #: ../../addon/communityhome/communityhome.php:34
 #: ../../addon/communityhome/twillingham/communityhome.php:28
 #: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:760
+#: ../../include/nav.php:64 ../../boot.php:766
 msgid "Login"
 msgstr ""
 
@@ -4186,9 +4365,8 @@ msgid "OpenID"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:38
-#: ../../view/theme/diabook-blue/theme.php:23
-#: ../../view/theme/diabook/theme.php:26
-msgid "Last users"
+#: ../../addon/communityhome/twillingham/communityhome.php:38
+msgid "Latest users"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:81
@@ -4197,28 +4375,22 @@ msgid "Most active users"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:98
-#: ../../view/theme/diabook-blue/theme.php:97
-#: ../../view/theme/diabook/theme.php:100
-msgid "Last photos"
+msgid "Latest photos"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:133
-#: ../../view/theme/diabook-blue/theme.php:52
-#: ../../view/theme/diabook/theme.php:55
-msgid "Last likes"
+msgid "Latest likes"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:155
+#: ../../view/theme/diabook-red/theme.php:74
 #: ../../view/theme/diabook-blue/theme.php:74
-#: ../../view/theme/diabook/theme.php:77 ../../include/text.php:1286
+#: ../../view/theme/diabook/theme.php:78
+#: ../../view/theme/diabook-aerith/theme.php:74 ../../include/text.php:1295
 #: ../../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 ""
@@ -4365,23 +4537,11 @@ msgstr ""
 msgid "Post to Drupal by default"
 msgstr ""
 
-#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:172
+#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:190
 #: ../../addon/posterous/posterous.php:173
 msgid "Post from Friendica"
 msgstr ""
 
-#: ../../addon/frown/frown.php:46
-msgid "Frown settings updated."
-msgstr ""
-
-#: ../../addon/frown/frown.php:76
-msgid "Frown Settings"
-msgstr ""
-
-#: ../../addon/frown/frown.php:78
-msgid "Disable graphical smilies"
-msgstr ""
-
 #: ../../addon/geonames/geonames.php:143
 msgid "Geonames settings updated."
 msgstr ""
@@ -4562,11 +4722,11 @@ msgstr ""
 msgid "Disable richtext status editor"
 msgstr ""
 
-#: ../../addon/pageheader/pageheader.php:47
+#: ../../addon/pageheader/pageheader.php:50
 msgid "\"pageheader\" Settings"
 msgstr ""
 
-#: ../../addon/pageheader/pageheader.php:65
+#: ../../addon/pageheader/pageheader.php:68
 msgid "pageheader Settings saved."
 msgstr ""
 
@@ -4602,40 +4762,40 @@ 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 ""
 
-#: ../../addon/statusnet/statusnet.php:203
+#: ../../addon/statusnet/statusnet.php:204
 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 ""
 
-#: ../../addon/statusnet/statusnet.php:252
+#: ../../addon/statusnet/statusnet.php:257
 msgid "StatusNet Posting Settings"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:266
+#: ../../addon/statusnet/statusnet.php:271
 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 ""
 
-#: ../../addon/statusnet/statusnet.php:275
+#: ../../addon/statusnet/statusnet.php:280
 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 "
@@ -4644,19 +4804,19 @@ msgid ""
 "installation at your favorited StatusNet installation."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:278
+#: ../../addon/statusnet/statusnet.php:283
 msgid "OAuth Consumer Key"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:281
+#: ../../addon/statusnet/statusnet.php:286
 msgid "OAuth Consumer Secret"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:284
+#: ../../addon/statusnet/statusnet.php:289
 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 "
@@ -4664,38 +4824,38 @@ msgid ""
 "to StatusNet."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:306
+#: ../../addon/statusnet/statusnet.php:311
 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 ""
 
-#: ../../addon/statusnet/statusnet.php:314
+#: ../../addon/statusnet/statusnet.php:319
 msgid "Cancel Connection Process"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:316
+#: ../../addon/statusnet/statusnet.php:321
 msgid "Current StatusNet API is"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:317
+#: ../../addon/statusnet/statusnet.php:322
 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 ""
 
-#: ../../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 ""
 
-#: ../../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 "
@@ -4703,19 +4863,23 @@ msgid ""
 "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 ""
 
-#: ../../addon/statusnet/statusnet.php:337
+#: ../../addon/statusnet/statusnet.php:342
 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 ""
 
-#: ../../addon/statusnet/statusnet.php:524
+#: ../../addon/statusnet/statusnet.php:539
 msgid "API URL"
 msgstr ""
 
@@ -4823,7 +4987,7 @@ msgid "Show More Settings saved."
 msgstr ""
 
 #: ../../addon/showmore/showmore.php:86 ../../include/conversation.php:466
-#: ../../boot.php:489
+#: ../../boot.php:495
 msgid "show more"
 msgstr ""
 
@@ -4867,21 +5031,21 @@ msgstr ""
 msgid "Post to Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:119
+#: ../../addon/twitter/twitter.php:122
 msgid "Twitter settings updated."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:141
+#: ../../addon/twitter/twitter.php:146
 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 ""
 
-#: ../../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 "
@@ -4890,22 +5054,22 @@ msgid ""
 "be posted to Twitter."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:168
+#: ../../addon/twitter/twitter.php:173
 msgid "Log in with Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:170
+#: ../../addon/twitter/twitter.php:175
 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 ""
 
-#: ../../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 "
@@ -4913,24 +5077,32 @@ msgid ""
 "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 ""
 
-#: ../../addon/twitter/twitter.php:193
+#: ../../addon/twitter/twitter.php:198
 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:371
 msgid "Consumer key"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:358
+#: ../../addon/twitter/twitter.php:372
 msgid "Consumer secret"
 msgstr ""
 
 #: ../../addon/irc/irc.php:25
-msgid "irc Chatroom"
+msgid "IRC Chatroom"
+msgstr ""
+
+#: ../../addon/irc/irc.php:46
+msgid "Popular Channels"
 msgstr ""
 
 #: ../../addon/posterous/posterous.php:36
@@ -4957,87 +5129,183 @@ msgstr ""
 msgid "Post to Posterous by default"
 msgstr ""
 
+#: ../../view/theme/diabook-red/theme.php:23
+#: ../../view/theme/diabook-blue/theme.php:23
+#: ../../view/theme/diabook/theme.php:27
+#: ../../view/theme/dispy-dark/theme.php:116
+#: ../../view/theme/diabook-aerith/theme.php:23
+msgid "Last users"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:52
+#: ../../view/theme/diabook-blue/theme.php:52
+#: ../../view/theme/diabook/theme.php:56
+#: ../../view/theme/diabook-aerith/theme.php:52
+msgid "Last likes"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:97
+#: ../../view/theme/diabook-blue/theme.php:97
+#: ../../view/theme/diabook/theme.php:101
+#: ../../view/theme/diabook-aerith/theme.php:97
+msgid "Last photos"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:142
 #: ../../view/theme/diabook-blue/theme.php:142
-#: ../../view/theme/diabook/theme.php:145 ../../include/nav.php:103
-msgid "Directory"
+#: ../../view/theme/diabook/theme.php:146
+#: ../../view/theme/diabook-aerith/theme.php:142
+msgid "Find Friends"
 msgstr ""
 
+#: ../../view/theme/diabook-red/theme.php:143
 #: ../../view/theme/diabook-blue/theme.php:143
-#: ../../view/theme/diabook/theme.php:146 ../../include/contact_widgets.php:34
-msgid "Similar Interests"
+#: ../../view/theme/diabook/theme.php:147
+#: ../../view/theme/diabook-aerith/theme.php:143
+msgid "Local Directory"
 msgstr ""
 
+#: ../../view/theme/diabook-red/theme.php:145
 #: ../../view/theme/diabook-blue/theme.php:145
-#: ../../view/theme/diabook/theme.php:148 ../../include/contact_widgets.php:35
+#: ../../view/theme/diabook/theme.php:149
+#: ../../view/theme/diabook-aerith/theme.php:145
+#: ../../include/contact_widgets.php:34
+msgid "Similar Interests"
+msgstr ""
+
+#: ../../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:147
+#: ../../include/contact_widgets.php:35
 msgid "Invite Friends"
 msgstr ""
 
-#: ../../view/theme/diabook-blue/theme.php:160
-#: ../../view/theme/diabook-blue/theme.php:222
-#: ../../view/theme/diabook/theme.php:164
-#: ../../view/theme/diabook/theme.php:228
+#: ../../view/theme/diabook-red/theme.php:162
+#: ../../view/theme/diabook-red/theme.php:243
+#: ../../view/theme/diabook-blue/theme.php:162
+#: ../../view/theme/diabook-blue/theme.php:243
+#: ../../view/theme/diabook/theme.php:167
+#: ../../view/theme/diabook/theme.php:251
+#: ../../view/theme/diabook-aerith/theme.php:162
+#: ../../view/theme/diabook-aerith/theme.php:243
 msgid "Community Pages"
 msgstr ""
 
-#: ../../view/theme/diabook-blue/theme.php:215
-#: ../../view/theme/diabook/theme.php:221 ../../include/nav.php:49
+#: ../../view/theme/diabook-red/theme.php:195
+#: ../../view/theme/diabook-blue/theme.php:195
+#: ../../view/theme/diabook/theme.php:200
+#: ../../view/theme/diabook-aerith/theme.php:195
+msgid "Help or @NewHere ?"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:201
+#: ../../view/theme/diabook-blue/theme.php:201
+#: ../../view/theme/diabook/theme.php:206
+#: ../../view/theme/diabook-aerith/theme.php:201
+msgid "Connect Services"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:207
+#: ../../view/theme/diabook-blue/theme.php:207
+#: ../../view/theme/diabook/theme.php:212
+#: ../../view/theme/diabook-aerith/theme.php:207
+msgid "PostIt to Friendica"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:207
+#: ../../view/theme/diabook-blue/theme.php:207
+#: ../../view/theme/diabook/theme.php:212
+#: ../../view/theme/diabook-aerith/theme.php:207
+msgid "Post to Friendica"
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:208
+#: ../../view/theme/diabook-blue/theme.php:208
+#: ../../view/theme/diabook/theme.php:213
+#: ../../view/theme/diabook-aerith/theme.php:208
+msgid " from anywhere by bookmarking this Link."
+msgstr ""
+
+#: ../../view/theme/diabook-red/theme.php:236
+#: ../../view/theme/diabook-blue/theme.php:236
+#: ../../view/theme/diabook/theme.php:244
+#: ../../view/theme/diabook-aerith/theme.php:236 ../../include/nav.php:49
 #: ../../include/nav.php:115
 msgid "Your posts and conversations"
 msgstr ""
 
-#: ../../view/theme/diabook-blue/theme.php:216
-#: ../../view/theme/diabook/theme.php:222 ../../include/nav.php:50
+#: ../../view/theme/diabook-red/theme.php:237
+#: ../../view/theme/diabook-blue/theme.php:237
+#: ../../view/theme/diabook/theme.php:245
+#: ../../view/theme/diabook-aerith/theme.php:237 ../../include/nav.php:50
 msgid "Your profile page"
 msgstr ""
 
-#: ../../view/theme/diabook-blue/theme.php:217
-#: ../../view/theme/diabook/theme.php:223
+#: ../../view/theme/diabook-red/theme.php:238
+#: ../../view/theme/diabook-blue/theme.php:238
+#: ../../view/theme/diabook/theme.php:246
+#: ../../view/theme/diabook-aerith/theme.php:238
 msgid "Your contacts"
 msgstr ""
 
-#: ../../view/theme/diabook-blue/theme.php:218
-#: ../../view/theme/diabook/theme.php:224 ../../include/nav.php:51
-#: ../../boot.php:1391
+#: ../../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:239 ../../include/nav.php:51
+#: ../../boot.php:1413
 msgid "Photos"
 msgstr ""
 
-#: ../../view/theme/diabook-blue/theme.php:218
-#: ../../view/theme/diabook/theme.php:224 ../../include/nav.php:51
+#: ../../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:239 ../../include/nav.php:51
 msgid "Your photos"
 msgstr ""
 
-#: ../../view/theme/diabook-blue/theme.php:219
-#: ../../view/theme/diabook/theme.php:225 ../../include/nav.php:52
+#: ../../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:240 ../../include/nav.php:52
 msgid "Your events"
 msgstr ""
 
-#: ../../view/theme/diabook-blue/theme.php:220
-#: ../../view/theme/diabook/theme.php:226 ../../include/nav.php:53
+#: ../../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:241 ../../include/nav.php:53
 msgid "Personal notes"
 msgstr ""
 
-#: ../../view/theme/diabook-blue/theme.php:220
-#: ../../view/theme/diabook/theme.php:226 ../../include/nav.php:53
+#: ../../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:241 ../../include/nav.php:53
 msgid "Your personal photos"
 msgstr ""
 
-#: ../../view/theme/quattro/theme.php:17
+#: ../../view/theme/quattro/config.php:23
 msgid "Theme settings"
 msgstr ""
 
-#: ../../view/theme/quattro/theme.php:18
+#: ../../view/theme/quattro/config.php:24
 msgid "Alignment"
 msgstr ""
 
-#: ../../view/theme/quattro/theme.php:18
+#: ../../view/theme/quattro/config.php:24
 msgid "Left"
 msgstr ""
 
-#: ../../view/theme/quattro/theme.php:18
+#: ../../view/theme/quattro/config.php:24
 msgid "Center"
 msgstr ""
 
-#: ../../include/profile_advanced.php:17 ../../boot.php:1032
+#: ../../view/theme/quattro/config.php:25
+msgid "Color scheme"
+msgstr ""
+
+#: ../../include/profile_advanced.php:17 ../../boot.php:1044
 msgid "Gender:"
 msgstr ""
 
@@ -5050,7 +5318,7 @@ msgid "j F"
 msgstr ""
 
 #: ../../include/profile_advanced.php:30 ../../include/datetime.php:438
-#: ../../include/items.php:1384
+#: ../../include/items.php:1392
 msgid "Birthday:"
 msgstr ""
 
@@ -5058,11 +5326,11 @@ msgstr ""
 msgid "Age:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:37 ../../boot.php:1035
+#: ../../include/profile_advanced.php:37 ../../boot.php:1047
 msgid "Status:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:45 ../../boot.php:1037
+#: ../../include/profile_advanced.php:45 ../../boot.php:1049
 msgid "Homepage:"
 msgstr ""
 
@@ -5406,184 +5674,184 @@ msgstr ""
 msgid "Finishes:"
 msgstr ""
 
-#: ../../include/delivery.php:426 ../../include/notifier.php:640
+#: ../../include/delivery.php:434 ../../include/notifier.php:651
 msgid "(no subject)"
 msgstr ""
 
-#: ../../include/delivery.php:433 ../../include/enotify.php:23
-#: ../../include/notifier.php:647
+#: ../../include/delivery.php:441 ../../include/enotify.php:23
+#: ../../include/notifier.php:658
 msgid "noreply"
 msgstr ""
 
-#: ../../include/text.php:238
+#: ../../include/text.php:243
 msgid "prev"
 msgstr ""
 
-#: ../../include/text.php:240
+#: ../../include/text.php:245
 msgid "first"
 msgstr ""
 
-#: ../../include/text.php:269
+#: ../../include/text.php:274
 msgid "last"
 msgstr ""
 
-#: ../../include/text.php:272
+#: ../../include/text.php:277
 msgid "next"
 msgstr ""
 
-#: ../../include/text.php:563
+#: ../../include/text.php:568
 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] ""
 
-#: ../../include/text.php:645 ../../include/nav.php:91
+#: ../../include/text.php:650 ../../include/nav.php:91
 msgid "Search"
 msgstr ""
 
-#: ../../include/text.php:822
+#: ../../include/text.php:831
 msgid "Monday"
 msgstr ""
 
-#: ../../include/text.php:822
+#: ../../include/text.php:831
 msgid "Tuesday"
 msgstr ""
 
-#: ../../include/text.php:822
+#: ../../include/text.php:831
 msgid "Wednesday"
 msgstr ""
 
-#: ../../include/text.php:822
+#: ../../include/text.php:831
 msgid "Thursday"
 msgstr ""
 
-#: ../../include/text.php:822
+#: ../../include/text.php:831
 msgid "Friday"
 msgstr ""
 
-#: ../../include/text.php:822
+#: ../../include/text.php:831
 msgid "Saturday"
 msgstr ""
 
-#: ../../include/text.php:822
+#: ../../include/text.php:831
 msgid "Sunday"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:835
 msgid "January"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:835
 msgid "February"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:835
 msgid "March"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:835
 msgid "April"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:835
 msgid "May"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:835
 msgid "June"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:835
 msgid "July"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:835
 msgid "August"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:835
 msgid "September"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:835
 msgid "October"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:835
 msgid "November"
 msgstr ""
 
-#: ../../include/text.php:826
+#: ../../include/text.php:835
 msgid "December"
 msgstr ""
 
-#: ../../include/text.php:910
+#: ../../include/text.php:919
 msgid "bytes"
 msgstr ""
 
-#: ../../include/text.php:927
+#: ../../include/text.php:936
 msgid "Categories:"
 msgstr ""
 
-#: ../../include/text.php:939
+#: ../../include/text.php:948
 msgid "remove"
 msgstr ""
 
-#: ../../include/text.php:939
+#: ../../include/text.php:948
 msgid "[remove]"
 msgstr ""
 
-#: ../../include/text.php:942
+#: ../../include/text.php:951
 msgid "Filed under:"
 msgstr ""
 
-#: ../../include/text.php:958 ../../include/text.php:970
+#: ../../include/text.php:967 ../../include/text.php:979
 msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/text.php:1062
+#: ../../include/text.php:1071
 msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/text.php:1074
+#: ../../include/text.php:1083
 msgid "default"
 msgstr ""
 
-#: ../../include/text.php:1290
+#: ../../include/text.php:1299
 msgid "activity"
 msgstr ""
 
-#: ../../include/text.php:1292
+#: ../../include/text.php:1301
 msgid "comment"
 msgstr ""
 
-#: ../../include/text.php:1293
+#: ../../include/text.php:1302
 msgid "post"
 msgstr ""
 
-#: ../../include/text.php:1335
+#: ../../include/text.php:1457
 msgid "Item filed"
 msgstr ""
 
-#: ../../include/diaspora.php:570
+#: ../../include/diaspora.php:582
 msgid "Sharing notification from Diaspora network"
 msgstr ""
 
-#: ../../include/diaspora.php:1953
+#: ../../include/diaspora.php:1969
 msgid "Attachments:"
 msgstr ""
 
-#: ../../include/diaspora.php:2136
+#: ../../include/diaspora.php:2152
 #, php-format
 msgid "[Relayed] Comment authored by %s from network %s"
 msgstr ""
 
-#: ../../include/network.php:814
+#: ../../include/network.php:817
 msgid "view full size"
 msgstr ""
 
@@ -5622,7 +5890,7 @@ msgstr ""
 msgid "Create a new group"
 msgstr ""
 
-#: ../../include/nav.php:46 ../../boot.php:759
+#: ../../include/nav.php:46 ../../boot.php:765
 msgid "Logout"
 msgstr ""
 
@@ -5630,7 +5898,7 @@ msgstr ""
 msgid "End this session"
 msgstr ""
 
-#: ../../include/nav.php:49 ../../boot.php:1381
+#: ../../include/nav.php:49 ../../boot.php:1403
 msgid "Status"
 msgstr ""
 
@@ -5667,6 +5935,10 @@ msgid "Conversations on this site"
 msgstr ""
 
 #: ../../include/nav.php:103
+msgid "Directory"
+msgstr ""
+
+#: ../../include/nav.php:103
 msgid "People directory"
 msgstr ""
 
@@ -5706,11 +5978,11 @@ msgstr ""
 msgid "Manage other pages"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../boot.php:990
+#: ../../include/nav.php:138 ../../boot.php:1002
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../boot.php:990
+#: ../../include/nav.php:138 ../../boot.php:1002
 msgid "Manage/edit profiles"
 msgstr ""
 
@@ -5777,14 +6049,28 @@ msgstr ""
 msgid "Saved Folders"
 msgstr ""
 
-#: ../../include/contact_widgets.php:99
+#: ../../include/contact_widgets.php:99 ../../include/contact_widgets.php:127
 msgid "Everything"
 msgstr ""
 
+#: ../../include/contact_widgets.php:124
+msgid "Categories"
+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 ""
@@ -5875,7 +6161,7 @@ msgstr ""
 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 ""
 
@@ -6079,11 +6365,11 @@ msgstr ""
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: ../../include/items.php:2648
+#: ../../include/items.php:2656
 msgid "A new person is sharing with you at "
 msgstr ""
 
-#: ../../include/items.php:2648
+#: ../../include/items.php:2656
 msgid "You have a new follower at "
 msgstr ""
 
@@ -6318,70 +6604,74 @@ msgstr ""
 msgid "clear location"
 msgstr ""
 
-#: ../../include/conversation.php:979
+#: ../../include/conversation.php:981
 msgid "permissions"
 msgstr ""
 
-#: ../../boot.php:487
+#: ../../boot.php:493
 msgid "Delete this item?"
 msgstr ""
 
-#: ../../boot.php:490
+#: ../../boot.php:496
 msgid "show fewer"
 msgstr ""
 
-#: ../../boot.php:738
+#: ../../boot.php:744
 msgid "Create a New Account"
 msgstr ""
 
-#: ../../boot.php:762
+#: ../../boot.php:768
 msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../boot.php:763
+#: ../../boot.php:769
 msgid "Password: "
 msgstr ""
 
-#: ../../boot.php:766
+#: ../../boot.php:772
 msgid "Or login using OpenID: "
 msgstr ""
 
-#: ../../boot.php:772
+#: ../../boot.php:778
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:929
+#: ../../boot.php:935
 msgid "Edit profile"
 msgstr ""
 
-#: ../../boot.php:1096 ../../boot.php:1167
+#: ../../boot.php:994
+msgid "Message"
+msgstr ""
+
+#: ../../boot.php:1109 ../../boot.php:1180
 msgid "g A l F d"
 msgstr ""
 
-#: ../../boot.php:1097 ../../boot.php:1168
+#: ../../boot.php:1110 ../../boot.php:1181
 msgid "F d"
 msgstr ""
 
-#: ../../boot.php:1122
+#: ../../boot.php:1135
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../boot.php:1123
+#: ../../boot.php:1136
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../boot.php:1146 ../../boot.php:1210
+#: ../../boot.php:1159 ../../boot.php:1223
 msgid "[today]"
 msgstr ""
 
-#: ../../boot.php:1191
+#: ../../boot.php:1204
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../boot.php:1192
+#: ../../boot.php:1205
 msgid "Events this week:"
 msgstr ""
 
-#: ../../boot.php:1204
+#: ../../boot.php:1217
 msgid "[No description]"
 msgstr ""
diff --git a/util/php2po.php b/util/php2po.php
index d3ce0a5af..d3ce0a5af 100755..100644
--- a/util/php2po.php
+++ b/util/php2po.php
diff --git a/util/po2php.php b/util/po2php.php
index c703172af..c703172af 100755..100644
--- a/util/po2php.php
+++ b/util/po2php.php
diff --git a/util/run_xgettext.sh b/util/run_xgettext.sh
index 6ea603c83..6ea603c83 100755..100644
--- a/util/run_xgettext.sh
+++ b/util/run_xgettext.sh
diff --git a/util/strings.php b/util/strings.php
index e70766d86..e70766d86 100755..100644
--- a/util/strings.php
+++ b/util/strings.php
diff --git a/util/typo.php b/util/typo.php
index e20cce86a..e20cce86a 100755..100644
--- a/util/typo.php
+++ b/util/typo.php
diff --git a/util/typohelper.php b/util/typohelper.php
index 589702a02..589702a02 100755..100644
--- a/util/typohelper.php
+++ b/util/typohelper.php
author	zottel <github@zottel.net>	2012-04-08 10:33:32 +0200
committer	zottel <github@zottel.net>	2012-04-08 10:33:32 +0200
commit	aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b (patch)
tree	1d7e5f2b575b8836fefe76660f466cb176585d5c /util
parent	64a1367525ac920721943a08adec1124657df70d (diff)
parent	e3b2ac0735c908357dafb8670339fd34d3e2e6c0 (diff)
download	volse-hubzilla-aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b.tar.gz volse-hubzilla-aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b.tar.bz2 volse-hubzilla-aaf5a81365b4cbcb3d1b9537b5544aeb5de66f4b.zip