diff --git a/boot.php b/boot.php
index 563067ad63..736403ab44 100644
--- a/boot.php
+++ b/boot.php
@@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.1.1561' );
+define ( 'FRIENDICA_VERSION',      '3.1.1565' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1157      );
 
diff --git a/util/messages.po b/util/messages.po
index 0d244a01eb..2e186ea651 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.1.1561\n"
+"Project-Id-Version: 3.1.1565\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-18 10:00-0800\n"
+"POT-Creation-Date: 2012-12-22 10:00-0800\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"
@@ -40,8 +40,8 @@ msgstr ""
 #: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:995
 #: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:135
 #: ../../mod/notifications.php:66 ../../mod/contacts.php:147
-#: ../../mod/settings.php:91 ../../mod/settings.php:541
-#: ../../mod/settings.php:546 ../../mod/manage.php:90 ../../mod/network.php:6
+#: ../../mod/settings.php:91 ../../mod/settings.php:542
+#: ../../mod/settings.php:547 ../../mod/manage.php:90 ../../mod/network.php:6
 #: ../../mod/notes.php:20 ../../mod/uimport.php:23 ../../mod/wallmessage.php:9
 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
@@ -93,8 +93,8 @@ msgstr ""
 msgid "Return to contact editor"
 msgstr ""
 
-#: ../../mod/crepair.php:148 ../../mod/settings.php:561
-#: ../../mod/settings.php:587 ../../mod/admin.php:695 ../../mod/admin.php:705
+#: ../../mod/crepair.php:148 ../../mod/settings.php:562
+#: ../../mod/settings.php:588 ../../mod/admin.php:695 ../../mod/admin.php:705
 msgid "Name"
 msgstr ""
 
@@ -137,9 +137,9 @@ msgstr ""
 #: ../../mod/photos.php:1519 ../../mod/install.php:246
 #: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199
 #: ../../mod/content.php:693 ../../mod/contacts.php:352
-#: ../../mod/settings.php:559 ../../mod/settings.php:669
-#: ../../mod/settings.php:738 ../../mod/settings.php:810
-#: ../../mod/settings.php:1017 ../../mod/group.php:85 ../../mod/mood.php:137
+#: ../../mod/settings.php:560 ../../mod/settings.php:670
+#: ../../mod/settings.php:739 ../../mod/settings.php:811
+#: ../../mod/settings.php:1018 ../../mod/group.php:85 ../../mod/mood.php:137
 #: ../../mod/message.php:301 ../../mod/message.php:487 ../../mod/admin.php:445
 #: ../../mod/admin.php:692 ../../mod/admin.php:829 ../../mod/admin.php:1028
 #: ../../mod/admin.php:1115 ../../mod/profiles.php:604
@@ -289,7 +289,7 @@ msgid "link to source"
 msgstr ""
 
 #: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91
-#: ../../include/nav.php:52 ../../boot.php:1748
+#: ../../include/nav.php:52 ../../boot.php:1761
 msgid "Events"
 msgstr ""
 
@@ -347,8 +347,8 @@ msgstr ""
 
 #: ../../mod/events.php:448 ../../mod/directory.php:134
 #: ../../addon/forumdirectory/forumdirectory.php:156
-#: ../../include/event.php:40 ../../include/bb2diaspora.php:412
-#: ../../boot.php:1278
+#: ../../include/event.php:40 ../../include/bb2diaspora.php:415
+#: ../../boot.php:1291
 msgid "Location:"
 msgstr ""
 
@@ -361,8 +361,8 @@ msgid "Share this event"
 msgstr ""
 
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:145
-#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:560
-#: ../../mod/settings.php:586 ../../addon/js_upload/js_upload.php:45
+#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:561
+#: ../../mod/settings.php:587 ../../addon/js_upload/js_upload.php:45
 #: ../../include/conversation.php:1009
 #: ../../addon.old/js_upload/js_upload.php:45
 msgid "Cancel"
@@ -410,30 +410,30 @@ msgid ""
 msgstr ""
 
 #: ../../mod/api.php:105 ../../mod/dfrn_request.php:835
-#: ../../mod/settings.php:933 ../../mod/settings.php:939
-#: ../../mod/settings.php:947 ../../mod/settings.php:951
-#: ../../mod/settings.php:956 ../../mod/settings.php:962
-#: ../../mod/settings.php:968 ../../mod/settings.php:974
-#: ../../mod/settings.php:1004 ../../mod/settings.php:1005
-#: ../../mod/settings.php:1006 ../../mod/settings.php:1007
-#: ../../mod/settings.php:1008 ../../mod/register.php:237
+#: ../../mod/settings.php:934 ../../mod/settings.php:940
+#: ../../mod/settings.php:948 ../../mod/settings.php:952
+#: ../../mod/settings.php:957 ../../mod/settings.php:963
+#: ../../mod/settings.php:969 ../../mod/settings.php:975
+#: ../../mod/settings.php:1005 ../../mod/settings.php:1006
+#: ../../mod/settings.php:1007 ../../mod/settings.php:1008
+#: ../../mod/settings.php:1009 ../../mod/register.php:237
 #: ../../mod/profiles.php:584
 msgid "Yes"
 msgstr ""
 
 #: ../../mod/api.php:106 ../../mod/dfrn_request.php:836
-#: ../../mod/settings.php:933 ../../mod/settings.php:939
-#: ../../mod/settings.php:947 ../../mod/settings.php:951
-#: ../../mod/settings.php:956 ../../mod/settings.php:962
-#: ../../mod/settings.php:968 ../../mod/settings.php:974
-#: ../../mod/settings.php:1004 ../../mod/settings.php:1005
-#: ../../mod/settings.php:1006 ../../mod/settings.php:1007
-#: ../../mod/settings.php:1008 ../../mod/register.php:238
+#: ../../mod/settings.php:934 ../../mod/settings.php:940
+#: ../../mod/settings.php:948 ../../mod/settings.php:952
+#: ../../mod/settings.php:957 ../../mod/settings.php:963
+#: ../../mod/settings.php:969 ../../mod/settings.php:975
+#: ../../mod/settings.php:1005 ../../mod/settings.php:1006
+#: ../../mod/settings.php:1007 ../../mod/settings.php:1008
+#: ../../mod/settings.php:1009 ../../mod/register.php:238
 #: ../../mod/profiles.php:585
 msgid "No"
 msgstr ""
 
-#: ../../mod/photos.php:51 ../../boot.php:1741
+#: ../../mod/photos.php:51 ../../boot.php:1754
 msgid "Photo Albums"
 msgstr ""
 
@@ -656,7 +656,7 @@ msgid "This is you"
 msgstr ""
 
 #: ../../mod/photos.php:1402 ../../mod/photos.php:1446
-#: ../../mod/photos.php:1518 ../../mod/content.php:692 ../../boot.php:608
+#: ../../mod/photos.php:1518 ../../mod/content.php:692 ../../boot.php:621
 #: ../../object/Item.php:267 ../../object/Item.php:576
 msgid "Comment"
 msgstr ""
@@ -669,7 +669,7 @@ msgid "Preview"
 msgstr ""
 
 #: ../../mod/photos.php:1488 ../../mod/content.php:439
-#: ../../mod/content.php:724 ../../mod/settings.php:622
+#: ../../mod/content.php:724 ../../mod/settings.php:623
 #: ../../mod/group.php:168 ../../mod/admin.php:699
 #: ../../include/conversation.php:569 ../../object/Item.php:119
 msgid "Delete"
@@ -742,7 +742,7 @@ msgid "Post to Email"
 msgstr ""
 
 #: ../../mod/editpost.php:106 ../../mod/content.php:711
-#: ../../mod/settings.php:621 ../../object/Item.php:109
+#: ../../mod/settings.php:622 ../../object/Item.php:109
 msgid "Edit"
 msgstr ""
 
@@ -999,7 +999,7 @@ msgstr ""
 msgid "StatusNet/Federated Social Web"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:841 ../../mod/settings.php:681
+#: ../../mod/dfrn_request.php:841 ../../mod/settings.php:682
 #: ../../include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr ""
@@ -1019,7 +1019,7 @@ msgstr ""
 msgid "Submit Request"
 msgstr ""
 
-#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:138
+#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:140
 msgid "Account settings"
 msgstr ""
 
@@ -1051,7 +1051,7 @@ msgstr ""
 #: ../../mod/newmember.php:22 ../../mod/admin.php:788 ../../mod/admin.php:993
 #: ../../addon/dav/friendica/layout.fnk.php:225
 #: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537
-#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:138
+#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:140
 #: ../../addon.old/dav/friendica/layout.fnk.php:225
 #: ../../addon.old/mathjax/mathjax.php:36
 msgid "Settings"
@@ -1332,7 +1332,7 @@ msgid ""
 msgstr ""
 
 #: ../../mod/localtime.php:12 ../../include/event.php:11
-#: ../../include/bb2diaspora.php:390
+#: ../../include/bb2diaspora.php:393
 msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
@@ -1398,7 +1398,7 @@ msgid "is interested in:"
 msgstr ""
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1216
+#: ../../include/contact_widgets.php:9 ../../boot.php:1229
 msgid "Connect"
 msgstr ""
 
@@ -1465,7 +1465,7 @@ msgstr[1] ""
 
 #: ../../mod/content.php:589 ../../addon/page/page.php:77
 #: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119
-#: ../../include/contact_widgets.php:204 ../../boot.php:609
+#: ../../include/contact_widgets.php:204 ../../boot.php:622
 #: ../../object/Item.php:292 ../../addon.old/page/page.php:77
 #: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119
 msgid "show more"
@@ -2034,7 +2034,7 @@ msgid "Edit contact"
 msgstr ""
 
 #: ../../mod/contacts.php:575 ../../view/theme/diabook/theme.php:89
-#: ../../include/nav.php:142
+#: ../../include/nav.php:144
 msgid "Contacts"
 msgstr ""
 
@@ -2073,7 +2073,7 @@ msgstr ""
 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:777
 #: ../../addon/public_server/public_server.php:62
 #: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3365
-#: ../../boot.php:824 ../../addon.old/facebook/facebook.php:702
+#: ../../boot.php:837 ../../addon.old/facebook/facebook.php:702
 #: ../../addon.old/facebook/facebook.php:1200
 #: ../../addon.old/fbpost/fbpost.php:661
 #: ../../addon.old/public_server/public_server.php:62
@@ -2087,7 +2087,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:83 ../../boot.php:963
+#: ../../mod/lostpass.php:83 ../../boot.php:976
 msgid "Password Reset"
 msgstr ""
 
@@ -2139,63 +2139,63 @@ msgstr ""
 msgid "Missing some important data!"
 msgstr ""
 
-#: ../../mod/settings.php:121 ../../mod/settings.php:585
+#: ../../mod/settings.php:121 ../../mod/settings.php:586
 msgid "Update"
 msgstr ""
 
-#: ../../mod/settings.php:226
+#: ../../mod/settings.php:227
 msgid "Failed to connect with email account using the settings provided."
 msgstr ""
 
-#: ../../mod/settings.php:231
+#: ../../mod/settings.php:232
 msgid "Email settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:246
+#: ../../mod/settings.php:247
 msgid "Features updated"
 msgstr ""
 
-#: ../../mod/settings.php:306
+#: ../../mod/settings.php:307
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:311
+#: ../../mod/settings.php:312
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:322
+#: ../../mod/settings.php:323
 msgid "Password changed."
 msgstr ""
 
-#: ../../mod/settings.php:324
+#: ../../mod/settings.php:325
 msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/settings.php:389
+#: ../../mod/settings.php:390
 msgid " Please use a shorter name."
 msgstr ""
 
-#: ../../mod/settings.php:391
+#: ../../mod/settings.php:392
 msgid " Name too short."
 msgstr ""
 
-#: ../../mod/settings.php:397
+#: ../../mod/settings.php:398
 msgid " Not valid email."
 msgstr ""
 
-#: ../../mod/settings.php:399
+#: ../../mod/settings.php:400
 msgid " Cannot change to that email."
 msgstr ""
 
-#: ../../mod/settings.php:453
+#: ../../mod/settings.php:454
 msgid "Private forum has no privacy permissions. Using default privacy group."
 msgstr ""
 
-#: ../../mod/settings.php:457
+#: ../../mod/settings.php:458
 msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr ""
 
-#: ../../mod/settings.php:487 ../../addon/facebook/facebook.php:495
+#: ../../mod/settings.php:488 ../../addon/facebook/facebook.php:495
 #: ../../addon/fbpost/fbpost.php:151
 #: ../../addon/remote_permissions/remote_permissions.php:204
 #: ../../addon/impressum/impressum.php:78
@@ -2211,455 +2211,455 @@ msgstr ""
 msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:558 ../../mod/settings.php:584
-#: ../../mod/settings.php:620
+#: ../../mod/settings.php:559 ../../mod/settings.php:585
+#: ../../mod/settings.php:621
 msgid "Add application"
 msgstr ""
 
-#: ../../mod/settings.php:562 ../../mod/settings.php:588
+#: ../../mod/settings.php:563 ../../mod/settings.php:589
 #: ../../addon/statusnet/statusnet.php:694
 #: ../../addon.old/statusnet/statusnet.php:570
 msgid "Consumer Key"
 msgstr ""
 
-#: ../../mod/settings.php:563 ../../mod/settings.php:589
+#: ../../mod/settings.php:564 ../../mod/settings.php:590
 #: ../../addon/statusnet/statusnet.php:693
 #: ../../addon.old/statusnet/statusnet.php:569
 msgid "Consumer Secret"
 msgstr ""
 
-#: ../../mod/settings.php:564 ../../mod/settings.php:590
+#: ../../mod/settings.php:565 ../../mod/settings.php:591
 msgid "Redirect"
 msgstr ""
 
-#: ../../mod/settings.php:565 ../../mod/settings.php:591
+#: ../../mod/settings.php:566 ../../mod/settings.php:592
 msgid "Icon url"
 msgstr ""
 
-#: ../../mod/settings.php:576
+#: ../../mod/settings.php:577
 msgid "You can't edit this application."
 msgstr ""
 
-#: ../../mod/settings.php:619
+#: ../../mod/settings.php:620
 msgid "Connected Apps"
 msgstr ""
 
-#: ../../mod/settings.php:623
+#: ../../mod/settings.php:624
 msgid "Client key starts with"
 msgstr ""
 
-#: ../../mod/settings.php:624
+#: ../../mod/settings.php:625
 msgid "No name"
 msgstr ""
 
-#: ../../mod/settings.php:625
+#: ../../mod/settings.php:626
 msgid "Remove authorization"
 msgstr ""
 
-#: ../../mod/settings.php:637
+#: ../../mod/settings.php:638
 msgid "No Plugin settings configured"
 msgstr ""
 
-#: ../../mod/settings.php:645 ../../addon/widgets/widgets.php:123
+#: ../../mod/settings.php:646 ../../addon/widgets/widgets.php:123
 #: ../../addon.old/widgets/widgets.php:123
 msgid "Plugin Settings"
 msgstr ""
 
-#: ../../mod/settings.php:659
+#: ../../mod/settings.php:660
 msgid "Off"
 msgstr ""
 
-#: ../../mod/settings.php:659
+#: ../../mod/settings.php:660
 msgid "On"
 msgstr ""
 
-#: ../../mod/settings.php:667
+#: ../../mod/settings.php:668
 msgid "Additional Features"
 msgstr ""
 
-#: ../../mod/settings.php:681 ../../mod/settings.php:682
+#: ../../mod/settings.php:682 ../../mod/settings.php:683
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr ""
 
-#: ../../mod/settings.php:681 ../../mod/settings.php:682
+#: ../../mod/settings.php:682 ../../mod/settings.php:683
 msgid "enabled"
 msgstr ""
 
-#: ../../mod/settings.php:681 ../../mod/settings.php:682
+#: ../../mod/settings.php:682 ../../mod/settings.php:683
 msgid "disabled"
 msgstr ""
 
-#: ../../mod/settings.php:682
+#: ../../mod/settings.php:683
 msgid "StatusNet"
 msgstr ""
 
-#: ../../mod/settings.php:714
+#: ../../mod/settings.php:715
 msgid "Email access is disabled on this site."
 msgstr ""
 
-#: ../../mod/settings.php:720
+#: ../../mod/settings.php:721
 msgid "Connector Settings"
 msgstr ""
 
-#: ../../mod/settings.php:725
+#: ../../mod/settings.php:726
 msgid "Email/Mailbox Setup"
 msgstr ""
 
-#: ../../mod/settings.php:726
+#: ../../mod/settings.php:727
 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:727
+#: ../../mod/settings.php:728
 msgid "Last successful email check:"
 msgstr ""
 
-#: ../../mod/settings.php:729
+#: ../../mod/settings.php:730
 msgid "IMAP server name:"
 msgstr ""
 
-#: ../../mod/settings.php:730
+#: ../../mod/settings.php:731
 msgid "IMAP port:"
 msgstr ""
 
-#: ../../mod/settings.php:731
+#: ../../mod/settings.php:732
 msgid "Security:"
 msgstr ""
 
-#: ../../mod/settings.php:731 ../../mod/settings.php:736
+#: ../../mod/settings.php:732 ../../mod/settings.php:737
 #: ../../addon/fbpost/fbpost.php:247 ../../addon/fbpost/fbpost.php:249
 #: ../../addon/dav/common/wdcal_edit.inc.php:191
 #: ../../addon.old/dav/common/wdcal_edit.inc.php:191
 msgid "None"
 msgstr ""
 
-#: ../../mod/settings.php:732
+#: ../../mod/settings.php:733
 msgid "Email login name:"
 msgstr ""
 
-#: ../../mod/settings.php:733
+#: ../../mod/settings.php:734
 msgid "Email password:"
 msgstr ""
 
-#: ../../mod/settings.php:734
+#: ../../mod/settings.php:735
 msgid "Reply-to address:"
 msgstr ""
 
-#: ../../mod/settings.php:735
+#: ../../mod/settings.php:736
 msgid "Send public posts to all email contacts:"
 msgstr ""
 
-#: ../../mod/settings.php:736
+#: ../../mod/settings.php:737
 msgid "Action after import:"
 msgstr ""
 
-#: ../../mod/settings.php:736
+#: ../../mod/settings.php:737
 msgid "Mark as seen"
 msgstr ""
 
-#: ../../mod/settings.php:736
+#: ../../mod/settings.php:737
 msgid "Move to folder"
 msgstr ""
 
-#: ../../mod/settings.php:737
+#: ../../mod/settings.php:738
 msgid "Move to folder:"
 msgstr ""
 
-#: ../../mod/settings.php:768 ../../mod/admin.php:404
+#: ../../mod/settings.php:769 ../../mod/admin.php:404
 msgid "No special theme for mobile devices"
 msgstr ""
 
-#: ../../mod/settings.php:808
+#: ../../mod/settings.php:809
 msgid "Display Settings"
 msgstr ""
 
-#: ../../mod/settings.php:814 ../../mod/settings.php:825
+#: ../../mod/settings.php:815 ../../mod/settings.php:826
 msgid "Display Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:815
+#: ../../mod/settings.php:816
 msgid "Mobile Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:816
+#: ../../mod/settings.php:817
 msgid "Update browser every xx seconds"
 msgstr ""
 
-#: ../../mod/settings.php:816
+#: ../../mod/settings.php:817
 msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
-#: ../../mod/settings.php:817
+#: ../../mod/settings.php:818
 msgid "Number of items to display per page:"
 msgstr ""
 
-#: ../../mod/settings.php:817
+#: ../../mod/settings.php:818
 msgid "Maximum of 100 items"
 msgstr ""
 
-#: ../../mod/settings.php:818
+#: ../../mod/settings.php:819
 msgid "Don't show emoticons"
 msgstr ""
 
-#: ../../mod/settings.php:894
+#: ../../mod/settings.php:895
 msgid "Normal Account Page"
 msgstr ""
 
-#: ../../mod/settings.php:895
+#: ../../mod/settings.php:896
 msgid "This account is a normal personal profile"
 msgstr ""
 
-#: ../../mod/settings.php:898
+#: ../../mod/settings.php:899
 msgid "Soapbox Page"
 msgstr ""
 
-#: ../../mod/settings.php:899
+#: ../../mod/settings.php:900
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr ""
 
-#: ../../mod/settings.php:902
+#: ../../mod/settings.php:903
 msgid "Community Forum/Celebrity Account"
 msgstr ""
 
-#: ../../mod/settings.php:903
+#: ../../mod/settings.php:904
 msgid "Automatically approve all connection/friend requests as read-write fans"
 msgstr ""
 
-#: ../../mod/settings.php:906
+#: ../../mod/settings.php:907
 msgid "Automatic Friend Page"
 msgstr ""
 
-#: ../../mod/settings.php:907
+#: ../../mod/settings.php:908
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr ""
 
-#: ../../mod/settings.php:910
+#: ../../mod/settings.php:911
 msgid "Private Forum [Experimental]"
 msgstr ""
 
-#: ../../mod/settings.php:911
+#: ../../mod/settings.php:912
 msgid "Private forum - approved members only"
 msgstr ""
 
-#: ../../mod/settings.php:923
+#: ../../mod/settings.php:924
 msgid "OpenID:"
 msgstr ""
 
-#: ../../mod/settings.php:923
+#: ../../mod/settings.php:924
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: ../../mod/settings.php:933
+#: ../../mod/settings.php:934
 msgid "Publish your default profile in your local site directory?"
 msgstr ""
 
-#: ../../mod/settings.php:939
+#: ../../mod/settings.php:940
 msgid "Publish your default profile in the global social directory?"
 msgstr ""
 
-#: ../../mod/settings.php:947
+#: ../../mod/settings.php:948
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr ""
 
-#: ../../mod/settings.php:951
+#: ../../mod/settings.php:952
 msgid "Hide your profile details from unknown viewers?"
 msgstr ""
 
-#: ../../mod/settings.php:956
+#: ../../mod/settings.php:957
 msgid "Allow friends to post to your profile page?"
 msgstr ""
 
-#: ../../mod/settings.php:962
+#: ../../mod/settings.php:963
 msgid "Allow friends to tag your posts?"
 msgstr ""
 
-#: ../../mod/settings.php:968
+#: ../../mod/settings.php:969
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../mod/settings.php:974
+#: ../../mod/settings.php:975
 msgid "Permit unknown people to send you private mail?"
 msgstr ""
 
-#: ../../mod/settings.php:982
+#: ../../mod/settings.php:983
 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: ../../mod/settings.php:985 ../../mod/profile_photo.php:248
+#: ../../mod/settings.php:986 ../../mod/profile_photo.php:248
 msgid "or"
 msgstr ""
 
-#: ../../mod/settings.php:990
+#: ../../mod/settings.php:991
 msgid "Your Identity Address is"
 msgstr ""
 
-#: ../../mod/settings.php:1001
+#: ../../mod/settings.php:1002
 msgid "Automatically expire posts after this many days:"
 msgstr ""
 
-#: ../../mod/settings.php:1001
+#: ../../mod/settings.php:1002
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr ""
 
-#: ../../mod/settings.php:1002
+#: ../../mod/settings.php:1003
 msgid "Advanced expiration settings"
 msgstr ""
 
-#: ../../mod/settings.php:1003
+#: ../../mod/settings.php:1004
 msgid "Advanced Expiration"
 msgstr ""
 
-#: ../../mod/settings.php:1004
+#: ../../mod/settings.php:1005
 msgid "Expire posts:"
 msgstr ""
 
-#: ../../mod/settings.php:1005
+#: ../../mod/settings.php:1006
 msgid "Expire personal notes:"
 msgstr ""
 
-#: ../../mod/settings.php:1006
+#: ../../mod/settings.php:1007
 msgid "Expire starred posts:"
 msgstr ""
 
-#: ../../mod/settings.php:1007
+#: ../../mod/settings.php:1008
 msgid "Expire photos:"
 msgstr ""
 
-#: ../../mod/settings.php:1008
+#: ../../mod/settings.php:1009
 msgid "Only expire posts by others:"
 msgstr ""
 
-#: ../../mod/settings.php:1015
+#: ../../mod/settings.php:1016
 msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1023
+#: ../../mod/settings.php:1024
 msgid "Password Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1024
+#: ../../mod/settings.php:1025
 msgid "New Password:"
 msgstr ""
 
-#: ../../mod/settings.php:1025
+#: ../../mod/settings.php:1026
 msgid "Confirm:"
 msgstr ""
 
-#: ../../mod/settings.php:1025
+#: ../../mod/settings.php:1026
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/settings.php:1029
+#: ../../mod/settings.php:1030
 msgid "Basic Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1030 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:1031 ../../include/profile_advanced.php:15
 msgid "Full Name:"
 msgstr ""
 
-#: ../../mod/settings.php:1031
+#: ../../mod/settings.php:1032
 msgid "Email Address:"
 msgstr ""
 
-#: ../../mod/settings.php:1032
+#: ../../mod/settings.php:1033
 msgid "Your Timezone:"
 msgstr ""
 
-#: ../../mod/settings.php:1033
+#: ../../mod/settings.php:1034
 msgid "Default Post Location:"
 msgstr ""
 
-#: ../../mod/settings.php:1034
+#: ../../mod/settings.php:1035
 msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../mod/settings.php:1037
+#: ../../mod/settings.php:1038
 msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1039
+#: ../../mod/settings.php:1040
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/settings.php:1039 ../../mod/settings.php:1058
+#: ../../mod/settings.php:1040 ../../mod/settings.php:1059
 msgid "(to prevent spam abuse)"
 msgstr ""
 
-#: ../../mod/settings.php:1040
+#: ../../mod/settings.php:1041
 msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:1041
+#: ../../mod/settings.php:1042
 msgid "(click to open/close)"
 msgstr ""
 
-#: ../../mod/settings.php:1058
+#: ../../mod/settings.php:1059
 msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: ../../mod/settings.php:1061
+#: ../../mod/settings.php:1062
 msgid "Notification Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1062
+#: ../../mod/settings.php:1063
 msgid "By default post a status message when:"
 msgstr ""
 
-#: ../../mod/settings.php:1063
+#: ../../mod/settings.php:1064
 msgid "accepting a friend request"
 msgstr ""
 
-#: ../../mod/settings.php:1064
+#: ../../mod/settings.php:1065
 msgid "joining a forum/community"
 msgstr ""
 
-#: ../../mod/settings.php:1065
+#: ../../mod/settings.php:1066
 msgid "making an <em>interesting</em> profile change"
 msgstr ""
 
-#: ../../mod/settings.php:1066
+#: ../../mod/settings.php:1067
 msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../mod/settings.php:1067
+#: ../../mod/settings.php:1068
 msgid "You receive an introduction"
 msgstr ""
 
-#: ../../mod/settings.php:1068
+#: ../../mod/settings.php:1069
 msgid "Your introductions are confirmed"
 msgstr ""
 
-#: ../../mod/settings.php:1069
+#: ../../mod/settings.php:1070
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../mod/settings.php:1070
+#: ../../mod/settings.php:1071
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../mod/settings.php:1071
+#: ../../mod/settings.php:1072
 msgid "You receive a private message"
 msgstr ""
 
-#: ../../mod/settings.php:1072
+#: ../../mod/settings.php:1073
 msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../mod/settings.php:1073
+#: ../../mod/settings.php:1074
 msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../mod/settings.php:1074
+#: ../../mod/settings.php:1075
 msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: ../../mod/settings.php:1077
+#: ../../mod/settings.php:1078
 msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1078
+#: ../../mod/settings.php:1079
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
@@ -2762,7 +2762,7 @@ msgstr ""
 msgid "Invalid contact."
 msgstr ""
 
-#: ../../mod/notes.php:44 ../../boot.php:1755
+#: ../../mod/notes.php:44 ../../boot.php:1768
 msgid "Personal Notes"
 msgstr ""
 
@@ -2929,7 +2929,7 @@ msgstr ""
 #: ../../mod/newmember.php:32 ../../mod/profperm.php:103
 #: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7
 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50
-#: ../../boot.php:1731
+#: ../../boot.php:1744
 msgid "Profile"
 msgstr ""
 
@@ -3234,7 +3234,7 @@ msgstr ""
 msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:923
+#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:936
 msgid "Register"
 msgstr ""
 
@@ -3291,7 +3291,7 @@ msgid "Access denied."
 msgstr ""
 
 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90
-#: ../../include/nav.php:51 ../../boot.php:1738
+#: ../../include/nav.php:51 ../../boot.php:1751
 msgid "Photos"
 msgstr ""
 
@@ -3551,7 +3551,7 @@ msgstr ""
 msgid "Logs"
 msgstr ""
 
-#: ../../mod/admin.php:120 ../../include/nav.php:149
+#: ../../mod/admin.php:120 ../../include/nav.php:151
 msgid "Admin"
 msgstr ""
 
@@ -4180,7 +4180,7 @@ msgstr ""
 msgid "FTP Password"
 msgstr ""
 
-#: ../../mod/profile.php:21 ../../boot.php:1126
+#: ../../mod/profile.php:21 ../../boot.php:1139
 msgid "Requested profile is not available."
 msgstr ""
 
@@ -4586,23 +4586,23 @@ msgstr ""
 msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/profiles.php:700 ../../boot.php:1244
+#: ../../mod/profiles.php:700 ../../boot.php:1257
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/profiles.php:701 ../../boot.php:1245
+#: ../../mod/profiles.php:701 ../../boot.php:1258
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/profiles.php:712 ../../boot.php:1255
+#: ../../mod/profiles.php:712 ../../boot.php:1268
 msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/profiles.php:714 ../../boot.php:1258
+#: ../../mod/profiles.php:714 ../../boot.php:1271
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../mod/profiles.php:715 ../../boot.php:1259
+#: ../../mod/profiles.php:715 ../../boot.php:1272
 msgid "Edit visibility"
 msgstr ""
 
@@ -4624,7 +4624,7 @@ msgstr ""
 msgid "No potential page delegates located."
 msgstr ""
 
-#: ../../mod/delegate.php:121
+#: ../../mod/delegate.php:121 ../../include/nav.php:138
 msgid "Delegate Page Management"
 msgstr ""
 
@@ -4734,19 +4734,19 @@ msgstr ""
 
 #: ../../mod/directory.php:136
 #: ../../addon/forumdirectory/forumdirectory.php:158
-#: ../../include/profile_advanced.php:17 ../../boot.php:1280
+#: ../../include/profile_advanced.php:17 ../../boot.php:1293
 msgid "Gender:"
 msgstr ""
 
 #: ../../mod/directory.php:138
 #: ../../addon/forumdirectory/forumdirectory.php:160
-#: ../../include/profile_advanced.php:37 ../../boot.php:1283
+#: ../../include/profile_advanced.php:37 ../../boot.php:1296
 msgid "Status:"
 msgstr ""
 
 #: ../../mod/directory.php:140
 #: ../../addon/forumdirectory/forumdirectory.php:162
-#: ../../include/profile_advanced.php:48 ../../boot.php:1285
+#: ../../include/profile_advanced.php:48 ../../boot.php:1298
 msgid "Homepage:"
 msgstr ""
 
@@ -5632,7 +5632,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:949
+#: ../../include/nav.php:64 ../../boot.php:962
 #: ../../addon.old/communityhome/communityhome.php:28
 #: ../../addon.old/communityhome/communityhome.php:34
 #: ../../addon.old/communityhome/twillingham/communityhome.php:28
@@ -6240,8 +6240,8 @@ msgid "Extended calendar with CalDAV-support"
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:279
-#: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:464
-#: ../../include/enotify.php:28 ../../include/notifier.php:778
+#: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:468
+#: ../../include/enotify.php:28 ../../include/notifier.php:781
 #: ../../addon.old/dav/friendica/main.php:279
 #: ../../addon.old/dav/friendica/main.php:280
 msgid "noreply"
@@ -8256,11 +8256,11 @@ msgstr ""
 msgid "Ask me"
 msgstr ""
 
-#: ../../include/event.php:20 ../../include/bb2diaspora.php:396
+#: ../../include/event.php:20 ../../include/bb2diaspora.php:399
 msgid "Starts:"
 msgstr ""
 
-#: ../../include/event.php:30 ../../include/bb2diaspora.php:404
+#: ../../include/event.php:30 ../../include/bb2diaspora.php:407
 msgid "Finishes:"
 msgstr ""
 
@@ -8602,7 +8602,7 @@ msgstr ""
 msgid "Contacts not in any group"
 msgstr ""
 
-#: ../../include/nav.php:46 ../../boot.php:948
+#: ../../include/nav.php:46 ../../boot.php:961
 msgid "Logout"
 msgstr ""
 
@@ -8610,7 +8610,7 @@ msgstr ""
 msgid "End this session"
 msgstr ""
 
-#: ../../include/nav.php:49 ../../boot.php:1724
+#: ../../include/nav.php:49 ../../boot.php:1737
 msgid "Status"
 msgstr ""
 
@@ -8698,23 +8698,27 @@ msgstr ""
 msgid "Manage other pages"
 msgstr ""
 
-#: ../../include/nav.php:140 ../../boot.php:1238
+#: ../../include/nav.php:138
+msgid "Delegations"
+msgstr ""
+
+#: ../../include/nav.php:142 ../../boot.php:1251
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/nav.php:140
+#: ../../include/nav.php:142
 msgid "Manage/Edit Profiles"
 msgstr ""
 
-#: ../../include/nav.php:142
+#: ../../include/nav.php:144
 msgid "Manage/edit friends and contacts"
 msgstr ""
 
-#: ../../include/nav.php:149
+#: ../../include/nav.php:151
 msgid "Site setup and configuration"
 msgstr ""
 
-#: ../../include/nav.php:173
+#: ../../include/nav.php:175
 msgid "Nothing new here"
 msgstr ""
 
@@ -8858,19 +8862,26 @@ msgstr ""
 msgid "Happy Birthday %s"
 msgstr ""
 
-#: ../../include/onepoll.php:421
+#: ../../include/onepoll.php:439
 msgid "From: "
 msgstr ""
 
-#: ../../include/bbcode.php:202 ../../include/bbcode.php:423
+#: ../../include/bbcode.php:202 ../../include/bbcode.php:482
 msgid "Image/photo"
 msgstr ""
 
-#: ../../include/bbcode.php:388 ../../include/bbcode.php:408
+#: ../../include/bbcode.php:254
+#, php-format
+msgid ""
+"<span><a href=\"%s\">%s</a> wrote the following <a href=\"%s\">post</a>:</"
+"span>"
+msgstr ""
+
+#: ../../include/bbcode.php:447 ../../include/bbcode.php:467
 msgid "$1 wrote:"
 msgstr ""
 
-#: ../../include/bbcode.php:427 ../../include/bbcode.php:428
+#: ../../include/bbcode.php:487 ../../include/bbcode.php:488
 msgid "Encrypted content"
 msgstr ""
 
@@ -9521,109 +9532,109 @@ msgstr ""
 msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: ../../boot.php:607
+#: ../../boot.php:620
 msgid "Delete this item?"
 msgstr ""
 
-#: ../../boot.php:610
+#: ../../boot.php:623
 msgid "show fewer"
 msgstr ""
 
-#: ../../boot.php:819
+#: ../../boot.php:832
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:821
+#: ../../boot.php:834
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:922
+#: ../../boot.php:935
 msgid "Create a New Account"
 msgstr ""
 
-#: ../../boot.php:951
+#: ../../boot.php:964
 msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../boot.php:952
+#: ../../boot.php:965
 msgid "Password: "
 msgstr ""
 
-#: ../../boot.php:953
+#: ../../boot.php:966
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:956
+#: ../../boot.php:969
 msgid "Or login using OpenID: "
 msgstr ""
 
-#: ../../boot.php:962
+#: ../../boot.php:975
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:1087
+#: ../../boot.php:1100
 msgid "Requested account is not available."
 msgstr ""
 
-#: ../../boot.php:1164
+#: ../../boot.php:1177
 msgid "Edit profile"
 msgstr ""
 
-#: ../../boot.php:1230
+#: ../../boot.php:1243
 msgid "Message"
 msgstr ""
 
-#: ../../boot.php:1238
+#: ../../boot.php:1251
 msgid "Manage/edit profiles"
 msgstr ""
 
-#: ../../boot.php:1352 ../../boot.php:1438
+#: ../../boot.php:1365 ../../boot.php:1451
 msgid "g A l F d"
 msgstr ""
 
-#: ../../boot.php:1353 ../../boot.php:1439
+#: ../../boot.php:1366 ../../boot.php:1452
 msgid "F d"
 msgstr ""
 
-#: ../../boot.php:1398 ../../boot.php:1479
+#: ../../boot.php:1411 ../../boot.php:1492
 msgid "[today]"
 msgstr ""
 
-#: ../../boot.php:1410
+#: ../../boot.php:1423
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../boot.php:1411
+#: ../../boot.php:1424
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../boot.php:1472
+#: ../../boot.php:1485
 msgid "[No description]"
 msgstr ""
 
-#: ../../boot.php:1490
+#: ../../boot.php:1503
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../boot.php:1491
+#: ../../boot.php:1504
 msgid "Events this week:"
 msgstr ""
 
-#: ../../boot.php:1727
+#: ../../boot.php:1740
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../boot.php:1734
+#: ../../boot.php:1747
 msgid "Profile Details"
 msgstr ""
 
-#: ../../boot.php:1751
+#: ../../boot.php:1764
 msgid "Events and Calendar"
 msgstr ""
 
-#: ../../boot.php:1758
+#: ../../boot.php:1771
 msgid "Only You Can See This"
 msgstr ""