add sample nginx config from Olaf Conradi to mods directory

[friendica.git] / util / messages.po

diff --git a/util/messages.po b/util/messages.po
index f770b636fab73eaa00f04f14ca96ee233c1e86fb..5518cf384ea29074c1ad857eb9aeac7878da5631 100644 (file)
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1486\n"
+"Project-Id-Version: 3.1.1555\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-10-04 10:00-0700\n"
+"POT-Creation-Date: 2012-12-12 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"
@@ -23,6 +23,7 @@ msgstr ""
 
 #: ../../mod/update_notes.php:41 ../../mod/update_community.php:18
 #: ../../mod/update_network.php:22 ../../mod/update_profile.php:41
+#: ../../mod/update_display.php:22
 msgid "[Embedded content - reload page to view]"
 msgstr ""
 
@@ -36,30 +37,33 @@ msgstr ""
 
 #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:55
 #: ../../mod/fsuggest.php:78 ../../mod/events.php:140 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/photos.php:128 ../../mod/photos.php:990
+#: ../../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:146
-#: ../../mod/settings.php:86 ../../mod/settings.php:525
-#: ../../mod/settings.php:530 ../../mod/manage.php:87 ../../mod/network.php:6
-#: ../../mod/notes.php:20 ../../mod/wallmessage.php:9
+#: ../../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/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
 #: ../../mod/group.php:19 ../../mod/viewcontacts.php:22
-#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:126
-#: ../../mod/item.php:142 ../../mod/mood.php:114
+#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:139
+#: ../../mod/item.php:155 ../../mod/mood.php:114
 #: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169
 #: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193
-#: ../../mod/message.php:38 ../../mod/message.php:168
+#: ../../mod/message.php:38 ../../mod/message.php:172
 #: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25
-#: ../../mod/wall_upload.php:64 ../../mod/follow.php:9
-#: ../../mod/display.php:141 ../../mod/profiles.php:7
-#: ../../mod/profiles.php:424 ../../mod/delegate.php:6
+#: ../../mod/wall_upload.php:66 ../../mod/follow.php:9
+#: ../../mod/display.php:165 ../../mod/profiles.php:7
+#: ../../mod/profiles.php:431 ../../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:510
 #: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:159
 #: ../../addon/fbpost/fbpost.php:165
-#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3913
-#: ../../index.php:317
+#: ../../addon/dav/friendica/layout.fnk.php:354 ../../include/items.php:3977
+#: ../../index.php:333 ../../addon.old/facebook/facebook.php:510
+#: ../../addon.old/facebook/facebook.php:516
+#: ../../addon.old/fbpost/fbpost.php:159 ../../addon.old/fbpost/fbpost.php:165
+#: ../../addon.old/dav/friendica/layout.fnk.php:354
 msgid "Permission denied."
 msgstr ""
 
@@ -88,8 +92,8 @@ msgstr ""
 msgid "Return to contact editor"
 msgstr ""
 
-#: ../../mod/crepair.php:148 ../../mod/settings.php:545
-#: ../../mod/settings.php:571 ../../mod/admin.php:692 ../../mod/admin.php:702
+#: ../../mod/crepair.php:148 ../../mod/settings.php:561
+#: ../../mod/settings.php:587 ../../mod/admin.php:695 ../../mod/admin.php:705
 msgid "Name"
 msgstr ""
 
@@ -126,29 +130,31 @@ msgid "New photo from this URL"
 msgstr ""
 
 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
-#: ../../mod/events.php:455 ../../mod/photos.php:1023
-#: ../../mod/photos.php:1099 ../../mod/photos.php:1362
-#: ../../mod/photos.php:1402 ../../mod/photos.php:1445
-#: ../../mod/photos.php:1477 ../../mod/install.php:246
+#: ../../mod/events.php:455 ../../mod/photos.php:1028
+#: ../../mod/photos.php:1100 ../../mod/photos.php:1363
+#: ../../mod/photos.php:1403 ../../mod/photos.php:1447
+#: ../../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:348
-#: ../../mod/settings.php:543 ../../mod/settings.php:697
-#: ../../mod/settings.php:769 ../../mod/settings.php:976
-#: ../../mod/group.php:85 ../../mod/mood.php:137 ../../mod/message.php:294
-#: ../../mod/message.php:480 ../../mod/admin.php:443 ../../mod/admin.php:689
-#: ../../mod/admin.php:826 ../../mod/admin.php:1025 ../../mod/admin.php:1112
-#: ../../mod/profiles.php:594 ../../mod/invite.php:119
-#: ../../addon/fromgplus/fromgplus.php:40
+#: ../../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/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
+#: ../../mod/invite.php:119 ../../addon/fromgplus/fromgplus.php:40
 #: ../../addon/facebook/facebook.php:619
-#: ../../addon/snautofollow/snautofollow.php:64 ../../addon/bg/bg.php:90
+#: ../../addon/snautofollow/snautofollow.php:64
 #: ../../addon/fbpost/fbpost.php:226 ../../addon/yourls/yourls.php:76
 #: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:88
 #: ../../addon/page/page.php:211 ../../addon/planets/planets.php:158
 #: ../../addon/uhremotestorage/uhremotestorage.php:89
 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
-#: ../../addon/drpost/drpost.php:110 ../../addon/startpage/startpage.php:92
-#: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41
-#: ../../addon/forumlist/forumlist.php:164
+#: ../../addon/remote_permissions/remote_permissions.php:47
+#: ../../addon/remote_permissions/remote_permissions.php:195
+#: ../../addon/startpage/startpage.php:92
+#: ../../addon/geonames/geonames.php:187
+#: ../../addon/forumlist/forumlist.php:175
 #: ../../addon/impressum/impressum.php:83
 #: ../../addon/notimeline/notimeline.php:64 ../../addon/blockem/blockem.php:57
 #: ../../addon/qcomment/qcomment.php:61
@@ -165,35 +171,80 @@ msgstr ""
 #: ../../addon/statusnet/statusnet.php:318
 #: ../../addon/statusnet/statusnet.php:325
 #: ../../addon/statusnet/statusnet.php:353
-#: ../../addon/statusnet/statusnet.php:576 ../../addon/tumblr/tumblr.php:90
+#: ../../addon/statusnet/statusnet.php:685 ../../addon/tumblr/tumblr.php:90
 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88
 #: ../../addon/wppost/wppost.php:110 ../../addon/showmore/showmore.php:48
 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180
-#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:394
+#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:506
 #: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77
 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103
 #: ../../view/theme/cleanzero/config.php:80
-#: ../../view/theme/diabook/theme.php:757
-#: ../../view/theme/diabook/config.php:190
+#: ../../view/theme/diabook/theme.php:642
+#: ../../view/theme/diabook/config.php:152
 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70
-#: ../../object/Item.php:558
+#: ../../object/Item.php:577 ../../addon.old/fromgplus/fromgplus.php:40
+#: ../../addon.old/facebook/facebook.php:619
+#: ../../addon.old/snautofollow/snautofollow.php:64
+#: ../../addon.old/bg/bg.php:90 ../../addon.old/fbpost/fbpost.php:226
+#: ../../addon.old/yourls/yourls.php:76 ../../addon.old/ljpost/ljpost.php:93
+#: ../../addon.old/nsfw/nsfw.php:88 ../../addon.old/page/page.php:211
+#: ../../addon.old/planets/planets.php:158
+#: ../../addon.old/uhremotestorage/uhremotestorage.php:89
+#: ../../addon.old/randplace/randplace.php:177
+#: ../../addon.old/dwpost/dwpost.php:93 ../../addon.old/drpost/drpost.php:110
+#: ../../addon.old/startpage/startpage.php:92
+#: ../../addon.old/geonames/geonames.php:187
+#: ../../addon.old/oembed.old/oembed.php:41
+#: ../../addon.old/forumlist/forumlist.php:175
+#: ../../addon.old/impressum/impressum.php:83
+#: ../../addon.old/notimeline/notimeline.php:64
+#: ../../addon.old/blockem/blockem.php:57
+#: ../../addon.old/qcomment/qcomment.php:61
+#: ../../addon.old/openstreetmap/openstreetmap.php:70
+#: ../../addon.old/group_text/group_text.php:84
+#: ../../addon.old/libravatar/libravatar.php:99
+#: ../../addon.old/libertree/libertree.php:90
+#: ../../addon.old/altpager/altpager.php:87
+#: ../../addon.old/mathjax/mathjax.php:42
+#: ../../addon.old/editplain/editplain.php:84
+#: ../../addon.old/blackout/blackout.php:98
+#: ../../addon.old/gravatar/gravatar.php:95
+#: ../../addon.old/pageheader/pageheader.php:55
+#: ../../addon.old/ijpost/ijpost.php:93
+#: ../../addon.old/jappixmini/jappixmini.php:307
+#: ../../addon.old/statusnet/statusnet.php:278
+#: ../../addon.old/statusnet/statusnet.php:292
+#: ../../addon.old/statusnet/statusnet.php:318
+#: ../../addon.old/statusnet/statusnet.php:325
+#: ../../addon.old/statusnet/statusnet.php:353
+#: ../../addon.old/statusnet/statusnet.php:576
+#: ../../addon.old/tumblr/tumblr.php:90
+#: ../../addon.old/numfriends/numfriends.php:85
+#: ../../addon.old/gnot/gnot.php:88 ../../addon.old/wppost/wppost.php:110
+#: ../../addon.old/showmore/showmore.php:48 ../../addon.old/piwik/piwik.php:89
+#: ../../addon.old/twitter/twitter.php:180
+#: ../../addon.old/twitter/twitter.php:209
+#: ../../addon.old/twitter/twitter.php:394 ../../addon.old/irc/irc.php:55
+#: ../../addon.old/fromapp/fromapp.php:77
+#: ../../addon.old/blogger/blogger.php:102
+#: ../../addon.old/posterous/posterous.php:103
 msgid "Submit"
 msgstr ""
 
-#: ../../mod/help.php:30
+#: ../../mod/help.php:79
 msgid "Help:"
 msgstr ""
 
-#: ../../mod/help.php:34 ../../addon/dav/friendica/layout.fnk.php:225
-#: ../../include/nav.php:86
+#: ../../mod/help.php:84 ../../addon/dav/friendica/layout.fnk.php:225
+#: ../../include/nav.php:86 ../../addon.old/dav/friendica/layout.fnk.php:225
 msgid "Help"
 msgstr ""
 
-#: ../../mod/help.php:38 ../../index.php:226
+#: ../../mod/help.php:90 ../../index.php:218
 msgid "Not Found"
 msgstr ""
 
-#: ../../mod/help.php:41 ../../index.php:229
+#: ../../mod/help.php:93 ../../index.php:221
 msgid "Page not found."
 msgstr ""
 
@@ -231,12 +282,12 @@ msgstr ""
 msgid "Edit event"
 msgstr ""
 
-#: ../../mod/events.php:323 ../../include/text.php:1187
+#: ../../mod/events.php:323 ../../include/text.php:1190
 msgid "link to source"
 msgstr ""
 
-#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:131
-#: ../../include/nav.php:52 ../../boot.php:1700
+#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91
+#: ../../include/nav.php:52 ../../boot.php:1748
 msgid "Events"
 msgstr ""
 
@@ -245,11 +296,13 @@ msgid "Create New Event"
 msgstr ""
 
 #: ../../mod/events.php:349 ../../addon/dav/friendica/layout.fnk.php:263
+#: ../../addon.old/dav/friendica/layout.fnk.php:263
 msgid "Previous"
 msgstr ""
 
 #: ../../mod/events.php:350 ../../mod/install.php:205
 #: ../../addon/dav/friendica/layout.fnk.php:266
+#: ../../addon.old/dav/friendica/layout.fnk.php:266
 msgid "Next"
 msgstr ""
 
@@ -291,8 +344,9 @@ msgid "Description:"
 msgstr ""
 
 #: ../../mod/events.php:448 ../../mod/directory.php:134
+#: ../../addon/forumdirectory/forumdirectory.php:156
 #: ../../include/event.php:40 ../../include/bb2diaspora.php:412
-#: ../../boot.php:1236
+#: ../../boot.php:1278
 msgid "Location:"
 msgstr ""
 
@@ -304,10 +358,11 @@ msgstr ""
 msgid "Share this event"
 msgstr ""
 
-#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:142
-#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544
-#: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45
-#: ../../include/conversation.php:948
+#: ../../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
+#: ../../include/conversation.php:1009
+#: ../../addon.old/js_upload/js_upload.php:45
 msgid "Cancel"
 msgstr ""
 
@@ -325,12 +380,13 @@ msgstr ""
 
 #: ../../mod/tagrm.php:93 ../../mod/delegate.php:130
 #: ../../addon/dav/common/wdcal_edit.inc.php:468
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:468
 msgid "Remove"
 msgstr ""
 
 #: ../../mod/dfrn_poll.php:99 ../../mod/dfrn_poll.php:530
 #, php-format
-msgid "%s welcomes %s"
+msgid "%1$s welcomes %2$s"
 msgstr ""
 
 #: ../../mod/api.php:76 ../../mod/api.php:102
@@ -352,283 +408,276 @@ msgid ""
 msgstr ""
 
 #: ../../mod/api.php:105 ../../mod/dfrn_request.php:835
-#: ../../mod/settings.php:892 ../../mod/settings.php:898
-#: ../../mod/settings.php:906 ../../mod/settings.php:910
-#: ../../mod/settings.php:915 ../../mod/settings.php:921
-#: ../../mod/settings.php:927 ../../mod/settings.php:933
-#: ../../mod/settings.php:963 ../../mod/settings.php:964
-#: ../../mod/settings.php:965 ../../mod/settings.php:966
-#: ../../mod/settings.php:967 ../../mod/register.php:236
-#: ../../mod/profiles.php:574
+#: ../../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/profiles.php:584
 msgid "Yes"
 msgstr ""
 
 #: ../../mod/api.php:106 ../../mod/dfrn_request.php:836
-#: ../../mod/settings.php:892 ../../mod/settings.php:898
-#: ../../mod/settings.php:906 ../../mod/settings.php:910
-#: ../../mod/settings.php:915 ../../mod/settings.php:921
-#: ../../mod/settings.php:927 ../../mod/settings.php:933
-#: ../../mod/settings.php:963 ../../mod/settings.php:964
-#: ../../mod/settings.php:965 ../../mod/settings.php:966
-#: ../../mod/settings.php:967 ../../mod/register.php:237
-#: ../../mod/profiles.php:575
+#: ../../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/profiles.php:585
 msgid "No"
 msgstr ""
 
-#: ../../mod/photos.php:46 ../../boot.php:1693
+#: ../../mod/photos.php:51 ../../boot.php:1741
 msgid "Photo Albums"
 msgstr ""
 
-#: ../../mod/photos.php:54 ../../mod/photos.php:149 ../../mod/photos.php:1004
-#: ../../mod/photos.php:1091 ../../mod/photos.php:1106
-#: ../../mod/photos.php:1556 ../../mod/photos.php:1568
+#: ../../mod/photos.php:59 ../../mod/photos.php:154 ../../mod/photos.php:1009
+#: ../../mod/photos.php:1092 ../../mod/photos.php:1107
+#: ../../mod/photos.php:1562 ../../mod/photos.php:1574
 #: ../../addon/communityhome/communityhome.php:110
-#: ../../view/theme/diabook/theme.php:598
+#: ../../view/theme/diabook/theme.php:492
+#: ../../addon.old/communityhome/communityhome.php:110
 msgid "Contact Photos"
 msgstr ""
 
-#: ../../mod/photos.php:61 ../../mod/photos.php:1122 ../../mod/photos.php:1606
+#: ../../mod/photos.php:66 ../../mod/photos.php:1123 ../../mod/photos.php:1612
 msgid "Upload New Photos"
 msgstr ""
 
-#: ../../mod/photos.php:74 ../../mod/settings.php:23
+#: ../../mod/photos.php:79 ../../mod/settings.php:23
 msgid "everybody"
 msgstr ""
 
-#: ../../mod/photos.php:138
+#: ../../mod/photos.php:143
 msgid "Contact information unavailable"
 msgstr ""
 
-#: ../../mod/photos.php:149 ../../mod/photos.php:671 ../../mod/photos.php:1091
-#: ../../mod/photos.php:1106 ../../mod/profile_photo.php:74
+#: ../../mod/photos.php:154 ../../mod/photos.php:676 ../../mod/photos.php:1092
+#: ../../mod/photos.php:1107 ../../mod/profile_photo.php:74
 #: ../../mod/profile_photo.php:81 ../../mod/profile_photo.php:88
 #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
 #: ../../mod/profile_photo.php:305
 #: ../../addon/communityhome/communityhome.php:111
-#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:324
+#: ../../view/theme/diabook/theme.php:493 ../../include/user.php:324
 #: ../../include/user.php:331 ../../include/user.php:338
+#: ../../addon.old/communityhome/communityhome.php:111
 msgid "Profile Photos"
 msgstr ""
 
-#: ../../mod/photos.php:159
+#: ../../mod/photos.php:164
 msgid "Album not found."
 msgstr ""
 
-#: ../../mod/photos.php:177 ../../mod/photos.php:1100
+#: ../../mod/photos.php:182 ../../mod/photos.php:1101
 msgid "Delete Album"
 msgstr ""
 
-#: ../../mod/photos.php:240 ../../mod/photos.php:1363
+#: ../../mod/photos.php:245 ../../mod/photos.php:1364
 msgid "Delete Photo"
 msgstr ""
 
-#: ../../mod/photos.php:602
-msgid "was tagged in a"
-msgstr ""
-
-#: ../../mod/photos.php:602 ../../mod/like.php:145 ../../mod/subthread.php:87
-#: ../../mod/tagger.php:62 ../../addon/communityhome/communityhome.php:163
-#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1439
-#: ../../include/diaspora.php:1835 ../../include/conversation.php:125
-#: ../../include/conversation.php:253
-msgid "photo"
+#: ../../mod/photos.php:607
+#, php-format
+msgid "%1$s was tagged in %2$s by %3$s"
 msgstr ""
 
-#: ../../mod/photos.php:602
-msgid "by"
+#: ../../mod/photos.php:607
+msgid "a photo"
 msgstr ""
 
-#: ../../mod/photos.php:707 ../../addon/js_upload/js_upload.php:315
+#: ../../mod/photos.php:712 ../../addon/js_upload/js_upload.php:321
+#: ../../addon.old/js_upload/js_upload.php:315
 msgid "Image exceeds size limit of "
 msgstr ""
 
-#: ../../mod/photos.php:715
+#: ../../mod/photos.php:720
 msgid "Image file is empty."
 msgstr ""
 
-#: ../../mod/photos.php:747 ../../mod/profile_photo.php:153
-#: ../../mod/wall_upload.php:110
+#: ../../mod/photos.php:752 ../../mod/profile_photo.php:153
+#: ../../mod/wall_upload.php:112
 msgid "Unable to process image."
 msgstr ""
 
-#: ../../mod/photos.php:774 ../../mod/profile_photo.php:301
-#: ../../mod/wall_upload.php:136
+#: ../../mod/photos.php:779 ../../mod/profile_photo.php:301
+#: ../../mod/wall_upload.php:138
 msgid "Image upload failed."
 msgstr ""
 
-#: ../../mod/photos.php:860 ../../mod/community.php:18
+#: ../../mod/photos.php:865 ../../mod/community.php:18
 #: ../../mod/dfrn_request.php:760 ../../mod/viewcontacts.php:17
-#: ../../mod/display.php:7 ../../mod/search.php:86 ../../mod/directory.php:31
+#: ../../mod/display.php:7 ../../mod/search.php:89 ../../mod/directory.php:31
+#: ../../addon/forumdirectory/forumdirectory.php:53
 msgid "Public access denied."
 msgstr ""
 
-#: ../../mod/photos.php:870
+#: ../../mod/photos.php:875
 msgid "No photos selected"
 msgstr ""
 
-#: ../../mod/photos.php:971
+#: ../../mod/photos.php:976
 msgid "Access to this item is restricted."
 msgstr ""
 
-#: ../../mod/photos.php:1033
+#: ../../mod/photos.php:1037
 #, php-format
 msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
 msgstr ""
 
-#: ../../mod/photos.php:1036
-#, php-format
-msgid "You have used %1$.2f Mbytes of photo storage."
-msgstr ""
-
-#: ../../mod/photos.php:1042
+#: ../../mod/photos.php:1043
 msgid "Upload Photos"
 msgstr ""
 
-#: ../../mod/photos.php:1046 ../../mod/photos.php:1095
+#: ../../mod/photos.php:1047 ../../mod/photos.php:1096
 msgid "New album name: "
 msgstr ""
 
-#: ../../mod/photos.php:1047
+#: ../../mod/photos.php:1048
 msgid "or existing album name: "
 msgstr ""
 
-#: ../../mod/photos.php:1048
+#: ../../mod/photos.php:1049
 msgid "Do not show a status post for this upload"
 msgstr ""
 
-#: ../../mod/photos.php:1050 ../../mod/photos.php:1358
+#: ../../mod/photos.php:1051 ../../mod/photos.php:1359
 msgid "Permissions"
 msgstr ""
 
-#: ../../mod/photos.php:1110
+#: ../../mod/photos.php:1111
 msgid "Edit Album"
 msgstr ""
 
-#: ../../mod/photos.php:1116
+#: ../../mod/photos.php:1117
 msgid "Show Newest First"
 msgstr ""
 
-#: ../../mod/photos.php:1118
+#: ../../mod/photos.php:1119
 msgid "Show Oldest First"
 msgstr ""
 
-#: ../../mod/photos.php:1142 ../../mod/photos.php:1589
+#: ../../mod/photos.php:1143 ../../mod/photos.php:1595
 msgid "View Photo"
 msgstr ""
 
-#: ../../mod/photos.php:1177
+#: ../../mod/photos.php:1178
 msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: ../../mod/photos.php:1179
+#: ../../mod/photos.php:1180
 msgid "Photo not available"
 msgstr ""
 
-#: ../../mod/photos.php:1235
+#: ../../mod/photos.php:1236
 msgid "View photo"
 msgstr ""
 
-#: ../../mod/photos.php:1235
+#: ../../mod/photos.php:1236
 msgid "Edit photo"
 msgstr ""
 
-#: ../../mod/photos.php:1236
+#: ../../mod/photos.php:1237
 msgid "Use as profile photo"
 msgstr ""
 
-#: ../../mod/photos.php:1242 ../../mod/content.php:603
-#: ../../object/Item.php:103
+#: ../../mod/photos.php:1243 ../../mod/content.php:603
+#: ../../object/Item.php:105
 msgid "Private Message"
 msgstr ""
 
-#: ../../mod/photos.php:1261
+#: ../../mod/photos.php:1262
 msgid "View Full Size"
 msgstr ""
 
-#: ../../mod/photos.php:1335
+#: ../../mod/photos.php:1336
 msgid "Tags: "
 msgstr ""
 
-#: ../../mod/photos.php:1338
+#: ../../mod/photos.php:1339
 msgid "[Remove any tag]"
 msgstr ""
 
-#: ../../mod/photos.php:1348
+#: ../../mod/photos.php:1349
 msgid "Rotate CW (right)"
 msgstr ""
 
-#: ../../mod/photos.php:1349
+#: ../../mod/photos.php:1350
 msgid "Rotate CCW (left)"
 msgstr ""
 
-#: ../../mod/photos.php:1351
+#: ../../mod/photos.php:1352
 msgid "New album name"
 msgstr ""
 
-#: ../../mod/photos.php:1354
+#: ../../mod/photos.php:1355
 msgid "Caption"
 msgstr ""
 
-#: ../../mod/photos.php:1356
+#: ../../mod/photos.php:1357
 msgid "Add a Tag"
 msgstr ""
 
-#: ../../mod/photos.php:1360
+#: ../../mod/photos.php:1361
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: ../../mod/photos.php:1380 ../../mod/content.php:667
-#: ../../object/Item.php:196
+#: ../../mod/photos.php:1381 ../../mod/content.php:667
+#: ../../object/Item.php:203
 msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1381 ../../mod/content.php:668
-#: ../../object/Item.php:197
+#: ../../mod/photos.php:1382 ../../mod/content.php:668
+#: ../../object/Item.php:204
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1382 ../../include/conversation.php:909
+#: ../../mod/photos.php:1383 ../../include/conversation.php:969
 msgid "Share"
 msgstr ""
 
-#: ../../mod/photos.php:1383 ../../mod/editpost.php:118
-#: ../../mod/content.php:482 ../../mod/content.php:845
-#: ../../mod/wallmessage.php:152 ../../mod/message.php:293
-#: ../../mod/message.php:481 ../../include/conversation.php:573
-#: ../../include/conversation.php:928 ../../object/Item.php:258
+#: ../../mod/photos.php:1384 ../../mod/editpost.php:121
+#: ../../mod/content.php:482 ../../mod/content.php:848
+#: ../../mod/wallmessage.php:152 ../../mod/message.php:300
+#: ../../mod/message.php:488 ../../include/conversation.php:624
+#: ../../include/conversation.php:988 ../../object/Item.php:270
 msgid "Please wait"
 msgstr ""
 
-#: ../../mod/photos.php:1399 ../../mod/photos.php:1442
-#: ../../mod/photos.php:1474 ../../mod/content.php:690
-#: ../../object/Item.php:555
+#: ../../mod/photos.php:1400 ../../mod/photos.php:1444
+#: ../../mod/photos.php:1516 ../../mod/content.php:690
+#: ../../object/Item.php:574
 msgid "This is you"
 msgstr ""
 
-#: ../../mod/photos.php:1401 ../../mod/photos.php:1444
-#: ../../mod/photos.php:1476 ../../mod/content.php:692 ../../boot.php:584
-#: ../../object/Item.php:557
+#: ../../mod/photos.php:1402 ../../mod/photos.php:1446
+#: ../../mod/photos.php:1518 ../../mod/content.php:692 ../../boot.php:608
+#: ../../object/Item.php:267 ../../object/Item.php:576
 msgid "Comment"
 msgstr ""
 
-#: ../../mod/photos.php:1403 ../../mod/editpost.php:139
-#: ../../mod/content.php:702 ../../include/conversation.php:946
-#: ../../object/Item.php:567
+#: ../../mod/photos.php:1404 ../../mod/photos.php:1448
+#: ../../mod/photos.php:1520 ../../mod/editpost.php:142
+#: ../../mod/content.php:702 ../../include/conversation.php:1006
+#: ../../object/Item.php:586
 msgid "Preview"
 msgstr ""
 
-#: ../../mod/photos.php:1505 ../../mod/content.php:439
-#: ../../mod/content.php:723 ../../mod/settings.php:606
-#: ../../mod/group.php:168 ../../mod/admin.php:696
-#: ../../include/conversation.php:518 ../../object/Item.php:117
+#: ../../mod/photos.php:1488 ../../mod/content.php:439
+#: ../../mod/content.php:724 ../../mod/settings.php:622
+#: ../../mod/group.php:168 ../../mod/admin.php:699
+#: ../../include/conversation.php:569 ../../object/Item.php:119
 msgid "Delete"
 msgstr ""
 
-#: ../../mod/photos.php:1595
+#: ../../mod/photos.php:1601
 msgid "View Album"
 msgstr ""
 
-#: ../../mod/photos.php:1604
+#: ../../mod/photos.php:1610
 msgid "Recent Photos"
 msgstr ""
 
@@ -636,13 +685,13 @@ msgstr ""
 msgid "Not available."
 msgstr ""
 
-#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:133
+#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:93
 #: ../../include/nav.php:101
 msgid "Community"
 msgstr ""
 
-#: ../../mod/community.php:63 ../../mod/community.php:88
-#: ../../mod/search.php:161 ../../mod/search.php:187
+#: ../../mod/community.php:61 ../../mod/community.php:86
+#: ../../mod/search.php:162 ../../mod/search.php:188
 msgid "No results."
 msgstr ""
 
@@ -682,100 +731,100 @@ msgstr ""
 msgid "Item not found"
 msgstr ""
 
-#: ../../mod/editpost.php:36
+#: ../../mod/editpost.php:39
 msgid "Edit post"
 msgstr ""
 
-#: ../../mod/editpost.php:88 ../../include/conversation.php:895
+#: ../../mod/editpost.php:91 ../../include/conversation.php:955
 msgid "Post to Email"
 msgstr ""
 
-#: ../../mod/editpost.php:103 ../../mod/content.php:710
-#: ../../mod/settings.php:605 ../../object/Item.php:107
+#: ../../mod/editpost.php:106 ../../mod/content.php:711
+#: ../../mod/settings.php:621 ../../object/Item.php:109
 msgid "Edit"
 msgstr ""
 
-#: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
-#: ../../mod/message.php:291 ../../mod/message.php:478
-#: ../../include/conversation.php:910
+#: ../../mod/editpost.php:107 ../../mod/wallmessage.php:150
+#: ../../mod/message.php:298 ../../mod/message.php:485
+#: ../../include/conversation.php:970
 msgid "Upload photo"
 msgstr ""
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:911
+#: ../../mod/editpost.php:108 ../../include/conversation.php:971
 msgid "upload photo"
 msgstr ""
 
-#: ../../mod/editpost.php:106 ../../include/conversation.php:912
+#: ../../mod/editpost.php:109 ../../include/conversation.php:972
 msgid "Attach file"
 msgstr ""
 
-#: ../../mod/editpost.php:107 ../../include/conversation.php:913
+#: ../../mod/editpost.php:110 ../../include/conversation.php:973
 msgid "attach file"
 msgstr ""
 
-#: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151
-#: ../../mod/message.php:292 ../../mod/message.php:479
-#: ../../include/conversation.php:914
+#: ../../mod/editpost.php:111 ../../mod/wallmessage.php:151
+#: ../../mod/message.php:299 ../../mod/message.php:486
+#: ../../include/conversation.php:974
 msgid "Insert web link"
 msgstr ""
 
-#: ../../mod/editpost.php:109 ../../include/conversation.php:915
+#: ../../mod/editpost.php:112 ../../include/conversation.php:975
 msgid "web link"
 msgstr ""
 
-#: ../../mod/editpost.php:110 ../../include/conversation.php:916
+#: ../../mod/editpost.php:113 ../../include/conversation.php:976
 msgid "Insert video link"
 msgstr ""
 
-#: ../../mod/editpost.php:111 ../../include/conversation.php:917
+#: ../../mod/editpost.php:114 ../../include/conversation.php:977
 msgid "video link"
 msgstr ""
 
-#: ../../mod/editpost.php:112 ../../include/conversation.php:918
+#: ../../mod/editpost.php:115 ../../include/conversation.php:978
 msgid "Insert audio link"
 msgstr ""
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:919
+#: ../../mod/editpost.php:116 ../../include/conversation.php:979
 msgid "audio link"
 msgstr ""
 
-#: ../../mod/editpost.php:114 ../../include/conversation.php:920
+#: ../../mod/editpost.php:117 ../../include/conversation.php:980
 msgid "Set your location"
 msgstr ""
 
-#: ../../mod/editpost.php:115 ../../include/conversation.php:921
+#: ../../mod/editpost.php:118 ../../include/conversation.php:981
 msgid "set location"
 msgstr ""
 
-#: ../../mod/editpost.php:116 ../../include/conversation.php:922
+#: ../../mod/editpost.php:119 ../../include/conversation.php:982
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/editpost.php:117 ../../include/conversation.php:923
+#: ../../mod/editpost.php:120 ../../include/conversation.php:983
 msgid "clear location"
 msgstr ""
 
-#: ../../mod/editpost.php:119 ../../include/conversation.php:929
+#: ../../mod/editpost.php:122 ../../include/conversation.php:989
 msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/editpost.php:127 ../../include/conversation.php:938
+#: ../../mod/editpost.php:130 ../../include/conversation.php:998
 msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/editpost.php:128 ../../include/conversation.php:939
+#: ../../mod/editpost.php:131 ../../include/conversation.php:999
 msgid "Public post"
 msgstr ""
 
-#: ../../mod/editpost.php:131 ../../include/conversation.php:925
+#: ../../mod/editpost.php:134 ../../include/conversation.php:985
 msgid "Set title"
 msgstr ""
 
-#: ../../mod/editpost.php:133 ../../include/conversation.php:927
+#: ../../mod/editpost.php:136 ../../include/conversation.php:987
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../mod/editpost.php:134 ../../include/conversation.php:941
+#: ../../mod/editpost.php:137 ../../include/conversation.php:1001
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
@@ -860,7 +909,7 @@ msgstr ""
 msgid "Disallowed profile URL."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:123
+#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:124
 msgid "Failed to update contact record."
 msgstr ""
 
@@ -896,7 +945,7 @@ msgstr ""
 msgid "Confirm"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:715 ../../include/items.php:3292
+#: ../../mod/dfrn_request.php:715 ../../include/items.php:3356
 msgid "[Name Withheld]"
 msgstr ""
 
@@ -948,7 +997,7 @@ msgstr ""
 msgid "StatusNet/Federated Social Web"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:841 ../../mod/settings.php:640
+#: ../../mod/dfrn_request.php:841 ../../mod/settings.php:681
 #: ../../include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr ""
@@ -968,6 +1017,65 @@ msgstr ""
 msgid "Submit Request"
 msgstr ""
 
+#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:138
+msgid "Account settings"
+msgstr ""
+
+#: ../../mod/uexport.php:14 ../../mod/settings.php:40
+msgid "Display settings"
+msgstr ""
+
+#: ../../mod/uexport.php:20 ../../mod/settings.php:46
+msgid "Connector settings"
+msgstr ""
+
+#: ../../mod/uexport.php:25 ../../mod/settings.php:51
+msgid "Plugin settings"
+msgstr ""
+
+#: ../../mod/uexport.php:30 ../../mod/settings.php:56
+msgid "Connected apps"
+msgstr ""
+
+#: ../../mod/uexport.php:35 ../../mod/uexport.php:80 ../../mod/settings.php:61
+msgid "Export personal data"
+msgstr ""
+
+#: ../../mod/uexport.php:40 ../../mod/settings.php:66
+msgid "Remove account"
+msgstr ""
+
+#: ../../mod/uexport.php:48 ../../mod/settings.php:74
+#: ../../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
+#: ../../addon.old/dav/friendica/layout.fnk.php:225
+#: ../../addon.old/mathjax/mathjax.php:36
+msgid "Settings"
+msgstr ""
+
+#: ../../mod/uexport.php:72
+msgid "Export account"
+msgstr ""
+
+#: ../../mod/uexport.php:72
+msgid ""
+"Export your account info and contacts. Use this to make a backup of your "
+"account and/or to move it to another server."
+msgstr ""
+
+#: ../../mod/uexport.php:73
+msgid "Export all"
+msgstr ""
+
+#: ../../mod/uexport.php:73
+msgid ""
+"Export your accout info, contacts and all your items as json. Could be a "
+"very big file, and could take a lot of time. Use this to make a full backup "
+"of your account (photos are not exported)"
+msgstr ""
+
 #: ../../mod/install.php:117
 msgid "Friendica Social Communications Server - Setup"
 msgstr ""
@@ -1232,7 +1340,7 @@ msgstr ""
 
 #: ../../mod/localtime.php:26
 msgid ""
-"Friendika provides this service for sharing events with other networks and "
+"Friendica provides this service for sharing events with other networks and "
 "friends in unknown timezones."
 msgstr ""
 
@@ -1288,7 +1396,7 @@ msgid "is interested in:"
 msgstr ""
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1174
+#: ../../include/contact_widgets.php:9 ../../boot.php:1216
 msgid "Connect"
 msgstr ""
 
@@ -1296,57 +1404,58 @@ msgstr ""
 msgid "No matches"
 msgstr ""
 
-#: ../../mod/lockview.php:34
+#: ../../mod/lockview.php:31 ../../mod/lockview.php:39
 msgid "Remote privacy information not available."
 msgstr ""
 
-#: ../../mod/lockview.php:43
+#: ../../mod/lockview.php:48
+#: ../../addon/remote_permissions/remote_permissions.php:123
 msgid "Visible to:"
 msgstr ""
 
-#: ../../mod/content.php:119 ../../mod/network.php:544
+#: ../../mod/content.php:119 ../../mod/network.php:594
 msgid "No such group"
 msgstr ""
 
-#: ../../mod/content.php:130 ../../mod/network.php:555
+#: ../../mod/content.php:130 ../../mod/network.php:605
 msgid "Group is empty"
 msgstr ""
 
-#: ../../mod/content.php:134 ../../mod/network.php:559
+#: ../../mod/content.php:134 ../../mod/network.php:609
 msgid "Group: "
 msgstr ""
 
-#: ../../mod/content.php:438 ../../mod/content.php:722
-#: ../../include/conversation.php:517 ../../object/Item.php:116
+#: ../../mod/content.php:438 ../../mod/content.php:723
+#: ../../include/conversation.php:568 ../../object/Item.php:118
 msgid "Select"
 msgstr ""
 
-#: ../../mod/content.php:455 ../../mod/content.php:815
-#: ../../mod/content.php:816 ../../include/conversation.php:536
-#: ../../object/Item.php:227 ../../object/Item.php:228
+#: ../../mod/content.php:455 ../../mod/content.php:817
+#: ../../mod/content.php:818 ../../include/conversation.php:587
+#: ../../object/Item.php:235 ../../object/Item.php:236
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 
-#: ../../mod/content.php:465 ../../mod/content.php:827
-#: ../../include/conversation.php:556 ../../object/Item.php:240
+#: ../../mod/content.php:465 ../../mod/content.php:829
+#: ../../include/conversation.php:607 ../../object/Item.php:249
 #, php-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../../mod/content.php:480 ../../include/conversation.php:571
+#: ../../mod/content.php:480 ../../include/conversation.php:622
 msgid "View in context"
 msgstr ""
 
-#: ../../mod/content.php:586 ../../object/Item.php:277
+#: ../../mod/content.php:586 ../../object/Item.php:289
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/content.php:588 ../../include/text.php:1443
-#: ../../object/Item.php:279 ../../object/Item.php:292
+#: ../../mod/content.php:588 ../../include/text.php:1446
+#: ../../object/Item.php:291 ../../object/Item.php:304
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] ""
@@ -1354,96 +1463,98 @@ 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:195 ../../boot.php:585
-#: ../../object/Item.php:280
+#: ../../include/contact_widgets.php:204 ../../boot.php:609
+#: ../../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"
 msgstr ""
 
-#: ../../mod/content.php:667 ../../object/Item.php:196
+#: ../../mod/content.php:667 ../../object/Item.php:203
 msgid "like"
 msgstr ""
 
-#: ../../mod/content.php:668 ../../object/Item.php:197
+#: ../../mod/content.php:668 ../../object/Item.php:204
 msgid "dislike"
 msgstr ""
 
-#: ../../mod/content.php:670 ../../object/Item.php:199
+#: ../../mod/content.php:670 ../../object/Item.php:206
 msgid "Share this"
 msgstr ""
 
-#: ../../mod/content.php:670 ../../object/Item.php:199
+#: ../../mod/content.php:670 ../../object/Item.php:206
 msgid "share"
 msgstr ""
 
-#: ../../mod/content.php:694 ../../object/Item.php:559
+#: ../../mod/content.php:694 ../../object/Item.php:578
 msgid "Bold"
 msgstr ""
 
-#: ../../mod/content.php:695 ../../object/Item.php:560
+#: ../../mod/content.php:695 ../../object/Item.php:579
 msgid "Italic"
 msgstr ""
 
-#: ../../mod/content.php:696 ../../object/Item.php:561
+#: ../../mod/content.php:696 ../../object/Item.php:580
 msgid "Underline"
 msgstr ""
 
-#: ../../mod/content.php:697 ../../object/Item.php:562
+#: ../../mod/content.php:697 ../../object/Item.php:581
 msgid "Quote"
 msgstr ""
 
-#: ../../mod/content.php:698 ../../object/Item.php:563
+#: ../../mod/content.php:698 ../../object/Item.php:582
 msgid "Code"
 msgstr ""
 
-#: ../../mod/content.php:699 ../../object/Item.php:564
+#: ../../mod/content.php:699 ../../object/Item.php:583
 msgid "Image"
 msgstr ""
 
-#: ../../mod/content.php:700 ../../object/Item.php:565
+#: ../../mod/content.php:700 ../../object/Item.php:584
 msgid "Link"
 msgstr ""
 
-#: ../../mod/content.php:701 ../../object/Item.php:566
+#: ../../mod/content.php:701 ../../object/Item.php:585
 msgid "Video"
 msgstr ""
 
-#: ../../mod/content.php:735 ../../object/Item.php:180
+#: ../../mod/content.php:736 ../../object/Item.php:182
 msgid "add star"
 msgstr ""
 
-#: ../../mod/content.php:736 ../../object/Item.php:181
+#: ../../mod/content.php:737 ../../object/Item.php:183
 msgid "remove star"
 msgstr ""
 
-#: ../../mod/content.php:737 ../../object/Item.php:182
+#: ../../mod/content.php:738 ../../object/Item.php:184
 msgid "toggle star status"
 msgstr ""
 
-#: ../../mod/content.php:740 ../../object/Item.php:185
+#: ../../mod/content.php:741 ../../object/Item.php:187
 msgid "starred"
 msgstr ""
 
-#: ../../mod/content.php:741 ../../object/Item.php:186
+#: ../../mod/content.php:742 ../../object/Item.php:192
 msgid "add tag"
 msgstr ""
 
-#: ../../mod/content.php:745 ../../object/Item.php:120
+#: ../../mod/content.php:746 ../../object/Item.php:122
 msgid "save to folder"
 msgstr ""
 
-#: ../../mod/content.php:817 ../../object/Item.php:229
+#: ../../mod/content.php:819 ../../object/Item.php:237
 msgid "to"
 msgstr ""
 
-#: ../../mod/content.php:818 ../../object/Item.php:230
+#: ../../mod/content.php:820 ../../object/Item.php:239
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../mod/content.php:819 ../../object/Item.php:231
+#: ../../mod/content.php:821 ../../object/Item.php:240
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../mod/home.php:28 ../../addon/communityhome/communityhome.php:179
+#: ../../mod/home.php:30 ../../addon/communityhome/communityhome.php:179
+#: ../../addon.old/communityhome/communityhome.php:179
 #, php-format
 msgid "Welcome to %s"
 msgstr ""
@@ -1452,488 +1563,490 @@ msgstr ""
 msgid "Invalid request identifier."
 msgstr ""
 
-#: ../../mod/notifications.php:35 ../../mod/notifications.php:161
-#: ../../mod/notifications.php:207
+#: ../../mod/notifications.php:35 ../../mod/notifications.php:164
+#: ../../mod/notifications.php:210
 msgid "Discard"
 msgstr ""
 
-#: ../../mod/notifications.php:51 ../../mod/notifications.php:160
-#: ../../mod/notifications.php:206 ../../mod/contacts.php:321
-#: ../../mod/contacts.php:375
+#: ../../mod/notifications.php:51 ../../mod/notifications.php:163
+#: ../../mod/notifications.php:209 ../../mod/contacts.php:325
+#: ../../mod/contacts.php:379
 msgid "Ignore"
 msgstr ""
 
-#: ../../mod/notifications.php:75
+#: ../../mod/notifications.php:78
 msgid "System"
 msgstr ""
 
-#: ../../mod/notifications.php:80 ../../include/nav.php:113
+#: ../../mod/notifications.php:83 ../../include/nav.php:113
 msgid "Network"
 msgstr ""
 
-#: ../../mod/notifications.php:85 ../../mod/network.php:407
+#: ../../mod/notifications.php:88 ../../mod/network.php:444
 msgid "Personal"
 msgstr ""
 
-#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:127
-#: ../../include/nav.php:77 ../../include/nav.php:115
+#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87
+#: ../../include/nav.php:77 ../../include/nav.php:116
 msgid "Home"
 msgstr ""
 
-#: ../../mod/notifications.php:95 ../../include/nav.php:121
+#: ../../mod/notifications.php:98 ../../include/nav.php:122
 msgid "Introductions"
 msgstr ""
 
-#: ../../mod/notifications.php:100 ../../mod/message.php:176
-#: ../../include/nav.php:128
+#: ../../mod/notifications.php:103 ../../mod/message.php:180
+#: ../../include/nav.php:129
 msgid "Messages"
 msgstr ""
 
-#: ../../mod/notifications.php:119
+#: ../../mod/notifications.php:122
 msgid "Show Ignored Requests"
 msgstr ""
 
-#: ../../mod/notifications.php:119
+#: ../../mod/notifications.php:122
 msgid "Hide Ignored Requests"
 msgstr ""
 
-#: ../../mod/notifications.php:145 ../../mod/notifications.php:191
+#: ../../mod/notifications.php:148 ../../mod/notifications.php:194
 msgid "Notification type: "
 msgstr ""
 
-#: ../../mod/notifications.php:146
+#: ../../mod/notifications.php:149
 msgid "Friend Suggestion"
 msgstr ""
 
-#: ../../mod/notifications.php:148
+#: ../../mod/notifications.php:151
 #, php-format
 msgid "suggested by %s"
 msgstr ""
 
-#: ../../mod/notifications.php:153 ../../mod/notifications.php:200
-#: ../../mod/contacts.php:381
+#: ../../mod/notifications.php:156 ../../mod/notifications.php:203
+#: ../../mod/contacts.php:385
 msgid "Hide this contact from others"
 msgstr ""
 
-#: ../../mod/notifications.php:154 ../../mod/notifications.php:201
+#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
 msgid "Post a new friend activity"
 msgstr ""
 
-#: ../../mod/notifications.php:154 ../../mod/notifications.php:201
+#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
 msgid "if applicable"
 msgstr ""
 
-#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
-#: ../../mod/admin.php:694
+#: ../../mod/notifications.php:160 ../../mod/notifications.php:207
+#: ../../mod/admin.php:697
 msgid "Approve"
 msgstr ""
 
-#: ../../mod/notifications.php:177
+#: ../../mod/notifications.php:180
 msgid "Claims to be known to you: "
 msgstr ""
 
-#: ../../mod/notifications.php:177
+#: ../../mod/notifications.php:180
 msgid "yes"
 msgstr ""
 
-#: ../../mod/notifications.php:177
+#: ../../mod/notifications.php:180
 msgid "no"
 msgstr ""
 
-#: ../../mod/notifications.php:184
+#: ../../mod/notifications.php:187
 msgid "Approve as: "
 msgstr ""
 
-#: ../../mod/notifications.php:185
+#: ../../mod/notifications.php:188
 msgid "Friend"
 msgstr ""
 
-#: ../../mod/notifications.php:186
+#: ../../mod/notifications.php:189
 msgid "Sharer"
 msgstr ""
 
-#: ../../mod/notifications.php:186
+#: ../../mod/notifications.php:189
 msgid "Fan/Admirer"
 msgstr ""
 
-#: ../../mod/notifications.php:192
+#: ../../mod/notifications.php:195
 msgid "Friend/Connect Request"
 msgstr ""
 
-#: ../../mod/notifications.php:192
+#: ../../mod/notifications.php:195
 msgid "New Follower"
 msgstr ""
 
-#: ../../mod/notifications.php:213
+#: ../../mod/notifications.php:216
 msgid "No introductions."
 msgstr ""
 
-#: ../../mod/notifications.php:216 ../../include/nav.php:122
+#: ../../mod/notifications.php:219 ../../include/nav.php:123
 msgid "Notifications"
 msgstr ""
 
-#: ../../mod/notifications.php:253 ../../mod/notifications.php:378
-#: ../../mod/notifications.php:465
+#: ../../mod/notifications.php:256 ../../mod/notifications.php:381
+#: ../../mod/notifications.php:468
 #, php-format
 msgid "%s liked %s's post"
 msgstr ""
 
-#: ../../mod/notifications.php:262 ../../mod/notifications.php:387
-#: ../../mod/notifications.php:474
+#: ../../mod/notifications.php:265 ../../mod/notifications.php:390
+#: ../../mod/notifications.php:477
 #, php-format
 msgid "%s disliked %s's post"
 msgstr ""
 
-#: ../../mod/notifications.php:276 ../../mod/notifications.php:401
-#: ../../mod/notifications.php:488
+#: ../../mod/notifications.php:279 ../../mod/notifications.php:404
+#: ../../mod/notifications.php:491
 #, php-format
 msgid "%s is now friends with %s"
 msgstr ""
 
-#: ../../mod/notifications.php:283 ../../mod/notifications.php:408
+#: ../../mod/notifications.php:286 ../../mod/notifications.php:411
 #, php-format
 msgid "%s created a new post"
 msgstr ""
 
-#: ../../mod/notifications.php:284 ../../mod/notifications.php:409
-#: ../../mod/notifications.php:497
+#: ../../mod/notifications.php:287 ../../mod/notifications.php:412
+#: ../../mod/notifications.php:500
 #, php-format
 msgid "%s commented on %s's post"
 msgstr ""
 
-#: ../../mod/notifications.php:298
+#: ../../mod/notifications.php:301
 msgid "No more network notifications."
 msgstr ""
 
-#: ../../mod/notifications.php:302
+#: ../../mod/notifications.php:305
 msgid "Network Notifications"
 msgstr ""
 
-#: ../../mod/notifications.php:328 ../../mod/notify.php:61
+#: ../../mod/notifications.php:331 ../../mod/notify.php:61
 msgid "No more system notifications."
 msgstr ""
 
-#: ../../mod/notifications.php:332 ../../mod/notify.php:65
+#: ../../mod/notifications.php:335 ../../mod/notify.php:65
 msgid "System Notifications"
 msgstr ""
 
-#: ../../mod/notifications.php:423
+#: ../../mod/notifications.php:426
 msgid "No more personal notifications."
 msgstr ""
 
-#: ../../mod/notifications.php:427
+#: ../../mod/notifications.php:430
 msgid "Personal Notifications"
 msgstr ""
 
-#: ../../mod/notifications.php:504
+#: ../../mod/notifications.php:507
 msgid "No more home notifications."
 msgstr ""
 
-#: ../../mod/notifications.php:508
+#: ../../mod/notifications.php:511
 msgid "Home Notifications"
 msgstr ""
 
-#: ../../mod/contacts.php:84 ../../mod/contacts.php:164
+#: ../../mod/contacts.php:85 ../../mod/contacts.php:165
 msgid "Could not access contact record."
 msgstr ""
 
-#: ../../mod/contacts.php:98
+#: ../../mod/contacts.php:99
 msgid "Could not locate selected profile."
 msgstr ""
 
-#: ../../mod/contacts.php:121
+#: ../../mod/contacts.php:122
 msgid "Contact updated."
 msgstr ""
 
-#: ../../mod/contacts.php:186
+#: ../../mod/contacts.php:187
 msgid "Contact has been blocked"
 msgstr ""
 
-#: ../../mod/contacts.php:186
+#: ../../mod/contacts.php:187
 msgid "Contact has been unblocked"
 msgstr ""
 
-#: ../../mod/contacts.php:200
+#: ../../mod/contacts.php:201
 msgid "Contact has been ignored"
 msgstr ""
 
-#: ../../mod/contacts.php:200
+#: ../../mod/contacts.php:201
 msgid "Contact has been unignored"
 msgstr ""
 
-#: ../../mod/contacts.php:216
+#: ../../mod/contacts.php:220
 msgid "Contact has been archived"
 msgstr ""
 
-#: ../../mod/contacts.php:216
+#: ../../mod/contacts.php:220
 msgid "Contact has been unarchived"
 msgstr ""
 
-#: ../../mod/contacts.php:229
+#: ../../mod/contacts.php:233
 msgid "Contact has been removed."
 msgstr ""
 
-#: ../../mod/contacts.php:263
+#: ../../mod/contacts.php:267
 #, php-format
 msgid "You are mutual friends with %s"
 msgstr ""
 
-#: ../../mod/contacts.php:267
+#: ../../mod/contacts.php:271
 #, php-format
 msgid "You are sharing with %s"
 msgstr ""
 
-#: ../../mod/contacts.php:272
+#: ../../mod/contacts.php:276
 #, php-format
 msgid "%s is sharing with you"
 msgstr ""
 
-#: ../../mod/contacts.php:289
+#: ../../mod/contacts.php:293
 msgid "Private communications are not available for this contact."
 msgstr ""
 
-#: ../../mod/contacts.php:292
+#: ../../mod/contacts.php:296
 msgid "Never"
 msgstr ""
 
-#: ../../mod/contacts.php:296
+#: ../../mod/contacts.php:300
 msgid "(Update was successful)"
 msgstr ""
 
-#: ../../mod/contacts.php:296
+#: ../../mod/contacts.php:300
 msgid "(Update was not successful)"
 msgstr ""
 
-#: ../../mod/contacts.php:298
+#: ../../mod/contacts.php:302
 msgid "Suggest friends"
 msgstr ""
 
-#: ../../mod/contacts.php:302
+#: ../../mod/contacts.php:306
 #, php-format
 msgid "Network type: %s"
 msgstr ""
 
-#: ../../mod/contacts.php:305 ../../include/contact_widgets.php:190
+#: ../../mod/contacts.php:309 ../../include/contact_widgets.php:199
 #, php-format
 msgid "%d contact in common"
 msgid_plural "%d contacts in common"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/contacts.php:310
+#: ../../mod/contacts.php:314
 msgid "View all contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:315 ../../mod/contacts.php:374
-#: ../../mod/admin.php:698
+#: ../../mod/contacts.php:319 ../../mod/contacts.php:378
+#: ../../mod/admin.php:701
 msgid "Unblock"
 msgstr ""
 
-#: ../../mod/contacts.php:315 ../../mod/contacts.php:374
-#: ../../mod/admin.php:697
+#: ../../mod/contacts.php:319 ../../mod/contacts.php:378
+#: ../../mod/admin.php:700
 msgid "Block"
 msgstr ""
 
-#: ../../mod/contacts.php:318
+#: ../../mod/contacts.php:322
 msgid "Toggle Blocked status"
 msgstr ""
 
-#: ../../mod/contacts.php:321 ../../mod/contacts.php:375
+#: ../../mod/contacts.php:325 ../../mod/contacts.php:379
 msgid "Unignore"
 msgstr ""
 
-#: ../../mod/contacts.php:324
+#: ../../mod/contacts.php:328
 msgid "Toggle Ignored status"
 msgstr ""
 
-#: ../../mod/contacts.php:328
+#: ../../mod/contacts.php:332
 msgid "Unarchive"
 msgstr ""
 
-#: ../../mod/contacts.php:328
+#: ../../mod/contacts.php:332
 msgid "Archive"
 msgstr ""
 
-#: ../../mod/contacts.php:331
+#: ../../mod/contacts.php:335
 msgid "Toggle Archive status"
 msgstr ""
 
-#: ../../mod/contacts.php:334
+#: ../../mod/contacts.php:338
 msgid "Repair"
 msgstr ""
 
-#: ../../mod/contacts.php:337
+#: ../../mod/contacts.php:341
 msgid "Advanced Contact Settings"
 msgstr ""
 
-#: ../../mod/contacts.php:343
+#: ../../mod/contacts.php:347
 msgid "Communications lost with this contact!"
 msgstr ""
 
-#: ../../mod/contacts.php:346
+#: ../../mod/contacts.php:350
 msgid "Contact Editor"
 msgstr ""
 
-#: ../../mod/contacts.php:349
+#: ../../mod/contacts.php:353
 msgid "Profile Visibility"
 msgstr ""
 
-#: ../../mod/contacts.php:350
+#: ../../mod/contacts.php:354
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr ""
 
-#: ../../mod/contacts.php:351
+#: ../../mod/contacts.php:355
 msgid "Contact Information / Notes"
 msgstr ""
 
-#: ../../mod/contacts.php:352
+#: ../../mod/contacts.php:356
 msgid "Edit contact notes"
 msgstr ""
 
-#: ../../mod/contacts.php:357 ../../mod/contacts.php:549
+#: ../../mod/contacts.php:361 ../../mod/contacts.php:553
 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr ""
 
-#: ../../mod/contacts.php:358
+#: ../../mod/contacts.php:362
 msgid "Block/Unblock contact"
 msgstr ""
 
-#: ../../mod/contacts.php:359
+#: ../../mod/contacts.php:363
 msgid "Ignore contact"
 msgstr ""
 
-#: ../../mod/contacts.php:360
+#: ../../mod/contacts.php:364
 msgid "Repair URL settings"
 msgstr ""
 
-#: ../../mod/contacts.php:361
+#: ../../mod/contacts.php:365
 msgid "View conversations"
 msgstr ""
 
-#: ../../mod/contacts.php:363
+#: ../../mod/contacts.php:367
 msgid "Delete contact"
 msgstr ""
 
-#: ../../mod/contacts.php:367
+#: ../../mod/contacts.php:371
 msgid "Last update:"
 msgstr ""
 
-#: ../../mod/contacts.php:369
+#: ../../mod/contacts.php:373
 msgid "Update public posts"
 msgstr ""
 
-#: ../../mod/contacts.php:371 ../../mod/admin.php:1170
+#: ../../mod/contacts.php:375 ../../mod/admin.php:1173
 msgid "Update now"
 msgstr ""
 
-#: ../../mod/contacts.php:378
+#: ../../mod/contacts.php:382
 msgid "Currently blocked"
 msgstr ""
 
-#: ../../mod/contacts.php:379
+#: ../../mod/contacts.php:383
 msgid "Currently ignored"
 msgstr ""
 
-#: ../../mod/contacts.php:380
+#: ../../mod/contacts.php:384
 msgid "Currently archived"
 msgstr ""
 
-#: ../../mod/contacts.php:381
+#: ../../mod/contacts.php:385
 msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr ""
 
-#: ../../mod/contacts.php:434
+#: ../../mod/contacts.php:438
 msgid "Suggestions"
 msgstr ""
 
-#: ../../mod/contacts.php:437
+#: ../../mod/contacts.php:441
 msgid "Suggest potential friends"
 msgstr ""
 
-#: ../../mod/contacts.php:440 ../../mod/group.php:191
+#: ../../mod/contacts.php:444 ../../mod/group.php:191
 msgid "All Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:443
+#: ../../mod/contacts.php:447
 msgid "Show all contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:446
+#: ../../mod/contacts.php:450
 msgid "Unblocked"
 msgstr ""
 
-#: ../../mod/contacts.php:449
+#: ../../mod/contacts.php:453
 msgid "Only show unblocked contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:453
+#: ../../mod/contacts.php:457
 msgid "Blocked"
 msgstr ""
 
-#: ../../mod/contacts.php:456
+#: ../../mod/contacts.php:460
 msgid "Only show blocked contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:460
+#: ../../mod/contacts.php:464
 msgid "Ignored"
 msgstr ""
 
-#: ../../mod/contacts.php:463
+#: ../../mod/contacts.php:467
 msgid "Only show ignored contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:467
+#: ../../mod/contacts.php:471
 msgid "Archived"
 msgstr ""
 
-#: ../../mod/contacts.php:470
+#: ../../mod/contacts.php:474
 msgid "Only show archived contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:474
+#: ../../mod/contacts.php:478
 msgid "Hidden"
 msgstr ""
 
-#: ../../mod/contacts.php:477
+#: ../../mod/contacts.php:481
 msgid "Only show hidden contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:525
+#: ../../mod/contacts.php:529
 msgid "Mutual Friendship"
 msgstr ""
 
-#: ../../mod/contacts.php:529
+#: ../../mod/contacts.php:533
 msgid "is a fan of yours"
 msgstr ""
 
-#: ../../mod/contacts.php:533
+#: ../../mod/contacts.php:537
 msgid "you are a fan of"
 msgstr ""
 
-#: ../../mod/contacts.php:550 ../../mod/nogroup.php:41
+#: ../../mod/contacts.php:554 ../../mod/nogroup.php:41
 msgid "Edit contact"
 msgstr ""
 
-#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:129
-#: ../../include/nav.php:139
+#: ../../mod/contacts.php:575 ../../view/theme/diabook/theme.php:89
+#: ../../include/nav.php:142
 msgid "Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:575
+#: ../../mod/contacts.php:579
 msgid "Search your contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:576 ../../mod/directory.php:59
+#: ../../mod/contacts.php:580 ../../mod/directory.php:59
+#: ../../addon/forumdirectory/forumdirectory.php:81
 msgid "Finding: "
 msgstr ""
 
-#: ../../mod/contacts.php:577 ../../mod/directory.php:61
+#: ../../mod/contacts.php:581 ../../mod/directory.php:61
+#: ../../addon/forumdirectory/forumdirectory.php:83
 #: ../../include/contact_widgets.php:33
 msgid "Find"
 msgstr ""
@@ -1952,13 +2065,17 @@ msgid "Password reset requested at %s"
 msgstr ""
 
 #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
-#: ../../mod/register.php:90 ../../mod/register.php:144
+#: ../../mod/register.php:91 ../../mod/register.php:145
 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752
 #: ../../addon/facebook/facebook.php:702
 #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661
 #: ../../addon/public_server/public_server.php:62
-#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3301
-#: ../../boot.php:798
+#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3365
+#: ../../boot.php:824 ../../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
+#: ../../addon.old/testdrive/testdrive.php:67
 msgid "Administrator"
 msgstr ""
 
@@ -1968,7 +2085,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:83 ../../boot.php:935
+#: ../../mod/lostpass.php:83 ../../boot.php:963
 msgid "Password Reset"
 msgstr ""
 
@@ -2012,552 +2129,548 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
-#: ../../mod/settings.php:30 ../../include/nav.php:137
-msgid "Account settings"
-msgstr ""
-
 #: ../../mod/settings.php:35
-msgid "Display settings"
-msgstr ""
-
-#: ../../mod/settings.php:41
-msgid "Connector settings"
+msgid "Additional features"
 msgstr ""
 
-#: ../../mod/settings.php:46
-msgid "Plugin settings"
-msgstr ""
-
-#: ../../mod/settings.php:51
-msgid "Connected apps"
-msgstr ""
-
-#: ../../mod/settings.php:56
-msgid "Export personal data"
-msgstr ""
-
-#: ../../mod/settings.php:61
-msgid "Remove account"
-msgstr ""
-
-#: ../../mod/settings.php:69 ../../mod/newmember.php:22
-#: ../../mod/admin.php:785 ../../mod/admin.php:990
-#: ../../addon/dav/friendica/layout.fnk.php:225
-#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:643
-#: ../../view/theme/diabook/theme.php:773 ../../include/nav.php:137
-msgid "Settings"
-msgstr ""
-
-#: ../../mod/settings.php:113
+#: ../../mod/settings.php:118
 msgid "Missing some important data!"
 msgstr ""
 
-#: ../../mod/settings.php:116 ../../mod/settings.php:569
+#: ../../mod/settings.php:121 ../../mod/settings.php:585
 msgid "Update"
 msgstr ""
 
-#: ../../mod/settings.php:221
+#: ../../mod/settings.php:226
 msgid "Failed to connect with email account using the settings provided."
 msgstr ""
 
-#: ../../mod/settings.php:226
+#: ../../mod/settings.php:231
 msgid "Email settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:290
+#: ../../mod/settings.php:246
+msgid "Features updated"
+msgstr ""
+
+#: ../../mod/settings.php:306
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:295
+#: ../../mod/settings.php:311
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:306
+#: ../../mod/settings.php:322
 msgid "Password changed."
 msgstr ""
 
-#: ../../mod/settings.php:308
+#: ../../mod/settings.php:324
 msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/settings.php:373
+#: ../../mod/settings.php:389
 msgid " Please use a shorter name."
 msgstr ""
 
-#: ../../mod/settings.php:375
+#: ../../mod/settings.php:391
 msgid " Name too short."
 msgstr ""
 
-#: ../../mod/settings.php:381
+#: ../../mod/settings.php:397
 msgid " Not valid email."
 msgstr ""
 
-#: ../../mod/settings.php:383
+#: ../../mod/settings.php:399
 msgid " Cannot change to that email."
 msgstr ""
 
-#: ../../mod/settings.php:437
+#: ../../mod/settings.php:453
 msgid "Private forum has no privacy permissions. Using default privacy group."
 msgstr ""
 
-#: ../../mod/settings.php:441
+#: ../../mod/settings.php:457
 msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr ""
 
-#: ../../mod/settings.php:471 ../../addon/facebook/facebook.php:495
-#: ../../addon/fbpost/fbpost.php:144 ../../addon/impressum/impressum.php:78
+#: ../../mod/settings.php:487 ../../addon/facebook/facebook.php:495
+#: ../../addon/fbpost/fbpost.php:144
+#: ../../addon/remote_permissions/remote_permissions.php:204
+#: ../../addon/impressum/impressum.php:78
 #: ../../addon/openstreetmap/openstreetmap.php:80
 #: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105
-#: ../../addon/twitter/twitter.php:389
+#: ../../addon/twitter/twitter.php:501
+#: ../../addon.old/facebook/facebook.php:495
+#: ../../addon.old/fbpost/fbpost.php:144
+#: ../../addon.old/impressum/impressum.php:78
+#: ../../addon.old/openstreetmap/openstreetmap.php:80
+#: ../../addon.old/mathjax/mathjax.php:66 ../../addon.old/piwik/piwik.php:105
+#: ../../addon.old/twitter/twitter.php:389
 msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:542 ../../mod/settings.php:568
-#: ../../mod/settings.php:604
+#: ../../mod/settings.php:558 ../../mod/settings.php:584
+#: ../../mod/settings.php:620
 msgid "Add application"
 msgstr ""
 
-#: ../../mod/settings.php:546 ../../mod/settings.php:572
-#: ../../addon/statusnet/statusnet.php:570
+#: ../../mod/settings.php:562 ../../mod/settings.php:588
+#: ../../addon/statusnet/statusnet.php:679
+#: ../../addon.old/statusnet/statusnet.php:570
 msgid "Consumer Key"
 msgstr ""
 
-#: ../../mod/settings.php:547 ../../mod/settings.php:573
-#: ../../addon/statusnet/statusnet.php:569
+#: ../../mod/settings.php:563 ../../mod/settings.php:589
+#: ../../addon/statusnet/statusnet.php:678
+#: ../../addon.old/statusnet/statusnet.php:569
 msgid "Consumer Secret"
 msgstr ""
 
-#: ../../mod/settings.php:548 ../../mod/settings.php:574
+#: ../../mod/settings.php:564 ../../mod/settings.php:590
 msgid "Redirect"
 msgstr ""
 
-#: ../../mod/settings.php:549 ../../mod/settings.php:575
+#: ../../mod/settings.php:565 ../../mod/settings.php:591
 msgid "Icon url"
 msgstr ""
 
-#: ../../mod/settings.php:560
+#: ../../mod/settings.php:576
 msgid "You can't edit this application."
 msgstr ""
 
-#: ../../mod/settings.php:603
+#: ../../mod/settings.php:619
 msgid "Connected Apps"
 msgstr ""
 
-#: ../../mod/settings.php:607
+#: ../../mod/settings.php:623
 msgid "Client key starts with"
 msgstr ""
 
-#: ../../mod/settings.php:608
+#: ../../mod/settings.php:624
 msgid "No name"
 msgstr ""
 
-#: ../../mod/settings.php:609
+#: ../../mod/settings.php:625
 msgid "Remove authorization"
 msgstr ""
 
-#: ../../mod/settings.php:620
+#: ../../mod/settings.php:637
 msgid "No Plugin settings configured"
 msgstr ""
 
-#: ../../mod/settings.php:628 ../../addon/widgets/widgets.php:123
+#: ../../mod/settings.php:645 ../../addon/widgets/widgets.php:123
+#: ../../addon.old/widgets/widgets.php:123
 msgid "Plugin Settings"
 msgstr ""
 
-#: ../../mod/settings.php:640 ../../mod/settings.php:641
+#: ../../mod/settings.php:659
+msgid "Off"
+msgstr ""
+
+#: ../../mod/settings.php:659
+msgid "On"
+msgstr ""
+
+#: ../../mod/settings.php:667
+msgid "Additional Features"
+msgstr ""
+
+#: ../../mod/settings.php:681 ../../mod/settings.php:682
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr ""
 
-#: ../../mod/settings.php:640 ../../mod/settings.php:641
+#: ../../mod/settings.php:681 ../../mod/settings.php:682
 msgid "enabled"
 msgstr ""
 
-#: ../../mod/settings.php:640 ../../mod/settings.php:641
+#: ../../mod/settings.php:681 ../../mod/settings.php:682
 msgid "disabled"
 msgstr ""
 
-#: ../../mod/settings.php:641
+#: ../../mod/settings.php:682
 msgid "StatusNet"
 msgstr ""
 
-#: ../../mod/settings.php:673
+#: ../../mod/settings.php:714
 msgid "Email access is disabled on this site."
 msgstr ""
 
-#: ../../mod/settings.php:679
+#: ../../mod/settings.php:720
 msgid "Connector Settings"
 msgstr ""
 
-#: ../../mod/settings.php:684
+#: ../../mod/settings.php:725
 msgid "Email/Mailbox Setup"
 msgstr ""
 
-#: ../../mod/settings.php:685
+#: ../../mod/settings.php:726
 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:686
+#: ../../mod/settings.php:727
 msgid "Last successful email check:"
 msgstr ""
 
-#: ../../mod/settings.php:688
+#: ../../mod/settings.php:729
 msgid "IMAP server name:"
 msgstr ""
 
-#: ../../mod/settings.php:689
+#: ../../mod/settings.php:730
 msgid "IMAP port:"
 msgstr ""
 
-#: ../../mod/settings.php:690
+#: ../../mod/settings.php:731
 msgid "Security:"
 msgstr ""
 
-#: ../../mod/settings.php:690 ../../mod/settings.php:695
+#: ../../mod/settings.php:731 ../../mod/settings.php:736
 #: ../../addon/dav/common/wdcal_edit.inc.php:191
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:191
 msgid "None"
 msgstr ""
 
-#: ../../mod/settings.php:691
+#: ../../mod/settings.php:732
 msgid "Email login name:"
 msgstr ""
 
-#: ../../mod/settings.php:692
+#: ../../mod/settings.php:733
 msgid "Email password:"
 msgstr ""
 
-#: ../../mod/settings.php:693
+#: ../../mod/settings.php:734
 msgid "Reply-to address:"
 msgstr ""
 
-#: ../../mod/settings.php:694
+#: ../../mod/settings.php:735
 msgid "Send public posts to all email contacts:"
 msgstr ""
 
-#: ../../mod/settings.php:695
+#: ../../mod/settings.php:736
 msgid "Action after import:"
 msgstr ""
 
-#: ../../mod/settings.php:695
+#: ../../mod/settings.php:736
 msgid "Mark as seen"
 msgstr ""
 
-#: ../../mod/settings.php:695
+#: ../../mod/settings.php:736
 msgid "Move to folder"
 msgstr ""
 
-#: ../../mod/settings.php:696
+#: ../../mod/settings.php:737
 msgid "Move to folder:"
 msgstr ""
 
-#: ../../mod/settings.php:727 ../../mod/admin.php:402
+#: ../../mod/settings.php:768 ../../mod/admin.php:404
 msgid "No special theme for mobile devices"
 msgstr ""
 
-#: ../../mod/settings.php:767
+#: ../../mod/settings.php:808
 msgid "Display Settings"
 msgstr ""
 
-#: ../../mod/settings.php:773 ../../mod/settings.php:784
+#: ../../mod/settings.php:814 ../../mod/settings.php:825
 msgid "Display Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:774
+#: ../../mod/settings.php:815
 msgid "Mobile Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:775
+#: ../../mod/settings.php:816
 msgid "Update browser every xx seconds"
 msgstr ""
 
-#: ../../mod/settings.php:775
+#: ../../mod/settings.php:816
 msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
-#: ../../mod/settings.php:776
+#: ../../mod/settings.php:817
 msgid "Number of items to display per page:"
 msgstr ""
 
-#: ../../mod/settings.php:776
+#: ../../mod/settings.php:817
 msgid "Maximum of 100 items"
 msgstr ""
 
-#: ../../mod/settings.php:777
+#: ../../mod/settings.php:818
 msgid "Don't show emoticons"
 msgstr ""
 
-#: ../../mod/settings.php:853
+#: ../../mod/settings.php:894
 msgid "Normal Account Page"
 msgstr ""
 
-#: ../../mod/settings.php:854
+#: ../../mod/settings.php:895
 msgid "This account is a normal personal profile"
 msgstr ""
 
-#: ../../mod/settings.php:857
+#: ../../mod/settings.php:898
 msgid "Soapbox Page"
 msgstr ""
 
-#: ../../mod/settings.php:858
+#: ../../mod/settings.php:899
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr ""
 
-#: ../../mod/settings.php:861
+#: ../../mod/settings.php:902
 msgid "Community Forum/Celebrity Account"
 msgstr ""
 
-#: ../../mod/settings.php:862
+#: ../../mod/settings.php:903
 msgid "Automatically approve all connection/friend requests as read-write fans"
 msgstr ""
 
-#: ../../mod/settings.php:865
+#: ../../mod/settings.php:906
 msgid "Automatic Friend Page"
 msgstr ""
 
-#: ../../mod/settings.php:866
+#: ../../mod/settings.php:907
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr ""
 
-#: ../../mod/settings.php:869
+#: ../../mod/settings.php:910
 msgid "Private Forum [Experimental]"
 msgstr ""
 
-#: ../../mod/settings.php:870
+#: ../../mod/settings.php:911
 msgid "Private forum - approved members only"
 msgstr ""
 
-#: ../../mod/settings.php:882
+#: ../../mod/settings.php:923
 msgid "OpenID:"
 msgstr ""
 
-#: ../../mod/settings.php:882
+#: ../../mod/settings.php:923
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: ../../mod/settings.php:892
+#: ../../mod/settings.php:933
 msgid "Publish your default profile in your local site directory?"
 msgstr ""
 
-#: ../../mod/settings.php:898
+#: ../../mod/settings.php:939
 msgid "Publish your default profile in the global social directory?"
 msgstr ""
 
-#: ../../mod/settings.php:906
+#: ../../mod/settings.php:947
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr ""
 
-#: ../../mod/settings.php:910
+#: ../../mod/settings.php:951
 msgid "Hide your profile details from unknown viewers?"
 msgstr ""
 
-#: ../../mod/settings.php:915
+#: ../../mod/settings.php:956
 msgid "Allow friends to post to your profile page?"
 msgstr ""
 
-#: ../../mod/settings.php:921
+#: ../../mod/settings.php:962
 msgid "Allow friends to tag your posts?"
 msgstr ""
 
-#: ../../mod/settings.php:927
+#: ../../mod/settings.php:968
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../mod/settings.php:933
+#: ../../mod/settings.php:974
 msgid "Permit unknown people to send you private mail?"
 msgstr ""
 
-#: ../../mod/settings.php:941
+#: ../../mod/settings.php:982
 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: ../../mod/settings.php:944 ../../mod/profile_photo.php:248
+#: ../../mod/settings.php:985 ../../mod/profile_photo.php:248
 msgid "or"
 msgstr ""
 
-#: ../../mod/settings.php:949
+#: ../../mod/settings.php:990
 msgid "Your Identity Address is"
 msgstr ""
 
-#: ../../mod/settings.php:960
+#: ../../mod/settings.php:1001
 msgid "Automatically expire posts after this many days:"
 msgstr ""
 
-#: ../../mod/settings.php:960
+#: ../../mod/settings.php:1001
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr ""
 
-#: ../../mod/settings.php:961
+#: ../../mod/settings.php:1002
 msgid "Advanced expiration settings"
 msgstr ""
 
-#: ../../mod/settings.php:962
+#: ../../mod/settings.php:1003
 msgid "Advanced Expiration"
 msgstr ""
 
-#: ../../mod/settings.php:963
+#: ../../mod/settings.php:1004
 msgid "Expire posts:"
 msgstr ""
 
-#: ../../mod/settings.php:964
+#: ../../mod/settings.php:1005
 msgid "Expire personal notes:"
 msgstr ""
 
-#: ../../mod/settings.php:965
+#: ../../mod/settings.php:1006
 msgid "Expire starred posts:"
 msgstr ""
 
-#: ../../mod/settings.php:966
+#: ../../mod/settings.php:1007
 msgid "Expire photos:"
 msgstr ""
 
-#: ../../mod/settings.php:967
+#: ../../mod/settings.php:1008
 msgid "Only expire posts by others:"
 msgstr ""
 
-#: ../../mod/settings.php:974
+#: ../../mod/settings.php:1015
 msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/settings.php:982
+#: ../../mod/settings.php:1023
 msgid "Password Settings"
 msgstr ""
 
-#: ../../mod/settings.php:983
+#: ../../mod/settings.php:1024
 msgid "New Password:"
 msgstr ""
 
-#: ../../mod/settings.php:984
+#: ../../mod/settings.php:1025
 msgid "Confirm:"
 msgstr ""
 
-#: ../../mod/settings.php:984
+#: ../../mod/settings.php:1025
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/settings.php:988
+#: ../../mod/settings.php:1029
 msgid "Basic Settings"
 msgstr ""
 
-#: ../../mod/settings.php:989 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:1030 ../../include/profile_advanced.php:15
 msgid "Full Name:"
 msgstr ""
 
-#: ../../mod/settings.php:990
+#: ../../mod/settings.php:1031
 msgid "Email Address:"
 msgstr ""
 
-#: ../../mod/settings.php:991
+#: ../../mod/settings.php:1032
 msgid "Your Timezone:"
 msgstr ""
 
-#: ../../mod/settings.php:992
+#: ../../mod/settings.php:1033
 msgid "Default Post Location:"
 msgstr ""
 
-#: ../../mod/settings.php:993
+#: ../../mod/settings.php:1034
 msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../mod/settings.php:996
+#: ../../mod/settings.php:1037
 msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../mod/settings.php:998
+#: ../../mod/settings.php:1039
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/settings.php:998 ../../mod/settings.php:1017
+#: ../../mod/settings.php:1039 ../../mod/settings.php:1058
 msgid "(to prevent spam abuse)"
 msgstr ""
 
-#: ../../mod/settings.php:999
+#: ../../mod/settings.php:1040
 msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:1000
+#: ../../mod/settings.php:1041
 msgid "(click to open/close)"
 msgstr ""
 
-#: ../../mod/settings.php:1017
+#: ../../mod/settings.php:1058
 msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: ../../mod/settings.php:1020
+#: ../../mod/settings.php:1061
 msgid "Notification Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1021
+#: ../../mod/settings.php:1062
 msgid "By default post a status message when:"
 msgstr ""
 
-#: ../../mod/settings.php:1022
+#: ../../mod/settings.php:1063
 msgid "accepting a friend request"
 msgstr ""
 
-#: ../../mod/settings.php:1023
+#: ../../mod/settings.php:1064
 msgid "joining a forum/community"
 msgstr ""
 
-#: ../../mod/settings.php:1024
+#: ../../mod/settings.php:1065
 msgid "making an <em>interesting</em> profile change"
 msgstr ""
 
-#: ../../mod/settings.php:1025
+#: ../../mod/settings.php:1066
 msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../mod/settings.php:1026
+#: ../../mod/settings.php:1067
 msgid "You receive an introduction"
 msgstr ""
 
-#: ../../mod/settings.php:1027
+#: ../../mod/settings.php:1068
 msgid "Your introductions are confirmed"
 msgstr ""
 
-#: ../../mod/settings.php:1028
+#: ../../mod/settings.php:1069
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../mod/settings.php:1029
+#: ../../mod/settings.php:1070
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../mod/settings.php:1030
+#: ../../mod/settings.php:1071
 msgid "You receive a private message"
 msgstr ""
 
-#: ../../mod/settings.php:1031
+#: ../../mod/settings.php:1072
 msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../mod/settings.php:1032
+#: ../../mod/settings.php:1073
 msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../mod/settings.php:1033
+#: ../../mod/settings.php:1074
 msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: ../../mod/settings.php:1036
+#: ../../mod/settings.php:1077
 msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1037
+#: ../../mod/settings.php:1078
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
-#: ../../mod/manage.php:91
+#: ../../mod/manage.php:94
 msgid "Manage Identities and/or Pages"
 msgstr ""
 
-#: ../../mod/manage.php:94
+#: ../../mod/manage.php:97
 msgid ""
 "Toggle between different identities or community/group pages which share "
 "your account details or which you have been granted \"manage\" permissions"
 msgstr ""
 
-#: ../../mod/manage.php:96
+#: ../../mod/manage.php:99
 msgid "Select an identity to manage: "
 msgstr ""
 
@@ -2565,63 +2678,64 @@ msgstr ""
 msgid "Search Results For:"
 msgstr ""
 
-#: ../../mod/network.php:221 ../../mod/search.php:18
+#: ../../mod/network.php:224 ../../mod/search.php:21
 msgid "Remove term"
 msgstr ""
 
-#: ../../mod/network.php:230 ../../mod/search.php:27
+#: ../../mod/network.php:233 ../../mod/search.php:30
+#: ../../include/features.php:41
 msgid "Saved Searches"
 msgstr ""
 
-#: ../../mod/network.php:231 ../../include/group.php:275
+#: ../../mod/network.php:234 ../../include/group.php:275
 msgid "add"
 msgstr ""
 
-#: ../../mod/network.php:394
+#: ../../mod/network.php:397
 msgid "Commented Order"
 msgstr ""
 
-#: ../../mod/network.php:397
+#: ../../mod/network.php:400
 msgid "Sort by Comment Date"
 msgstr ""
 
-#: ../../mod/network.php:400
+#: ../../mod/network.php:403
 msgid "Posted Order"
 msgstr ""
 
-#: ../../mod/network.php:403
+#: ../../mod/network.php:406
 msgid "Sort by Post Date"
 msgstr ""
 
-#: ../../mod/network.php:410
+#: ../../mod/network.php:447
 msgid "Posts that mention or involve you"
 msgstr ""
 
-#: ../../mod/network.php:413
+#: ../../mod/network.php:453
 msgid "New"
 msgstr ""
 
-#: ../../mod/network.php:416
+#: ../../mod/network.php:456
 msgid "Activity Stream - by date"
 msgstr ""
 
-#: ../../mod/network.php:419
-msgid "Starred"
+#: ../../mod/network.php:462
+msgid "Shared Links"
 msgstr ""
 
-#: ../../mod/network.php:422
-msgid "Favourite Posts"
+#: ../../mod/network.php:465
+msgid "Interesting Links"
 msgstr ""
 
-#: ../../mod/network.php:425
-msgid "Shared Links"
+#: ../../mod/network.php:471
+msgid "Starred"
 msgstr ""
 
-#: ../../mod/network.php:428
-msgid "Interesting Links"
+#: ../../mod/network.php:474
+msgid "Favourite Posts"
 msgstr ""
 
-#: ../../mod/network.php:496
+#: ../../mod/network.php:546
 #, php-format
 msgid "Warning: This group contains %s member from an insecure network."
 msgid_plural ""
@@ -2629,41 +2743,81 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/network.php:499
+#: ../../mod/network.php:549
 msgid "Private messages to this group are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/network.php:569
+#: ../../mod/network.php:619
 msgid "Contact: "
 msgstr ""
 
-#: ../../mod/network.php:571
+#: ../../mod/network.php:621
 msgid "Private messages to this person are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/network.php:576
+#: ../../mod/network.php:626
 msgid "Invalid contact."
 msgstr ""
 
-#: ../../mod/notes.php:44 ../../boot.php:1707
+#: ../../mod/notes.php:44 ../../boot.php:1755
 msgid "Personal Notes"
 msgstr ""
 
 #: ../../mod/notes.php:63 ../../mod/filer.php:30
 #: ../../addon/facebook/facebook.php:770
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:263
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:281
 #: ../../addon/fbpost/fbpost.php:267
 #: ../../addon/dav/friendica/layout.fnk.php:441
-#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:681
+#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:688
+#: ../../addon.old/facebook/facebook.php:770
+#: ../../addon.old/privacy_image_cache/privacy_image_cache.php:263
+#: ../../addon.old/fbpost/fbpost.php:267
+#: ../../addon.old/dav/friendica/layout.fnk.php:441
+#: ../../addon.old/dav/friendica/layout.fnk.php:488
 msgid "Save"
 msgstr ""
 
+#: ../../mod/uimport.php:50 ../../mod/register.php:190
+msgid ""
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
+msgstr ""
+
+#: ../../mod/uimport.php:64
+msgid "Import"
+msgstr ""
+
+#: ../../mod/uimport.php:66
+msgid "Move account"
+msgstr ""
+
+#: ../../mod/uimport.php:67
+msgid ""
+"You can import an account from another Friendica server. <br>\r\n"
+"                            You need to export your account from the old "
+"server and upload it here. We will recreate your old account here with all "
+"your contacts. We will try also to inform your friends that you moved here."
+"<br>\r\n"
+"                            <b>This feature is experimental. We can't import "
+"contacts from the OStatus network (statusnet/identi.ca) or from diaspora"
+msgstr ""
+
+#: ../../mod/uimport.php:70
+msgid "Account file"
+msgstr ""
+
+#: ../../mod/uimport.php:70
+msgid ""
+"To export your accont, go to \"Settings->Export your porsonal data\" and "
+"select \"Export account\""
+msgstr ""
+
 #: ../../mod/wallmessage.php:42 ../../mod/wallmessage.php:112
 #, php-format
 msgid "Number of daily wall messages for %s exceeded. Message failed."
 msgstr ""
 
-#: ../../mod/wallmessage.php:56 ../../mod/message.php:59
+#: ../../mod/wallmessage.php:56 ../../mod/message.php:63
 msgid "No recipient selected."
 msgstr ""
 
@@ -2671,15 +2825,15 @@ msgstr ""
 msgid "Unable to check your home location."
 msgstr ""
 
-#: ../../mod/wallmessage.php:62 ../../mod/message.php:66
+#: ../../mod/wallmessage.php:62 ../../mod/message.php:70
 msgid "Message could not be sent."
 msgstr ""
 
-#: ../../mod/wallmessage.php:65 ../../mod/message.php:69
+#: ../../mod/wallmessage.php:65 ../../mod/message.php:73
 msgid "Message collection failure."
 msgstr ""
 
-#: ../../mod/wallmessage.php:68 ../../mod/message.php:72
+#: ../../mod/wallmessage.php:68 ../../mod/message.php:76
 msgid "Message sent."
 msgstr ""
 
@@ -2688,12 +2842,12 @@ msgid "No recipient."
 msgstr ""
 
 #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
-#: ../../mod/message.php:242 ../../mod/message.php:250
-#: ../../include/conversation.php:846 ../../include/conversation.php:863
+#: ../../mod/message.php:249 ../../mod/message.php:257
+#: ../../include/conversation.php:905 ../../include/conversation.php:923
 msgid "Please enter a link URL:"
 msgstr ""
 
-#: ../../mod/wallmessage.php:138 ../../mod/message.php:278
+#: ../../mod/wallmessage.php:138 ../../mod/message.php:285
 msgid "Send Private Message"
 msgstr ""
 
@@ -2704,18 +2858,18 @@ msgid ""
 "your site allow private mail from unknown senders."
 msgstr ""
 
-#: ../../mod/wallmessage.php:140 ../../mod/message.php:279
-#: ../../mod/message.php:469
+#: ../../mod/wallmessage.php:140 ../../mod/message.php:286
+#: ../../mod/message.php:476
 msgid "To:"
 msgstr ""
 
-#: ../../mod/wallmessage.php:141 ../../mod/message.php:284
-#: ../../mod/message.php:471
+#: ../../mod/wallmessage.php:141 ../../mod/message.php:291
+#: ../../mod/message.php:478
 msgid "Subject:"
 msgstr ""
 
-#: ../../mod/wallmessage.php:147 ../../mod/message.php:288
-#: ../../mod/message.php:474 ../../mod/invite.php:113
+#: ../../mod/wallmessage.php:147 ../../mod/message.php:295
+#: ../../mod/message.php:481 ../../mod/invite.php:113
 msgid "Your message:"
 msgstr ""
 
@@ -2770,9 +2924,9 @@ msgid ""
 msgstr ""
 
 #: ../../mod/newmember.php:32 ../../mod/profperm.php:103
-#: ../../view/theme/diabook/theme.php:128 ../../include/profile_advanced.php:7
+#: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7
 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50
-#: ../../boot.php:1683
+#: ../../boot.php:1731
 msgid "Profile"
 msgstr ""
 
@@ -2816,6 +2970,8 @@ msgstr ""
 #: ../../mod/newmember.php:49 ../../mod/newmember.php:51
 #: ../../addon/facebook/facebook.php:728 ../../addon/fbpost/fbpost.php:239
 #: ../../include/contact_selectors.php:81
+#: ../../addon.old/facebook/facebook.php:728
+#: ../../addon.old/fbpost/fbpost.php:239
 msgid "Facebook"
 msgstr ""
 
@@ -2941,7 +3097,7 @@ msgstr ""
 msgid "Group name changed."
 msgstr ""
 
-#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:316
+#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:332
 msgid "Permission denied"
 msgstr ""
 
@@ -2993,95 +3149,89 @@ msgstr ""
 msgid "No contacts."
 msgstr ""
 
-#: ../../mod/viewcontacts.php:76 ../../include/text.php:618
+#: ../../mod/viewcontacts.php:76 ../../include/text.php:625
 msgid "View Contacts"
 msgstr ""
 
-#: ../../mod/register.php:88 ../../mod/regmod.php:52
+#: ../../mod/register.php:89 ../../mod/regmod.php:52
 #, php-format
 msgid "Registration details for %s"
 msgstr ""
 
-#: ../../mod/register.php:96
+#: ../../mod/register.php:97
 msgid ""
 "Registration successful. Please check your email for further instructions."
 msgstr ""
 
-#: ../../mod/register.php:100
+#: ../../mod/register.php:101
 msgid "Failed to send email message. Here is the message that failed."
 msgstr ""
 
-#: ../../mod/register.php:105
+#: ../../mod/register.php:106
 msgid "Your registration can not be processed."
 msgstr ""
 
-#: ../../mod/register.php:142
+#: ../../mod/register.php:143
 #, php-format
 msgid "Registration request at %s"
 msgstr ""
 
-#: ../../mod/register.php:151
+#: ../../mod/register.php:152
 msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: ../../mod/register.php:189
-msgid ""
-"This site has exceeded the number of allowed daily account registrations. "
-"Please try again tomorrow."
-msgstr ""
-
-#: ../../mod/register.php:217
+#: ../../mod/register.php:218
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
 msgstr ""
 
-#: ../../mod/register.php:218
+#: ../../mod/register.php:219
 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:219
+#: ../../mod/register.php:220
 msgid "Your OpenID (optional): "
 msgstr ""
 
-#: ../../mod/register.php:233
+#: ../../mod/register.php:234
 msgid "Include your profile in member directory?"
 msgstr ""
 
-#: ../../mod/register.php:255
+#: ../../mod/register.php:256
 msgid "Membership on this site is by invitation only."
 msgstr ""
 
-#: ../../mod/register.php:256
+#: ../../mod/register.php:257
 msgid "Your invitation ID: "
 msgstr ""
 
-#: ../../mod/register.php:259 ../../mod/admin.php:444
+#: ../../mod/register.php:260 ../../mod/admin.php:446
 msgid "Registration"
 msgstr ""
 
-#: ../../mod/register.php:267
+#: ../../mod/register.php:268
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr ""
 
-#: ../../mod/register.php:268
+#: ../../mod/register.php:269
 msgid "Your Email Address: "
 msgstr ""
 
-#: ../../mod/register.php:269
+#: ../../mod/register.php:270
 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:270
+#: ../../mod/register.php:271
 msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/register.php:273 ../../include/nav.php:81 ../../boot.php:897
+#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:923
 msgid "Register"
 msgstr ""
 
@@ -3089,21 +3239,35 @@ msgstr ""
 msgid "People Search"
 msgstr ""
 
+#: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62
+#: ../../addon/communityhome/communityhome.php:163
+#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1442
+#: ../../include/diaspora.php:1848 ../../include/conversation.php:125
+#: ../../include/conversation.php:253
+#: ../../addon.old/communityhome/communityhome.php:163
+msgid "photo"
+msgstr ""
+
 #: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/subthread.php:87
 #: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598
 #: ../../addon/communityhome/communityhome.php:158
 #: ../../addon/communityhome/communityhome.php:167
-#: ../../view/theme/diabook/theme.php:565
-#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1835
+#: ../../view/theme/diabook/theme.php:459
+#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1848
 #: ../../include/conversation.php:120 ../../include/conversation.php:129
 #: ../../include/conversation.php:248 ../../include/conversation.php:257
+#: ../../addon.old/facebook/facebook.php:1598
+#: ../../addon.old/communityhome/communityhome.php:158
+#: ../../addon.old/communityhome/communityhome.php:167
 msgid "status"
 msgstr ""
 
 #: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602
 #: ../../addon/communityhome/communityhome.php:172
-#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1851
+#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1864
 #: ../../include/conversation.php:136
+#: ../../addon.old/facebook/facebook.php:1602
+#: ../../addon.old/communityhome/communityhome.php:172
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr ""
@@ -3114,8 +3278,8 @@ msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
-#: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:29
-#: ../../mod/display.php:145 ../../include/items.php:3779
+#: ../../mod/admin.php:737 ../../mod/admin.php:936 ../../mod/display.php:39
+#: ../../mod/display.php:169 ../../include/items.php:3843
 msgid "Item not found."
 msgstr ""
 
@@ -3123,8 +3287,8 @@ msgstr ""
 msgid "Access denied."
 msgstr ""
 
-#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130
-#: ../../include/nav.php:51 ../../boot.php:1690
+#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90
+#: ../../include/nav.php:51 ../../boot.php:1738
 msgid "Photos"
 msgstr ""
 
@@ -3145,42 +3309,42 @@ msgstr ""
 msgid "Please login."
 msgstr ""
 
-#: ../../mod/item.php:91
+#: ../../mod/item.php:104
 msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../mod/item.php:275
+#: ../../mod/item.php:288
 msgid "Empty post discarded."
 msgstr ""
 
-#: ../../mod/item.php:407 ../../mod/wall_upload.php:133
-#: ../../mod/wall_upload.php:142 ../../mod/wall_upload.php:149
+#: ../../mod/item.php:424 ../../mod/wall_upload.php:135
+#: ../../mod/wall_upload.php:144 ../../mod/wall_upload.php:151
 #: ../../include/message.php:144
 msgid "Wall Photos"
 msgstr ""
 
-#: ../../mod/item.php:820
+#: ../../mod/item.php:837
 msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/item.php:845
+#: ../../mod/item.php:862
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social network."
 msgstr ""
 
-#: ../../mod/item.php:847
+#: ../../mod/item.php:864
 #, php-format
 msgid "You may visit them online at %s"
 msgstr ""
 
-#: ../../mod/item.php:848
+#: ../../mod/item.php:865
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr ""
 
-#: ../../mod/item.php:850
+#: ../../mod/item.php:867
 #, php-format
 msgid "%s posted an update."
 msgstr ""
@@ -3218,7 +3382,7 @@ msgstr ""
 msgid "Unable to process image"
 msgstr ""
 
-#: ../../mod/profile_photo.php:144 ../../mod/wall_upload.php:88
+#: ../../mod/profile_photo.php:144 ../../mod/wall_upload.php:90
 #, php-format
 msgid "Image exceeds size limit of %d"
 msgstr ""
@@ -3233,6 +3397,7 @@ msgstr ""
 
 #: ../../mod/profile_photo.php:245
 #: ../../addon/dav/friendica/layout.fnk.php:152
+#: ../../addon.old/dav/friendica/layout.fnk.php:152
 msgid "Upload"
 msgstr ""
 
@@ -3278,71 +3443,71 @@ msgstr ""
 msgid "Please enter your password for verification:"
 msgstr ""
 
-#: ../../mod/message.php:9 ../../include/nav.php:131
+#: ../../mod/message.php:9 ../../include/nav.php:132
 msgid "New Message"
 msgstr ""
 
-#: ../../mod/message.php:63
+#: ../../mod/message.php:67
 msgid "Unable to locate contact information."
 msgstr ""
 
-#: ../../mod/message.php:191
+#: ../../mod/message.php:195
 msgid "Message deleted."
 msgstr ""
 
-#: ../../mod/message.php:221
+#: ../../mod/message.php:225
 msgid "Conversation removed."
 msgstr ""
 
-#: ../../mod/message.php:327
+#: ../../mod/message.php:334
 msgid "No messages."
 msgstr ""
 
-#: ../../mod/message.php:334
+#: ../../mod/message.php:341
 #, php-format
 msgid "Unknown sender - %s"
 msgstr ""
 
-#: ../../mod/message.php:337
+#: ../../mod/message.php:344
 #, php-format
 msgid "You and %s"
 msgstr ""
 
-#: ../../mod/message.php:340
+#: ../../mod/message.php:347
 #, php-format
 msgid "%s and You"
 msgstr ""
 
-#: ../../mod/message.php:350 ../../mod/message.php:462
+#: ../../mod/message.php:357 ../../mod/message.php:469
 msgid "Delete conversation"
 msgstr ""
 
-#: ../../mod/message.php:353
+#: ../../mod/message.php:360
 msgid "D, d M Y - g:i A"
 msgstr ""
 
-#: ../../mod/message.php:356
+#: ../../mod/message.php:363
 #, php-format
 msgid "%d message"
 msgid_plural "%d messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/message.php:391
+#: ../../mod/message.php:398
 msgid "Message not available."
 msgstr ""
 
-#: ../../mod/message.php:444
+#: ../../mod/message.php:451
 msgid "Delete message"
 msgstr ""
 
-#: ../../mod/message.php:464
+#: ../../mod/message.php:471
 msgid ""
 "No secure communications available. You <strong>may</strong> be able to "
 "respond from the sender's profile page."
 msgstr ""
 
-#: ../../mod/message.php:468
+#: ../../mod/message.php:475
 msgid "Send Reply"
 msgstr ""
 
@@ -3359,19 +3524,19 @@ msgstr ""
 msgid "Theme settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:96 ../../mod/admin.php:442
+#: ../../mod/admin.php:96 ../../mod/admin.php:444
 msgid "Site"
 msgstr ""
 
-#: ../../mod/admin.php:97 ../../mod/admin.php:688 ../../mod/admin.php:701
+#: ../../mod/admin.php:97 ../../mod/admin.php:691 ../../mod/admin.php:704
 msgid "Users"
 msgstr ""
 
-#: ../../mod/admin.php:98 ../../mod/admin.php:783 ../../mod/admin.php:825
+#: ../../mod/admin.php:98 ../../mod/admin.php:786 ../../mod/admin.php:828
 msgid "Plugins"
 msgstr ""
 
-#: ../../mod/admin.php:99 ../../mod/admin.php:988 ../../mod/admin.php:1024
+#: ../../mod/admin.php:99 ../../mod/admin.php:991 ../../mod/admin.php:1027
 msgid "Themes"
 msgstr ""
 
@@ -3379,11 +3544,11 @@ msgstr ""
 msgid "DB updates"
 msgstr ""
 
-#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1111
+#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1114
 msgid "Logs"
 msgstr ""
 
-#: ../../mod/admin.php:120 ../../include/nav.php:146
+#: ../../mod/admin.php:120 ../../include/nav.php:149
 msgid "Admin"
 msgstr ""
 
@@ -3395,19 +3560,19 @@ msgstr ""
 msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: ../../mod/admin.php:183 ../../mod/admin.php:669
+#: ../../mod/admin.php:183 ../../mod/admin.php:672
 msgid "Normal Account"
 msgstr ""
 
-#: ../../mod/admin.php:184 ../../mod/admin.php:670
+#: ../../mod/admin.php:184 ../../mod/admin.php:673
 msgid "Soapbox Account"
 msgstr ""
 
-#: ../../mod/admin.php:185 ../../mod/admin.php:671
+#: ../../mod/admin.php:185 ../../mod/admin.php:674
 msgid "Community/Celebrity Account"
 msgstr ""
 
-#: ../../mod/admin.php:186 ../../mod/admin.php:672
+#: ../../mod/admin.php:186 ../../mod/admin.php:675
 msgid "Automatic Friend Account"
 msgstr ""
 
@@ -3423,9 +3588,9 @@ msgstr ""
 msgid "Message queues"
 msgstr ""
 
-#: ../../mod/admin.php:212 ../../mod/admin.php:441 ../../mod/admin.php:687
-#: ../../mod/admin.php:782 ../../mod/admin.php:824 ../../mod/admin.php:987
-#: ../../mod/admin.php:1023 ../../mod/admin.php:1110
+#: ../../mod/admin.php:212 ../../mod/admin.php:443 ../../mod/admin.php:690
+#: ../../mod/admin.php:785 ../../mod/admin.php:827 ../../mod/admin.php:990
+#: ../../mod/admin.php:1026 ../../mod/admin.php:1113
 msgid "Administration"
 msgstr ""
 
@@ -3449,565 +3614,578 @@ msgstr ""
 msgid "Active plugins"
 msgstr ""
 
-#: ../../mod/admin.php:373
+#: ../../mod/admin.php:375
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:428
+#: ../../mod/admin.php:430
 msgid "Closed"
 msgstr ""
 
-#: ../../mod/admin.php:429
+#: ../../mod/admin.php:431
 msgid "Requires approval"
 msgstr ""
 
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:432
 msgid "Open"
 msgstr ""
 
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:436
 msgid "No SSL policy, links will track page SSL state"
 msgstr ""
 
-#: ../../mod/admin.php:435
+#: ../../mod/admin.php:437
 msgid "Force all links to use SSL"
 msgstr ""
 
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:438
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr ""
 
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:447
 msgid "File upload"
 msgstr ""
 
-#: ../../mod/admin.php:446
+#: ../../mod/admin.php:448
 msgid "Policies"
 msgstr ""
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:449
 msgid "Advanced"
 msgstr ""
 
-#: ../../mod/admin.php:451 ../../addon/statusnet/statusnet.php:567
+#: ../../mod/admin.php:453 ../../addon/statusnet/statusnet.php:676
+#: ../../addon.old/statusnet/statusnet.php:567
 msgid "Site name"
 msgstr ""
 
-#: ../../mod/admin.php:452
+#: ../../mod/admin.php:454
 msgid "Banner/Logo"
 msgstr ""
 
-#: ../../mod/admin.php:453
+#: ../../mod/admin.php:455
 msgid "System language"
 msgstr ""
 
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:456
 msgid "System theme"
 msgstr ""
 
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:456
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr ""
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:457
 msgid "Mobile system theme"
 msgstr ""
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:457
 msgid "Theme for mobile devices"
 msgstr ""
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:458
 msgid "SSL link policy"
 msgstr ""
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:458
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr ""
 
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:459
 msgid "Maximum image size"
 msgstr ""
 
-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:459
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:460
 msgid "Maximum image length"
 msgstr ""
 
-#: ../../mod/admin.php:458
+#: ../../mod/admin.php:460
 msgid ""
 "Maximum length in pixels of the longest side of uploaded images. Default is -"
 "1, which means no limits."
 msgstr ""
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:461
 msgid "JPEG image quality"
 msgstr ""
 
-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:461
 msgid ""
 "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
 "100, which is full quality."
 msgstr ""
 
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:463
 msgid "Register policy"
 msgstr ""
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:464
+msgid "Maximum Daily Registrations"
+msgstr ""
+
+#: ../../mod/admin.php:464
+msgid ""
+"If registration is permitted above, this sets the maximum number of new user "
+"registrations to accept per day.  If register is set to closed, this setting "
+"has no effect."
+msgstr ""
+
+#: ../../mod/admin.php:465
 msgid "Register text"
 msgstr ""
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:465
 msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:466
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:466
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:467
 msgid "Allowed friend domains"
 msgstr ""
 
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:467
 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:465
+#: ../../mod/admin.php:468
 msgid "Allowed email domains"
 msgstr ""
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:468
 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:466
+#: ../../mod/admin.php:469
 msgid "Block public"
 msgstr ""
 
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:469
 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:467
+#: ../../mod/admin.php:470
 msgid "Force publish"
 msgstr ""
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:470
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: ../../mod/admin.php:468
+#: ../../mod/admin.php:471
 msgid "Global directory update URL"
 msgstr ""
 
-#: ../../mod/admin.php:468
+#: ../../mod/admin.php:471
 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:469
+#: ../../mod/admin.php:472
 msgid "Allow threaded items"
 msgstr ""
 
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:472
 msgid "Allow infinite level threading for items on this site."
 msgstr ""
 
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:473
 msgid "Private posts by default for new users"
 msgstr ""
 
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:473
 msgid ""
 "Set default post permissions for all new members to the default privacy "
 "group rather than public."
 msgstr ""
 
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:475
 msgid "Block multiple registrations"
 msgstr ""
 
-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:475
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr ""
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:476
 msgid "OpenID support"
 msgstr ""
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:476
 msgid "OpenID support for registration and logins."
 msgstr ""
 
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:477
 msgid "Fullname check"
 msgstr ""
 
-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:477
 msgid ""
 "Force users to register with a space between firstname and lastname in Full "
 "name, as an antispam measure"
 msgstr ""
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:478
 msgid "UTF-8 Regular expressions"
 msgstr ""
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:478
 msgid "Use PHP UTF8 regular expressions"
 msgstr ""
 
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:479
 msgid "Show Community Page"
 msgstr ""
 
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:479
 msgid ""
 "Display a Community page showing all recent public postings on this site."
 msgstr ""
 
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:480
 msgid "Enable OStatus support"
 msgstr ""
 
-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:480
 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:478
+#: ../../mod/admin.php:481
 msgid "Enable Diaspora support"
 msgstr ""
 
-#: ../../mod/admin.php:478
+#: ../../mod/admin.php:481
 msgid "Provide built-in Diaspora network compatibility."
 msgstr ""
 
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:482
 msgid "Only allow Friendica contacts"
 msgstr ""
 
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:482
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr ""
 
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:483
 msgid "Verify SSL"
 msgstr ""
 
-#: ../../mod/admin.php:480
+#: ../../mod/admin.php:483
 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:481
+#: ../../mod/admin.php:484
 msgid "Proxy user"
 msgstr ""
 
-#: ../../mod/admin.php:482
+#: ../../mod/admin.php:485
 msgid "Proxy URL"
 msgstr ""
 
-#: ../../mod/admin.php:483
+#: ../../mod/admin.php:486
 msgid "Network timeout"
 msgstr ""
 
-#: ../../mod/admin.php:483
+#: ../../mod/admin.php:486
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: ../../mod/admin.php:484
+#: ../../mod/admin.php:487
 msgid "Delivery interval"
 msgstr ""
 
-#: ../../mod/admin.php:484
+#: ../../mod/admin.php:487
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr ""
 
-#: ../../mod/admin.php:485
+#: ../../mod/admin.php:488
 msgid "Poll interval"
 msgstr ""
 
-#: ../../mod/admin.php:485
+#: ../../mod/admin.php:488
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr ""
 
-#: ../../mod/admin.php:486
+#: ../../mod/admin.php:489
 msgid "Maximum Load Average"
 msgstr ""
 
-#: ../../mod/admin.php:486
+#: ../../mod/admin.php:489
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr ""
 
-#: ../../mod/admin.php:503
+#: ../../mod/admin.php:506
 msgid "Update has been marked successful"
 msgstr ""
 
-#: ../../mod/admin.php:513
+#: ../../mod/admin.php:516
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr ""
 
-#: ../../mod/admin.php:516
+#: ../../mod/admin.php:519
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr ""
 
-#: ../../mod/admin.php:520
+#: ../../mod/admin.php:523
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: ../../mod/admin.php:523
+#: ../../mod/admin.php:526
 #, php-format
 msgid "Update function %s could not be found."
 msgstr ""
 
-#: ../../mod/admin.php:538
+#: ../../mod/admin.php:541
 msgid "No failed updates."
 msgstr ""
 
-#: ../../mod/admin.php:542
+#: ../../mod/admin.php:545
 msgid "Failed Updates"
 msgstr ""
 
-#: ../../mod/admin.php:543
+#: ../../mod/admin.php:546
 msgid ""
 "This does not include updates prior to 1139, which did not return a status."
 msgstr ""
 
-#: ../../mod/admin.php:544
+#: ../../mod/admin.php:547
 msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: ../../mod/admin.php:545
+#: ../../mod/admin.php:548
 msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: ../../mod/admin.php:570
+#: ../../mod/admin.php:573
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:577
+#: ../../mod/admin.php:580
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:616
+#: ../../mod/admin.php:619
 #, php-format
 msgid "User '%s' deleted"
 msgstr ""
 
-#: ../../mod/admin.php:624
+#: ../../mod/admin.php:627
 #, php-format
 msgid "User '%s' unblocked"
 msgstr ""
 
-#: ../../mod/admin.php:624
+#: ../../mod/admin.php:627
 #, php-format
 msgid "User '%s' blocked"
 msgstr ""
 
-#: ../../mod/admin.php:690
+#: ../../mod/admin.php:693
 msgid "select all"
 msgstr ""
 
-#: ../../mod/admin.php:691
+#: ../../mod/admin.php:694
 msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../mod/admin.php:692
+#: ../../mod/admin.php:695
 msgid "Request date"
 msgstr ""
 
-#: ../../mod/admin.php:692 ../../mod/admin.php:702
+#: ../../mod/admin.php:695 ../../mod/admin.php:705
 #: ../../include/contact_selectors.php:79
+#: ../../include/contact_selectors.php:86
 msgid "Email"
 msgstr ""
 
-#: ../../mod/admin.php:693
+#: ../../mod/admin.php:696
 msgid "No registrations."
 msgstr ""
 
-#: ../../mod/admin.php:695
+#: ../../mod/admin.php:698
 msgid "Deny"
 msgstr ""
 
-#: ../../mod/admin.php:699
+#: ../../mod/admin.php:702
 msgid "Site admin"
 msgstr ""
 
-#: ../../mod/admin.php:702
+#: ../../mod/admin.php:705
 msgid "Register date"
 msgstr ""
 
-#: ../../mod/admin.php:702
+#: ../../mod/admin.php:705
 msgid "Last login"
 msgstr ""
 
-#: ../../mod/admin.php:702
+#: ../../mod/admin.php:705
 msgid "Last item"
 msgstr ""
 
-#: ../../mod/admin.php:702
+#: ../../mod/admin.php:705
 msgid "Account"
 msgstr ""
 
-#: ../../mod/admin.php:704
+#: ../../mod/admin.php:707
 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:705
+#: ../../mod/admin.php:708
 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:746
+#: ../../mod/admin.php:749
 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../mod/admin.php:750
+#: ../../mod/admin.php:753
 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../mod/admin.php:760 ../../mod/admin.php:958
+#: ../../mod/admin.php:763 ../../mod/admin.php:961
 msgid "Disable"
 msgstr ""
 
-#: ../../mod/admin.php:762 ../../mod/admin.php:960
+#: ../../mod/admin.php:765 ../../mod/admin.php:963
 msgid "Enable"
 msgstr ""
 
-#: ../../mod/admin.php:784 ../../mod/admin.php:989
+#: ../../mod/admin.php:787 ../../mod/admin.php:992
 msgid "Toggle"
 msgstr ""
 
-#: ../../mod/admin.php:792 ../../mod/admin.php:999
+#: ../../mod/admin.php:795 ../../mod/admin.php:1002
 msgid "Author: "
 msgstr ""
 
-#: ../../mod/admin.php:793 ../../mod/admin.php:1000
+#: ../../mod/admin.php:796 ../../mod/admin.php:1003
 msgid "Maintainer: "
 msgstr ""
 
-#: ../../mod/admin.php:922
+#: ../../mod/admin.php:925
 msgid "No themes found."
 msgstr ""
 
-#: ../../mod/admin.php:981
+#: ../../mod/admin.php:984
 msgid "Screenshot"
 msgstr ""
 
-#: ../../mod/admin.php:1029
+#: ../../mod/admin.php:1032
 msgid "[Experimental]"
 msgstr ""
 
-#: ../../mod/admin.php:1030
+#: ../../mod/admin.php:1033
 msgid "[Unsupported]"
 msgstr ""
 
-#: ../../mod/admin.php:1057
+#: ../../mod/admin.php:1060
 msgid "Log settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:1113
+#: ../../mod/admin.php:1116
 msgid "Clear"
 msgstr ""
 
-#: ../../mod/admin.php:1119
+#: ../../mod/admin.php:1122
 msgid "Debugging"
 msgstr ""
 
-#: ../../mod/admin.php:1120
+#: ../../mod/admin.php:1123
 msgid "Log file"
 msgstr ""
 
-#: ../../mod/admin.php:1120
+#: ../../mod/admin.php:1123
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr ""
 
-#: ../../mod/admin.php:1121
+#: ../../mod/admin.php:1124
 msgid "Log level"
 msgstr ""
 
-#: ../../mod/admin.php:1171
+#: ../../mod/admin.php:1174
 msgid "Close"
 msgstr ""
 
-#: ../../mod/admin.php:1177
+#: ../../mod/admin.php:1180
 msgid "FTP Host"
 msgstr ""
 
-#: ../../mod/admin.php:1178
+#: ../../mod/admin.php:1181
 msgid "FTP Path"
 msgstr ""
 
-#: ../../mod/admin.php:1179
+#: ../../mod/admin.php:1182
 msgid "FTP User"
 msgstr ""
 
-#: ../../mod/admin.php:1180
+#: ../../mod/admin.php:1183
 msgid "FTP Password"
 msgstr ""
 
-#: ../../mod/profile.php:22 ../../boot.php:1084
+#: ../../mod/profile.php:21 ../../boot.php:1126
 msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../mod/profile.php:152 ../../mod/display.php:77
+#: ../../mod/profile.php:155 ../../mod/display.php:87
 msgid "Access to this profile has been restricted."
 msgstr ""
 
-#: ../../mod/profile.php:177
+#: ../../mod/profile.php:180
 msgid "Tips for New Members"
 msgstr ""
 
@@ -4069,8 +4247,8 @@ msgid ""
 "Account not found and OpenID registration is not permitted on this site."
 msgstr ""
 
-#: ../../mod/openid.php:93 ../../include/auth.php:98
-#: ../../include/auth.php:161
+#: ../../mod/openid.php:93 ../../include/auth.php:110
+#: ../../include/auth.php:173
 msgid "Login failed."
 msgstr ""
 
@@ -4095,7 +4273,7 @@ msgstr ""
 msgid "link"
 msgstr ""
 
-#: ../../mod/display.php:138
+#: ../../mod/display.php:162
 msgid "Item has been removed."
 msgstr ""
 
@@ -4107,13 +4285,13 @@ msgstr ""
 msgid "No installed applications."
 msgstr ""
 
-#: ../../mod/search.php:98 ../../include/text.php:678
-#: ../../include/text.php:679 ../../include/nav.php:91
+#: ../../mod/search.php:99 ../../include/text.php:685
+#: ../../include/text.php:686 ../../include/nav.php:91
 msgid "Search"
 msgstr ""
 
-#: ../../mod/profiles.php:21 ../../mod/profiles.php:434
-#: ../../mod/profiles.php:548 ../../mod/dfrn_confirm.php:62
+#: ../../mod/profiles.php:21 ../../mod/profiles.php:441
+#: ../../mod/profiles.php:555 ../../mod/dfrn_confirm.php:62
 msgid "Profile not found."
 msgstr ""
 
@@ -4121,306 +4299,312 @@ msgstr ""
 msgid "Profile Name is required."
 msgstr ""
 
-#: ../../mod/profiles.php:171
+#: ../../mod/profiles.php:178
 msgid "Marital Status"
 msgstr ""
 
-#: ../../mod/profiles.php:175
+#: ../../mod/profiles.php:182
 msgid "Romantic Partner"
 msgstr ""
 
-#: ../../mod/profiles.php:179
+#: ../../mod/profiles.php:186
 msgid "Likes"
 msgstr ""
 
-#: ../../mod/profiles.php:183
+#: ../../mod/profiles.php:190
 msgid "Dislikes"
 msgstr ""
 
-#: ../../mod/profiles.php:187
+#: ../../mod/profiles.php:194
 msgid "Work/Employment"
 msgstr ""
 
-#: ../../mod/profiles.php:190
+#: ../../mod/profiles.php:197
 msgid "Religion"
 msgstr ""
 
-#: ../../mod/profiles.php:194
+#: ../../mod/profiles.php:201
 msgid "Political Views"
 msgstr ""
 
-#: ../../mod/profiles.php:198
+#: ../../mod/profiles.php:205
 msgid "Gender"
 msgstr ""
 
-#: ../../mod/profiles.php:202
+#: ../../mod/profiles.php:209
 msgid "Sexual Preference"
 msgstr ""
 
-#: ../../mod/profiles.php:206
+#: ../../mod/profiles.php:213
 msgid "Homepage"
 msgstr ""
 
-#: ../../mod/profiles.php:210
+#: ../../mod/profiles.php:217
 msgid "Interests"
 msgstr ""
 
-#: ../../mod/profiles.php:214
+#: ../../mod/profiles.php:221
 msgid "Address"
 msgstr ""
 
-#: ../../mod/profiles.php:221 ../../addon/dav/common/wdcal_edit.inc.php:183
+#: ../../mod/profiles.php:228 ../../addon/dav/common/wdcal_edit.inc.php:183
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:183
 msgid "Location"
 msgstr ""
 
-#: ../../mod/profiles.php:304
+#: ../../mod/profiles.php:311
 msgid "Profile updated."
 msgstr ""
 
-#: ../../mod/profiles.php:371
+#: ../../mod/profiles.php:378
 msgid " and "
 msgstr ""
 
-#: ../../mod/profiles.php:379
+#: ../../mod/profiles.php:386
 msgid "public profile"
 msgstr ""
 
-#: ../../mod/profiles.php:382
+#: ../../mod/profiles.php:389
 #, php-format
 msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
 msgstr ""
 
-#: ../../mod/profiles.php:383
+#: ../../mod/profiles.php:390
 #, php-format
 msgid " - Visit %1$s's %2$s"
 msgstr ""
 
-#: ../../mod/profiles.php:386
+#: ../../mod/profiles.php:393
 #, php-format
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: ../../mod/profiles.php:453
+#: ../../mod/profiles.php:460
 msgid "Profile deleted."
 msgstr ""
 
-#: ../../mod/profiles.php:471 ../../mod/profiles.php:505
+#: ../../mod/profiles.php:478 ../../mod/profiles.php:512
 msgid "Profile-"
 msgstr ""
 
-#: ../../mod/profiles.php:490 ../../mod/profiles.php:532
+#: ../../mod/profiles.php:497 ../../mod/profiles.php:539
 msgid "New profile created."
 msgstr ""
 
-#: ../../mod/profiles.php:511
+#: ../../mod/profiles.php:518
 msgid "Profile unavailable to clone."
 msgstr ""
 
-#: ../../mod/profiles.php:573
+#: ../../mod/profiles.php:583
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr ""
 
-#: ../../mod/profiles.php:593
+#: ../../mod/profiles.php:603
 msgid "Edit Profile Details"
 msgstr ""
 
-#: ../../mod/profiles.php:595
+#: ../../mod/profiles.php:605
+msgid "Change Profile Photo"
+msgstr ""
+
+#: ../../mod/profiles.php:606
 msgid "View this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:596
+#: ../../mod/profiles.php:607
 msgid "Create a new profile using these settings"
 msgstr ""
 
-#: ../../mod/profiles.php:597
+#: ../../mod/profiles.php:608
 msgid "Clone this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:598
+#: ../../mod/profiles.php:609
 msgid "Delete this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:599
+#: ../../mod/profiles.php:610
 msgid "Profile Name:"
 msgstr ""
 
-#: ../../mod/profiles.php:600
+#: ../../mod/profiles.php:611
 msgid "Your Full Name:"
 msgstr ""
 
-#: ../../mod/profiles.php:601
+#: ../../mod/profiles.php:612
 msgid "Title/Description:"
 msgstr ""
 
-#: ../../mod/profiles.php:602
+#: ../../mod/profiles.php:613
 msgid "Your Gender:"
 msgstr ""
 
-#: ../../mod/profiles.php:603
+#: ../../mod/profiles.php:614
 #, php-format
 msgid "Birthday (%s):"
 msgstr ""
 
-#: ../../mod/profiles.php:604
+#: ../../mod/profiles.php:615
 msgid "Street Address:"
 msgstr ""
 
-#: ../../mod/profiles.php:605
+#: ../../mod/profiles.php:616
 msgid "Locality/City:"
 msgstr ""
 
-#: ../../mod/profiles.php:606
+#: ../../mod/profiles.php:617
 msgid "Postal/Zip Code:"
 msgstr ""
 
-#: ../../mod/profiles.php:607
+#: ../../mod/profiles.php:618
 msgid "Country:"
 msgstr ""
 
-#: ../../mod/profiles.php:608
+#: ../../mod/profiles.php:619
 msgid "Region/State:"
 msgstr ""
 
-#: ../../mod/profiles.php:609
+#: ../../mod/profiles.php:620
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr ""
 
-#: ../../mod/profiles.php:610
+#: ../../mod/profiles.php:621
 msgid "Who: (if applicable)"
 msgstr ""
 
-#: ../../mod/profiles.php:611
+#: ../../mod/profiles.php:622
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: ../../mod/profiles.php:612
+#: ../../mod/profiles.php:623
 msgid "Since [date]:"
 msgstr ""
 
-#: ../../mod/profiles.php:613 ../../include/profile_advanced.php:46
+#: ../../mod/profiles.php:624 ../../include/profile_advanced.php:46
 msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../mod/profiles.php:614
+#: ../../mod/profiles.php:625
 msgid "Homepage URL:"
 msgstr ""
 
-#: ../../mod/profiles.php:615 ../../include/profile_advanced.php:50
+#: ../../mod/profiles.php:626 ../../include/profile_advanced.php:50
 msgid "Hometown:"
 msgstr ""
 
-#: ../../mod/profiles.php:616 ../../include/profile_advanced.php:54
+#: ../../mod/profiles.php:627 ../../include/profile_advanced.php:54
 msgid "Political Views:"
 msgstr ""
 
-#: ../../mod/profiles.php:617
+#: ../../mod/profiles.php:628
 msgid "Religious Views:"
 msgstr ""
 
-#: ../../mod/profiles.php:618
+#: ../../mod/profiles.php:629
 msgid "Public Keywords:"
 msgstr ""
 
-#: ../../mod/profiles.php:619
+#: ../../mod/profiles.php:630
 msgid "Private Keywords:"
 msgstr ""
 
-#: ../../mod/profiles.php:620 ../../include/profile_advanced.php:62
+#: ../../mod/profiles.php:631 ../../include/profile_advanced.php:62
 msgid "Likes:"
 msgstr ""
 
-#: ../../mod/profiles.php:621 ../../include/profile_advanced.php:64
+#: ../../mod/profiles.php:632 ../../include/profile_advanced.php:64
 msgid "Dislikes:"
 msgstr ""
 
-#: ../../mod/profiles.php:622
+#: ../../mod/profiles.php:633
 msgid "Example: fishing photography software"
 msgstr ""
 
-#: ../../mod/profiles.php:623
+#: ../../mod/profiles.php:634
 msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr ""
 
-#: ../../mod/profiles.php:624
+#: ../../mod/profiles.php:635
 msgid "(Used for searching profiles, never shown to others)"
 msgstr ""
 
-#: ../../mod/profiles.php:625
+#: ../../mod/profiles.php:636
 msgid "Tell us about yourself..."
 msgstr ""
 
-#: ../../mod/profiles.php:626
+#: ../../mod/profiles.php:637
 msgid "Hobbies/Interests"
 msgstr ""
 
-#: ../../mod/profiles.php:627
+#: ../../mod/profiles.php:638
 msgid "Contact information and Social Networks"
 msgstr ""
 
-#: ../../mod/profiles.php:628
+#: ../../mod/profiles.php:639
 msgid "Musical interests"
 msgstr ""
 
-#: ../../mod/profiles.php:629
+#: ../../mod/profiles.php:640
 msgid "Books, literature"
 msgstr ""
 
-#: ../../mod/profiles.php:630
+#: ../../mod/profiles.php:641
 msgid "Television"
 msgstr ""
 
-#: ../../mod/profiles.php:631
+#: ../../mod/profiles.php:642
 msgid "Film/dance/culture/entertainment"
 msgstr ""
 
-#: ../../mod/profiles.php:632
+#: ../../mod/profiles.php:643
 msgid "Love/romance"
 msgstr ""
 
-#: ../../mod/profiles.php:633
+#: ../../mod/profiles.php:644
 msgid "Work/employment"
 msgstr ""
 
-#: ../../mod/profiles.php:634
+#: ../../mod/profiles.php:645
 msgid "School/education"
 msgstr ""
 
-#: ../../mod/profiles.php:639
+#: ../../mod/profiles.php:650
 msgid ""
 "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
 "be visible to anybody using the internet."
 msgstr ""
 
-#: ../../mod/profiles.php:649 ../../mod/directory.php:111
+#: ../../mod/profiles.php:660 ../../mod/directory.php:111
+#: ../../addon/forumdirectory/forumdirectory.php:133
 msgid "Age: "
 msgstr ""
 
-#: ../../mod/profiles.php:688
+#: ../../mod/profiles.php:699
 msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/profiles.php:689 ../../boot.php:1202
+#: ../../mod/profiles.php:700 ../../boot.php:1244
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/profiles.php:690 ../../boot.php:1203
+#: ../../mod/profiles.php:701 ../../boot.php:1245
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/profiles.php:701 ../../boot.php:1213
+#: ../../mod/profiles.php:712 ../../boot.php:1255
 msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/profiles.php:703 ../../boot.php:1216
+#: ../../mod/profiles.php:714 ../../boot.php:1258
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../mod/profiles.php:704 ../../boot.php:1217
+#: ../../mod/profiles.php:715 ../../boot.php:1259
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../mod/filer.php:29 ../../include/conversation.php:850
-#: ../../include/conversation.php:867
+#: ../../mod/filer.php:29 ../../include/conversation.php:909
+#: ../../include/conversation.php:927
 msgid "Save to Folder:"
 msgstr ""
 
@@ -4512,7 +4696,7 @@ msgstr ""
 msgid "diaspora2bb: "
 msgstr ""
 
-#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:626
+#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:520
 #: ../../include/contact_widgets.php:34
 msgid "Friend Suggestions"
 msgstr ""
@@ -4527,42 +4711,50 @@ msgstr ""
 msgid "Ignore/Hide"
 msgstr ""
 
-#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:624
+#: ../../mod/directory.php:49 ../../addon/forumdirectory/forumdirectory.php:71
+#: ../../view/theme/diabook/theme.php:518
 msgid "Global Directory"
 msgstr ""
 
-#: ../../mod/directory.php:57
+#: ../../mod/directory.php:57 ../../addon/forumdirectory/forumdirectory.php:79
 msgid "Find on this site"
 msgstr ""
 
-#: ../../mod/directory.php:60
+#: ../../mod/directory.php:60 ../../addon/forumdirectory/forumdirectory.php:82
 msgid "Site Directory"
 msgstr ""
 
 #: ../../mod/directory.php:114
+#: ../../addon/forumdirectory/forumdirectory.php:136
 msgid "Gender: "
 msgstr ""
 
-#: ../../mod/directory.php:136 ../../include/profile_advanced.php:17
-#: ../../boot.php:1238
+#: ../../mod/directory.php:136
+#: ../../addon/forumdirectory/forumdirectory.php:158
+#: ../../include/profile_advanced.php:17 ../../boot.php:1280
 msgid "Gender:"
 msgstr ""
 
-#: ../../mod/directory.php:138 ../../include/profile_advanced.php:37
-#: ../../boot.php:1241
+#: ../../mod/directory.php:138
+#: ../../addon/forumdirectory/forumdirectory.php:160
+#: ../../include/profile_advanced.php:37 ../../boot.php:1283
 msgid "Status:"
 msgstr ""
 
-#: ../../mod/directory.php:140 ../../include/profile_advanced.php:48
-#: ../../boot.php:1243
+#: ../../mod/directory.php:140
+#: ../../addon/forumdirectory/forumdirectory.php:162
+#: ../../include/profile_advanced.php:48 ../../boot.php:1285
 msgid "Homepage:"
 msgstr ""
 
-#: ../../mod/directory.php:142 ../../include/profile_advanced.php:58
+#: ../../mod/directory.php:142
+#: ../../addon/forumdirectory/forumdirectory.php:164
+#: ../../include/profile_advanced.php:58
 msgid "About:"
 msgstr ""
 
 #: ../../mod/directory.php:180
+#: ../../addon/forumdirectory/forumdirectory.php:202
 msgid "No entries (some entries may be hidden)."
 msgstr ""
 
@@ -4738,98 +4930,122 @@ msgid "%1$s has joined %2$s"
 msgstr ""
 
 #: ../../addon/fromgplus/fromgplus.php:29
+#: ../../addon.old/fromgplus/fromgplus.php:29
 msgid "Google+ Import Settings"
 msgstr ""
 
 #: ../../addon/fromgplus/fromgplus.php:32
+#: ../../addon.old/fromgplus/fromgplus.php:32
 msgid "Enable Google+ Import"
 msgstr ""
 
 #: ../../addon/fromgplus/fromgplus.php:35
+#: ../../addon.old/fromgplus/fromgplus.php:35
 msgid "Google Account ID"
 msgstr ""
 
 #: ../../addon/fromgplus/fromgplus.php:55
+#: ../../addon.old/fromgplus/fromgplus.php:55
 msgid "Google+ Import Settings saved."
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:523
+#: ../../addon.old/facebook/facebook.php:523
 msgid "Facebook disabled"
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:528
+#: ../../addon.old/facebook/facebook.php:528
 msgid "Updating contacts"
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:551 ../../addon/fbpost/fbpost.php:192
+#: ../../addon.old/facebook/facebook.php:551
+#: ../../addon.old/fbpost/fbpost.php:192
 msgid "Facebook API key is missing."
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:558
+#: ../../addon.old/facebook/facebook.php:558
 msgid "Facebook Connect"
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:564
+#: ../../addon.old/facebook/facebook.php:564
 msgid "Install Facebook connector for this account."
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:571
+#: ../../addon.old/facebook/facebook.php:571
 msgid "Remove Facebook connector"
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:576 ../../addon/fbpost/fbpost.php:217
+#: ../../addon.old/facebook/facebook.php:576
+#: ../../addon.old/fbpost/fbpost.php:217
 msgid ""
 "Re-authenticate [This is necessary whenever your Facebook password is "
 "changed.]"
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:583 ../../addon/fbpost/fbpost.php:224
+#: ../../addon.old/facebook/facebook.php:583
+#: ../../addon.old/fbpost/fbpost.php:224
 msgid "Post to Facebook by default"
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:589
+#: ../../addon.old/facebook/facebook.php:589
 msgid ""
 "Facebook friend linking has been disabled on this site. The following "
 "settings will have no effect."
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:593
+#: ../../addon.old/facebook/facebook.php:593
 msgid ""
 "Facebook friend linking has been disabled on this site. If you disable it, "
 "you will be unable to re-enable it."
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:596
+#: ../../addon.old/facebook/facebook.php:596
 msgid "Link all your Facebook friends and conversations on this website"
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:598
+#: ../../addon.old/facebook/facebook.php:598
 msgid ""
 "Facebook conversations consist of your <em>profile wall</em> and your friend "
 "<em>stream</em>."
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:599
+#: ../../addon.old/facebook/facebook.php:599
 msgid "On this website, your Facebook friend stream is only visible to you."
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:600
+#: ../../addon.old/facebook/facebook.php:600
 msgid ""
 "The following settings determine the privacy of your Facebook profile wall "
 "on this website."
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:604
+#: ../../addon.old/facebook/facebook.php:604
 msgid ""
 "On this website your Facebook profile wall conversations will only be "
 "visible to you"
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:609
+#: ../../addon.old/facebook/facebook.php:609
 msgid "Do not import your Facebook profile wall conversations"
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:611
+#: ../../addon.old/facebook/facebook.php:611
 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 "
@@ -4838,22 +5054,29 @@ msgid ""
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:616
+#: ../../addon.old/facebook/facebook.php:616
 msgid "Comma separated applications to ignore"
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:700
+#: ../../addon.old/facebook/facebook.php:700
 msgid "Problems with Facebook Real-Time Updates"
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:729
+#: ../../addon.old/facebook/facebook.php:729
 msgid "Facebook Connector Settings"
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:744 ../../addon/fbpost/fbpost.php:255
+#: ../../addon.old/facebook/facebook.php:744
+#: ../../addon.old/fbpost/fbpost.php:255
 msgid "Facebook API Key"
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:754 ../../addon/fbpost/fbpost.php:262
+#: ../../addon.old/facebook/facebook.php:754
+#: ../../addon.old/fbpost/fbpost.php:262
 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 "
@@ -4861,92 +5084,123 @@ msgid ""
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:759
+#: ../../addon.old/facebook/facebook.php:759
 msgid ""
 "Error: the given API Key seems to be incorrect (the application access token "
 "could not be retrieved)."
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:761
+#: ../../addon.old/facebook/facebook.php:761
 msgid "The given API Key seems to work correctly."
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:763
+#: ../../addon.old/facebook/facebook.php:763
 msgid ""
 "The correctness of the API Key could not be detected. Something strange's "
 "going on."
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:766 ../../addon/fbpost/fbpost.php:264
+#: ../../addon.old/facebook/facebook.php:766
+#: ../../addon.old/fbpost/fbpost.php:264
 msgid "App-ID / API-Key"
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:767 ../../addon/fbpost/fbpost.php:265
+#: ../../addon.old/facebook/facebook.php:767
+#: ../../addon.old/fbpost/fbpost.php:265
 msgid "Application secret"
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:768
+#: ../../addon.old/facebook/facebook.php:768
 #, php-format
 msgid "Polling Interval in minutes (minimum %1$s minutes)"
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:769
+#: ../../addon.old/facebook/facebook.php:769
 msgid ""
 "Synchronize comments (no comments on Facebook are missed, at the cost of "
 "increased system load)"
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:773
+#: ../../addon.old/facebook/facebook.php:773
 msgid "Real-Time Updates"
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:777
+#: ../../addon.old/facebook/facebook.php:777
 msgid "Real-Time Updates are activated."
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:778
+#: ../../addon.old/facebook/facebook.php:778
 msgid "Deactivate Real-Time Updates"
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:780
+#: ../../addon.old/facebook/facebook.php:780
 msgid "Real-Time Updates not activated."
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:780
+#: ../../addon.old/facebook/facebook.php:780
 msgid "Activate Real-Time Updates"
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:799 ../../addon/fbpost/fbpost.php:282
 #: ../../addon/dav/friendica/layout.fnk.php:361
+#: ../../addon.old/facebook/facebook.php:799
+#: ../../addon.old/fbpost/fbpost.php:282
+#: ../../addon.old/dav/friendica/layout.fnk.php:361
 msgid "The new values have been saved."
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:823 ../../addon/fbpost/fbpost.php:301
+#: ../../addon.old/facebook/facebook.php:823
+#: ../../addon.old/fbpost/fbpost.php:301
 msgid "Post to Facebook"
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:921 ../../addon/fbpost/fbpost.php:399
+#: ../../addon.old/facebook/facebook.php:921
+#: ../../addon.old/fbpost/fbpost.php:399
 msgid ""
 "Post to Facebook cancelled because of multi-network access permission "
 "conflict."
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:1149 ../../addon/fbpost/fbpost.php:610
+#: ../../addon.old/facebook/facebook.php:1149
+#: ../../addon.old/fbpost/fbpost.php:610
 msgid "View on Friendica"
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:1182 ../../addon/fbpost/fbpost.php:643
+#: ../../addon.old/facebook/facebook.php:1182
+#: ../../addon.old/fbpost/fbpost.php:643
 msgid "Facebook post failed. Queued for retry."
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:1222 ../../addon/fbpost/fbpost.php:683
+#: ../../addon.old/facebook/facebook.php:1222
+#: ../../addon.old/fbpost/fbpost.php:683
 msgid "Your Facebook connection became invalid. Please Re-authenticate."
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:1223 ../../addon/fbpost/fbpost.php:684
+#: ../../addon.old/facebook/facebook.php:1223
+#: ../../addon.old/fbpost/fbpost.php:684
 msgid "Facebook connection became invalid"
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:1224 ../../addon/fbpost/fbpost.php:685
+#: ../../addon.old/facebook/facebook.php:1224
+#: ../../addon.old/fbpost/fbpost.php:685
 #, php-format
 msgid ""
 "Hi %1$s,\n"
@@ -4957,70 +5211,67 @@ msgid ""
 msgstr ""
 
 #: ../../addon/snautofollow/snautofollow.php:32
+#: ../../addon.old/snautofollow/snautofollow.php:32
 msgid "StatusNet AutoFollow settings updated."
 msgstr ""
 
 #: ../../addon/snautofollow/snautofollow.php:56
+#: ../../addon.old/snautofollow/snautofollow.php:56
 msgid "StatusNet AutoFollow Settings"
 msgstr ""
 
 #: ../../addon/snautofollow/snautofollow.php:58
+#: ../../addon.old/snautofollow/snautofollow.php:58
 msgid "Automatically follow any StatusNet followers/mentioners"
 msgstr ""
 
-#: ../../addon/bg/bg.php:51
-msgid "Bg settings updated."
-msgstr ""
-
-#: ../../addon/bg/bg.php:82
-msgid "Bg Settings"
-msgstr ""
-
-#: ../../addon/bg/bg.php:84 ../../addon/numfriends/numfriends.php:79
-msgid "How many contacts to display on profile sidebar"
-msgstr ""
-
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:260
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:278
+#: ../../addon.old/privacy_image_cache/privacy_image_cache.php:260
 msgid "Lifetime of the cache (in hours)"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:265
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:283
+#: ../../addon.old/privacy_image_cache/privacy_image_cache.php:265
 msgid "Cache Statistics"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:268
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:286
+#: ../../addon.old/privacy_image_cache/privacy_image_cache.php:268
 msgid "Number of items"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:270
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:288
+#: ../../addon.old/privacy_image_cache/privacy_image_cache.php:270
 msgid "Size of the cache"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:272
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:290
+#: ../../addon.old/privacy_image_cache/privacy_image_cache.php:272
 msgid "Delete the whole cache"
 msgstr ""
 
-#: ../../addon/fbpost/fbpost.php:172
+#: ../../addon/fbpost/fbpost.php:172 ../../addon.old/fbpost/fbpost.php:172
 msgid "Facebook Post disabled"
 msgstr ""
 
-#: ../../addon/fbpost/fbpost.php:199
+#: ../../addon/fbpost/fbpost.php:199 ../../addon.old/fbpost/fbpost.php:199
 msgid "Facebook Post"
 msgstr ""
 
-#: ../../addon/fbpost/fbpost.php:205
+#: ../../addon/fbpost/fbpost.php:205 ../../addon.old/fbpost/fbpost.php:205
 msgid "Install Facebook Post connector for this account."
 msgstr ""
 
-#: ../../addon/fbpost/fbpost.php:212
+#: ../../addon/fbpost/fbpost.php:212 ../../addon.old/fbpost/fbpost.php:212
 msgid "Remove Facebook Post connector"
 msgstr ""
 
-#: ../../addon/fbpost/fbpost.php:240
+#: ../../addon/fbpost/fbpost.php:240 ../../addon.old/fbpost/fbpost.php:240
 msgid "Facebook Post Settings"
 msgstr ""
 
 #: ../../addon/widgets/widget_like.php:58
+#: ../../addon.old/widgets/widget_like.php:58
 #, php-format
 msgid "%d person likes this"
 msgid_plural "%d people like this"
@@ -5028,6 +5279,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../../addon/widgets/widget_like.php:61
+#: ../../addon.old/widgets/widget_like.php:61
 #, php-format
 msgid "%d person doesn't like this"
 msgid_plural "%d people don't like this"
@@ -5035,224 +5287,262 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../../addon/widgets/widget_friendheader.php:40
+#: ../../addon.old/widgets/widget_friendheader.php:40
 msgid "Get added to this list!"
 msgstr ""
 
-#: ../../addon/widgets/widgets.php:56
+#: ../../addon/widgets/widgets.php:56 ../../addon.old/widgets/widgets.php:56
 msgid "Generate new key"
 msgstr ""
 
-#: ../../addon/widgets/widgets.php:59
+#: ../../addon/widgets/widgets.php:59 ../../addon.old/widgets/widgets.php:59
 msgid "Widgets key"
 msgstr ""
 
-#: ../../addon/widgets/widgets.php:61
+#: ../../addon/widgets/widgets.php:61 ../../addon.old/widgets/widgets.php:61
 msgid "Widgets available"
 msgstr ""
 
 #: ../../addon/widgets/widget_friends.php:40
+#: ../../addon.old/widgets/widget_friends.php:40
 msgid "Connect on Friendica!"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:19
+#: ../../addon.old/morepokes/morepokes.php:19
 msgid "bitchslap"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:19
+#: ../../addon.old/morepokes/morepokes.php:19
 msgid "bitchslapped"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:20
+#: ../../addon.old/morepokes/morepokes.php:20
 msgid "shag"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:20
+#: ../../addon.old/morepokes/morepokes.php:20
 msgid "shagged"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:21
+#: ../../addon.old/morepokes/morepokes.php:21
 msgid "do something obscenely biological to"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:21
+#: ../../addon.old/morepokes/morepokes.php:21
 msgid "did something obscenely biological to"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:22
+#: ../../addon.old/morepokes/morepokes.php:22
 msgid "point out the poke feature to"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:22
+#: ../../addon.old/morepokes/morepokes.php:22
 msgid "pointed out the poke feature to"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:23
+#: ../../addon.old/morepokes/morepokes.php:23
 msgid "declare undying love for"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:23
+#: ../../addon.old/morepokes/morepokes.php:23
 msgid "declared undying love for"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:24
+#: ../../addon.old/morepokes/morepokes.php:24
 msgid "patent"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:24
+#: ../../addon.old/morepokes/morepokes.php:24
 msgid "patented"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:25
+#: ../../addon.old/morepokes/morepokes.php:25
 msgid "stroke beard"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:25
+#: ../../addon.old/morepokes/morepokes.php:25
 msgid "stroked their beard at"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:26
+#: ../../addon.old/morepokes/morepokes.php:26
 msgid ""
 "bemoan the declining standards of modern secondary and tertiary education to"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:26
+#: ../../addon.old/morepokes/morepokes.php:26
 msgid ""
 "bemoans the declining standards of modern secondary and tertiary education to"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:27
+#: ../../addon.old/morepokes/morepokes.php:27
 msgid "hug"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:27
+#: ../../addon.old/morepokes/morepokes.php:27
 msgid "hugged"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:28
+#: ../../addon.old/morepokes/morepokes.php:28
 msgid "kiss"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:28
+#: ../../addon.old/morepokes/morepokes.php:28
 msgid "kissed"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:29
+#: ../../addon.old/morepokes/morepokes.php:29
 msgid "raise eyebrows at"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:29
+#: ../../addon.old/morepokes/morepokes.php:29
 msgid "raised their eyebrows at"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:30
+#: ../../addon.old/morepokes/morepokes.php:30
 msgid "insult"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:30
+#: ../../addon.old/morepokes/morepokes.php:30
 msgid "insulted"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:31
+#: ../../addon.old/morepokes/morepokes.php:31
 msgid "praise"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:31
+#: ../../addon.old/morepokes/morepokes.php:31
 msgid "praised"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:32
+#: ../../addon.old/morepokes/morepokes.php:32
 msgid "be dubious of"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:32
+#: ../../addon.old/morepokes/morepokes.php:32
 msgid "was dubious of"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:33
+#: ../../addon.old/morepokes/morepokes.php:33
 msgid "eat"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:33
+#: ../../addon.old/morepokes/morepokes.php:33
 msgid "ate"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:34
+#: ../../addon.old/morepokes/morepokes.php:34
 msgid "giggle and fawn at"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:34
+#: ../../addon.old/morepokes/morepokes.php:34
 msgid "giggled and fawned at"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:35
+#: ../../addon.old/morepokes/morepokes.php:35
 msgid "doubt"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:35
+#: ../../addon.old/morepokes/morepokes.php:35
 msgid "doubted"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:36
+#: ../../addon.old/morepokes/morepokes.php:36
 msgid "glare"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:36
+#: ../../addon.old/morepokes/morepokes.php:36
 msgid "glared at"
 msgstr ""
 
-#: ../../addon/yourls/yourls.php:55
+#: ../../addon/yourls/yourls.php:55 ../../addon.old/yourls/yourls.php:55
 msgid "YourLS Settings"
 msgstr ""
 
-#: ../../addon/yourls/yourls.php:57
+#: ../../addon/yourls/yourls.php:57 ../../addon.old/yourls/yourls.php:57
 msgid "URL: http://"
 msgstr ""
 
-#: ../../addon/yourls/yourls.php:62
+#: ../../addon/yourls/yourls.php:62 ../../addon.old/yourls/yourls.php:62
 msgid "Username:"
 msgstr ""
 
-#: ../../addon/yourls/yourls.php:67
+#: ../../addon/yourls/yourls.php:67 ../../addon.old/yourls/yourls.php:67
 msgid "Password:"
 msgstr ""
 
-#: ../../addon/yourls/yourls.php:72
+#: ../../addon/yourls/yourls.php:72 ../../addon.old/yourls/yourls.php:72
 msgid "Use SSL "
 msgstr ""
 
-#: ../../addon/yourls/yourls.php:92
+#: ../../addon/yourls/yourls.php:92 ../../addon.old/yourls/yourls.php:92
 msgid "yourls Settings saved."
 msgstr ""
 
-#: ../../addon/ljpost/ljpost.php:39
+#: ../../addon/ljpost/ljpost.php:39 ../../addon.old/ljpost/ljpost.php:39
 msgid "Post to LiveJournal"
 msgstr ""
 
-#: ../../addon/ljpost/ljpost.php:70
+#: ../../addon/ljpost/ljpost.php:70 ../../addon.old/ljpost/ljpost.php:70
 msgid "LiveJournal Post Settings"
 msgstr ""
 
-#: ../../addon/ljpost/ljpost.php:72
+#: ../../addon/ljpost/ljpost.php:72 ../../addon.old/ljpost/ljpost.php:72
 msgid "Enable LiveJournal Post Plugin"
 msgstr ""
 
-#: ../../addon/ljpost/ljpost.php:77
+#: ../../addon/ljpost/ljpost.php:77 ../../addon.old/ljpost/ljpost.php:77
 msgid "LiveJournal username"
 msgstr ""
 
-#: ../../addon/ljpost/ljpost.php:82
+#: ../../addon/ljpost/ljpost.php:82 ../../addon.old/ljpost/ljpost.php:82
 msgid "LiveJournal password"
 msgstr ""
 
-#: ../../addon/ljpost/ljpost.php:87
+#: ../../addon/ljpost/ljpost.php:87 ../../addon.old/ljpost/ljpost.php:87
 msgid "Post to LiveJournal by default"
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:78
+#: ../../addon/nsfw/nsfw.php:78 ../../addon.old/nsfw/nsfw.php:78
 msgid "Not Safe For Work (General Purpose Content Filter) settings"
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:80
+#: ../../addon/nsfw/nsfw.php:80 ../../addon.old/nsfw/nsfw.php:80
 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 "
@@ -5262,98 +5552,118 @@ msgid ""
 "can thereby be used as a general purpose content filter."
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:81
+#: ../../addon/nsfw/nsfw.php:81 ../../addon.old/nsfw/nsfw.php:81
 msgid "Enable Content filter"
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:84
+#: ../../addon/nsfw/nsfw.php:84 ../../addon.old/nsfw/nsfw.php:84
 msgid "Comma separated list of keywords to hide"
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:89
+#: ../../addon/nsfw/nsfw.php:89 ../../addon.old/nsfw/nsfw.php:89
 msgid "Use /expression/ to provide regular expressions"
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:105
+#: ../../addon/nsfw/nsfw.php:105 ../../addon.old/nsfw/nsfw.php:105
 msgid "NSFW Settings saved."
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:157
+#: ../../addon/nsfw/nsfw.php:157 ../../addon.old/nsfw/nsfw.php:157
 #, php-format
 msgid "%s - Click to open/close"
 msgstr ""
 
 #: ../../addon/page/page.php:62 ../../addon/page/page.php:92
-#: ../../addon/forumlist/forumlist.php:56
+#: ../../addon/forumlist/forumlist.php:60 ../../addon.old/page/page.php:62
+#: ../../addon.old/page/page.php:92 ../../addon.old/forumlist/forumlist.php:60
 msgid "Forums"
 msgstr ""
 
-#: ../../addon/page/page.php:130 ../../addon/forumlist/forumlist.php:90
+#: ../../addon/page/page.php:130 ../../addon/forumlist/forumlist.php:94
+#: ../../addon.old/page/page.php:130
+#: ../../addon.old/forumlist/forumlist.php:94
 msgid "Forums:"
 msgstr ""
 
-#: ../../addon/page/page.php:166
+#: ../../addon/page/page.php:166 ../../addon.old/page/page.php:166
 msgid "Page settings updated."
 msgstr ""
 
-#: ../../addon/page/page.php:195
+#: ../../addon/page/page.php:195 ../../addon.old/page/page.php:195
 msgid "Page Settings"
 msgstr ""
 
-#: ../../addon/page/page.php:197
+#: ../../addon/page/page.php:197 ../../addon.old/page/page.php:197
 msgid "How many forums to display on sidebar without paging"
 msgstr ""
 
-#: ../../addon/page/page.php:200
+#: ../../addon/page/page.php:200 ../../addon.old/page/page.php:200
 msgid "Randomise Page/Forum list"
 msgstr ""
 
-#: ../../addon/page/page.php:203
+#: ../../addon/page/page.php:203 ../../addon.old/page/page.php:203
 msgid "Show pages/forums on profile page"
 msgstr ""
 
-#: ../../addon/planets/planets.php:150
+#: ../../addon/planets/planets.php:150 ../../addon.old/planets/planets.php:150
 msgid "Planets Settings"
 msgstr ""
 
-#: ../../addon/planets/planets.php:152
+#: ../../addon/planets/planets.php:152 ../../addon.old/planets/planets.php:152
 msgid "Enable Planets Plugin"
 msgstr ""
 
+#: ../../addon/forumdirectory/forumdirectory.php:22
+msgid "Forum Directory"
+msgstr ""
+
 #: ../../addon/communityhome/communityhome.php:28
 #: ../../addon/communityhome/communityhome.php:34
 #: ../../addon/communityhome/twillingham/communityhome.php:28
 #: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:922
+#: ../../include/nav.php:64 ../../boot.php:949
+#: ../../addon.old/communityhome/communityhome.php:28
+#: ../../addon.old/communityhome/communityhome.php:34
+#: ../../addon.old/communityhome/twillingham/communityhome.php:28
+#: ../../addon.old/communityhome/twillingham/communityhome.php:34
 msgid "Login"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:29
 #: ../../addon/communityhome/twillingham/communityhome.php:29
+#: ../../addon.old/communityhome/communityhome.php:29
+#: ../../addon.old/communityhome/twillingham/communityhome.php:29
 msgid "OpenID"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:38
 #: ../../addon/communityhome/twillingham/communityhome.php:38
+#: ../../addon.old/communityhome/communityhome.php:38
+#: ../../addon.old/communityhome/twillingham/communityhome.php:38
 msgid "Latest users"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:81
 #: ../../addon/communityhome/twillingham/communityhome.php:81
+#: ../../addon.old/communityhome/communityhome.php:81
+#: ../../addon.old/communityhome/twillingham/communityhome.php:81
 msgid "Most active users"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:98
+#: ../../addon.old/communityhome/communityhome.php:98
 msgid "Latest photos"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:133
+#: ../../addon.old/communityhome/communityhome.php:133
 msgid "Latest likes"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:155
-#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1437
+#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1440
 #: ../../include/conversation.php:117 ../../include/conversation.php:245
+#: ../../addon.old/communityhome/communityhome.php:155
 msgid "event"
 msgstr ""
 
@@ -5363,107 +5673,141 @@ msgstr ""
 #: ../../addon/dav/common/wdcal_backend.inc.php:206
 #: ../../addon/dav/common/wdcal_backend.inc.php:214
 #: ../../addon/dav/common/wdcal_backend.inc.php:229
+#: ../../addon.old/dav/common/wdcal_backend.inc.php:92
+#: ../../addon.old/dav/common/wdcal_backend.inc.php:166
+#: ../../addon.old/dav/common/wdcal_backend.inc.php:178
+#: ../../addon.old/dav/common/wdcal_backend.inc.php:206
+#: ../../addon.old/dav/common/wdcal_backend.inc.php:214
+#: ../../addon.old/dav/common/wdcal_backend.inc.php:229
 msgid "No access"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:30
 #: ../../addon/dav/common/wdcal_edit.inc.php:738
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:30
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:738
 msgid "Could not open component for editing"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:140
 #: ../../addon/dav/friendica/layout.fnk.php:143
 #: ../../addon/dav/friendica/layout.fnk.php:422
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:140
+#: ../../addon.old/dav/friendica/layout.fnk.php:143
+#: ../../addon.old/dav/friendica/layout.fnk.php:422
 msgid "Go back to the calendar"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:144
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:144
 msgid "Event data"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:146
 #: ../../addon/dav/friendica/main.php:239
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:146
+#: ../../addon.old/dav/friendica/main.php:239
 msgid "Calendar"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:163
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:163
 msgid "Special color"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:169
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:169
 msgid "Subject"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:173
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:173
 msgid "Starts"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:178
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:178
 msgid "Ends"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:185
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:185
 msgid "Description"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:188
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:188
 msgid "Recurrence"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:190
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:190
 msgid "Frequency"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:194
 #: ../../include/contact_selectors.php:59
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:194
 msgid "Daily"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:197
 #: ../../include/contact_selectors.php:60
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:197
 msgid "Weekly"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:200
 #: ../../include/contact_selectors.php:61
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:200
 msgid "Monthly"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:203
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:203
 msgid "Yearly"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:214
 #: ../../include/datetime.php:288
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:214
 msgid "days"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:215
 #: ../../include/datetime.php:287
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:215
 msgid "weeks"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:216
 #: ../../include/datetime.php:286
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:216
 msgid "months"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:217
 #: ../../include/datetime.php:285
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:217
 msgid "years"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:218
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:218
 msgid "Interval"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:218
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:218
 msgid "All %select% %time%"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:222
 #: ../../addon/dav/common/wdcal_edit.inc.php:260
 #: ../../addon/dav/common/wdcal_edit.inc.php:481
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:222
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:260
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:481
 msgid "Days"
 msgstr ""
 
@@ -5471,317 +5815,408 @@ msgstr ""
 #: ../../addon/dav/common/wdcal_edit.inc.php:254
 #: ../../addon/dav/common/wdcal_edit.inc.php:270
 #: ../../addon/dav/common/wdcal_edit.inc.php:293
-#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:917
+#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:922
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:231
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:254
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:270
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:293
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:305
 msgid "Sunday"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:235
 #: ../../addon/dav/common/wdcal_edit.inc.php:274
-#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:917
+#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:922
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:235
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:274
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:308
 msgid "Monday"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:238
-#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:917
+#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:922
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:238
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:277
 msgid "Tuesday"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:241
-#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:917
+#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:922
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:241
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:280
 msgid "Wednesday"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:244
-#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:917
+#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:922
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:244
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:283
 msgid "Thursday"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:247
-#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:917
+#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:922
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:247
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:286
 msgid "Friday"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:250
-#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:917
+#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:922
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:250
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:289
 msgid "Saturday"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:297
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:297
 msgid "First day of week:"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:350
 #: ../../addon/dav/common/wdcal_edit.inc.php:373
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:350
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:373
 msgid "Day of month"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:354
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:354
 msgid "#num#th of each month"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:357
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:357
 msgid "#num#th-last of each month"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:360
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:360
 msgid "#num#th #wkday# of each month"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:363
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:363
 msgid "#num#th-last #wkday# of each month"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:372
 #: ../../addon/dav/friendica/layout.fnk.php:255
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:372
+#: ../../addon.old/dav/friendica/layout.fnk.php:255
 msgid "Month"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:377
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:377
 msgid "#num#th of the given month"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:380
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:380
 msgid "#num#th-last of the given month"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:383
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:383
 msgid "#num#th #wkday# of the given month"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:386
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:386
 msgid "#num#th-last #wkday# of the given month"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:413
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:413
 msgid "Repeat until"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:417
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:417
 msgid "Infinite"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:420
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:420
 msgid "Until the following date"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:423
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:423
 msgid "Number of times"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:429
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:429
 msgid "Exceptions"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:432
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:432
 msgid "none"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:449
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:449
 msgid "Notification"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:466
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:466
 msgid "Notify by"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:469
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:469
 msgid "E-Mail"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:470
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:470
 msgid "On Friendica / Display"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:474
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:474
 msgid "Time"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:478
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:478
 msgid "Hours"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:479
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:479
 msgid "Minutes"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:480
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:480
 msgid "Seconds"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:482
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:482
 msgid "Weeks"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:485
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:485
 msgid "before the"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:486
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:486
 msgid "start of the event"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:487
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:487
 msgid "end of the event"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:492
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:492
 msgid "Add a notification"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:687
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:687
 msgid "The event #name# will start at #date"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:696
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:696
 msgid "#name# is about to begin."
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_edit.inc.php:769
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:769
 msgid "Saved"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_configuration.php:148
+#: ../../addon.old/dav/common/wdcal_configuration.php:148
 msgid "U.S. Time Format (mm/dd/YYYY)"
 msgstr ""
 
 #: ../../addon/dav/common/wdcal_configuration.php:243
+#: ../../addon.old/dav/common/wdcal_configuration.php:243
 msgid "German Time Format (dd.mm.YYYY)"
 msgstr ""
 
 #: ../../addon/dav/common/dav_caldav_backend_private.inc.php:39
+#: ../../addon.old/dav/common/dav_caldav_backend_private.inc.php:39
 msgid "Private Events"
 msgstr ""
 
 #: ../../addon/dav/common/dav_carddav_backend_private.inc.php:46
+#: ../../addon.old/dav/common/dav_carddav_backend_private.inc.php:46
 msgid "Private Addressbooks"
 msgstr ""
 
 #: ../../addon/dav/friendica/dav_caldav_backend_virtual_friendica.inc.php:36
+#: ../../addon.old/dav/friendica/dav_caldav_backend_virtual_friendica.inc.php:36
 msgid "Friendica-Native events"
 msgstr ""
 
 #: ../../addon/dav/friendica/dav_carddav_backend_virtual_friendica.inc.php:36
 #: ../../addon/dav/friendica/dav_carddav_backend_virtual_friendica.inc.php:59
+#: ../../addon.old/dav/friendica/dav_carddav_backend_virtual_friendica.inc.php:36
+#: ../../addon.old/dav/friendica/dav_carddav_backend_virtual_friendica.inc.php:59
 msgid "Friendica-Contacts"
 msgstr ""
 
 #: ../../addon/dav/friendica/dav_carddav_backend_virtual_friendica.inc.php:60
+#: ../../addon.old/dav/friendica/dav_carddav_backend_virtual_friendica.inc.php:60
 msgid "Your Friendica-Contacts"
 msgstr ""
 
 #: ../../addon/dav/friendica/layout.fnk.php:99
 #: ../../addon/dav/friendica/layout.fnk.php:136
+#: ../../addon.old/dav/friendica/layout.fnk.php:99
+#: ../../addon.old/dav/friendica/layout.fnk.php:136
 msgid ""
 "Something went wrong when trying to import the file. Sorry. Maybe some "
 "events were imported anyway."
 msgstr ""
 
 #: ../../addon/dav/friendica/layout.fnk.php:131
+#: ../../addon.old/dav/friendica/layout.fnk.php:131
 msgid "Something went wrong when trying to import the file. Sorry."
 msgstr ""
 
 #: ../../addon/dav/friendica/layout.fnk.php:134
+#: ../../addon.old/dav/friendica/layout.fnk.php:134
 msgid "The ICS-File has been imported."
 msgstr ""
 
 #: ../../addon/dav/friendica/layout.fnk.php:138
+#: ../../addon.old/dav/friendica/layout.fnk.php:138
 msgid "No file was uploaded."
 msgstr ""
 
 #: ../../addon/dav/friendica/layout.fnk.php:147
+#: ../../addon.old/dav/friendica/layout.fnk.php:147
 msgid "Import a ICS-file"
 msgstr ""
 
 #: ../../addon/dav/friendica/layout.fnk.php:150
+#: ../../addon.old/dav/friendica/layout.fnk.php:150
 msgid "ICS-File"
 msgstr ""
 
 #: ../../addon/dav/friendica/layout.fnk.php:151
+#: ../../addon.old/dav/friendica/layout.fnk.php:151
 msgid "Overwrite all #num# existing events"
 msgstr ""
 
 #: ../../addon/dav/friendica/layout.fnk.php:228
+#: ../../addon.old/dav/friendica/layout.fnk.php:228
 msgid "New event"
 msgstr ""
 
 #: ../../addon/dav/friendica/layout.fnk.php:232
+#: ../../addon.old/dav/friendica/layout.fnk.php:232
 msgid "Today"
 msgstr ""
 
 #: ../../addon/dav/friendica/layout.fnk.php:241
+#: ../../addon.old/dav/friendica/layout.fnk.php:241
 msgid "Day"
 msgstr ""
 
 #: ../../addon/dav/friendica/layout.fnk.php:248
+#: ../../addon.old/dav/friendica/layout.fnk.php:248
 msgid "Week"
 msgstr ""
 
 #: ../../addon/dav/friendica/layout.fnk.php:260
+#: ../../addon.old/dav/friendica/layout.fnk.php:260
 msgid "Reload"
 msgstr ""
 
 #: ../../addon/dav/friendica/layout.fnk.php:271
+#: ../../addon.old/dav/friendica/layout.fnk.php:271
 msgid "Date"
 msgstr ""
 
 #: ../../addon/dav/friendica/layout.fnk.php:313
+#: ../../addon.old/dav/friendica/layout.fnk.php:313
 msgid "Error"
 msgstr ""
 
 #: ../../addon/dav/friendica/layout.fnk.php:380
+#: ../../addon.old/dav/friendica/layout.fnk.php:380
 msgid "The calendar has been updated."
 msgstr ""
 
 #: ../../addon/dav/friendica/layout.fnk.php:393
+#: ../../addon.old/dav/friendica/layout.fnk.php:393
 msgid "The new calendar has been created."
 msgstr ""
 
 #: ../../addon/dav/friendica/layout.fnk.php:417
+#: ../../addon.old/dav/friendica/layout.fnk.php:417
 msgid "The calendar has been deleted."
 msgstr ""
 
 #: ../../addon/dav/friendica/layout.fnk.php:424
+#: ../../addon.old/dav/friendica/layout.fnk.php:424
 msgid "Calendar Settings"
 msgstr ""
 
 #: ../../addon/dav/friendica/layout.fnk.php:430
+#: ../../addon.old/dav/friendica/layout.fnk.php:430
 msgid "Date format"
 msgstr ""
 
 #: ../../addon/dav/friendica/layout.fnk.php:439
+#: ../../addon.old/dav/friendica/layout.fnk.php:439
 msgid "Time zone"
 msgstr ""
 
 #: ../../addon/dav/friendica/layout.fnk.php:445
+#: ../../addon.old/dav/friendica/layout.fnk.php:445
 msgid "Calendars"
 msgstr ""
 
 #: ../../addon/dav/friendica/layout.fnk.php:487
+#: ../../addon.old/dav/friendica/layout.fnk.php:487
 msgid "Create a new calendar"
 msgstr ""
 
 #: ../../addon/dav/friendica/layout.fnk.php:496
+#: ../../addon.old/dav/friendica/layout.fnk.php:496
 msgid "Limitations"
 msgstr ""
 
 #: ../../addon/dav/friendica/layout.fnk.php:500
 #: ../../addon/libravatar/libravatar.php:82
+#: ../../addon.old/dav/friendica/layout.fnk.php:500
+#: ../../addon.old/libravatar/libravatar.php:82
 msgid "Warning"
 msgstr ""
 
 #: ../../addon/dav/friendica/layout.fnk.php:504
+#: ../../addon.old/dav/friendica/layout.fnk.php:504
 msgid "Synchronization (iPhone, Thunderbird Lightning, Android, ...)"
 msgstr ""
 
 #: ../../addon/dav/friendica/layout.fnk.php:511
+#: ../../addon.old/dav/friendica/layout.fnk.php:511
 msgid "Synchronizing this calendar with the iPhone"
 msgstr ""
 
 #: ../../addon/dav/friendica/layout.fnk.php:522
+#: ../../addon.old/dav/friendica/layout.fnk.php:522
 msgid "Synchronizing your Friendica-Contacts with the iPhone"
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:202
+#: ../../addon.old/dav/friendica/main.php:202
 msgid ""
 "The current version of this plugin has not been set up correctly. Please "
 "contact the system administrator of your installation of friendica to fix "
@@ -5789,52 +6224,65 @@ msgid ""
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:242
+#: ../../addon.old/dav/friendica/main.php:242
 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:710
+#: ../../include/enotify.php:28 ../../include/notifier.php:778
+#: ../../addon.old/dav/friendica/main.php:279
+#: ../../addon.old/dav/friendica/main.php:280
 msgid "noreply"
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:282
+#: ../../addon.old/dav/friendica/main.php:282
 msgid "Notification: "
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:309
+#: ../../addon.old/dav/friendica/main.php:309
 msgid "The database tables have been installed."
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:310
+#: ../../addon.old/dav/friendica/main.php:310
 msgid "An error occurred during the installation."
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:316
+#: ../../addon.old/dav/friendica/main.php:316
 msgid "The database tables have been updated."
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:317
+#: ../../addon.old/dav/friendica/main.php:317
 msgid "An error occurred during the update."
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:333
+#: ../../addon.old/dav/friendica/main.php:333
 msgid "No system-wide settings yet."
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:336
+#: ../../addon.old/dav/friendica/main.php:336
 msgid "Database status"
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:339
+#: ../../addon.old/dav/friendica/main.php:339
 msgid "Installed"
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:343
+#: ../../addon.old/dav/friendica/main.php:343
 msgid "Upgrade needed"
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:343
+#: ../../addon.old/dav/friendica/main.php:343
 msgid ""
 "Please back up all calendar data (the tables beginning with dav_*) before "
 "proceeding. While all calendar events <i>should</i> be converted to the new "
@@ -5844,22 +6292,27 @@ msgid ""
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:343
+#: ../../addon.old/dav/friendica/main.php:343
 msgid "Upgrade"
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:346
+#: ../../addon.old/dav/friendica/main.php:346
 msgid "Not installed"
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:346
+#: ../../addon.old/dav/friendica/main.php:346
 msgid "Install"
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:350
+#: ../../addon.old/dav/friendica/main.php:350
 msgid "Unknown"
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:350
+#: ../../addon.old/dav/friendica/main.php:350
 msgid ""
 "Something really went wrong. I cannot recover from this state automatically, "
 "sorry. Please go to the database backend, back up the data, and delete all "
@@ -5868,38 +6321,47 @@ msgid ""
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:355
+#: ../../addon.old/dav/friendica/main.php:355
 msgid "Troubleshooting"
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:356
+#: ../../addon.old/dav/friendica/main.php:356
 msgid "Manual creation of the database tables:"
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:357
+#: ../../addon.old/dav/friendica/main.php:357
 msgid "Show SQL-statements"
 msgstr ""
 
 #: ../../addon/dav/friendica/calendar.friendica.fnk.php:206
+#: ../../addon.old/dav/friendica/calendar.friendica.fnk.php:206
 msgid "Private Calendar"
 msgstr ""
 
 #: ../../addon/dav/friendica/calendar.friendica.fnk.php:207
+#: ../../addon.old/dav/friendica/calendar.friendica.fnk.php:207
 msgid "Friendica Events: Mine"
 msgstr ""
 
 #: ../../addon/dav/friendica/calendar.friendica.fnk.php:208
+#: ../../addon.old/dav/friendica/calendar.friendica.fnk.php:208
 msgid "Friendica Events: Contacts"
 msgstr ""
 
 #: ../../addon/dav/friendica/calendar.friendica.fnk.php:248
+#: ../../addon.old/dav/friendica/calendar.friendica.fnk.php:248
 msgid "Private Addresses"
 msgstr ""
 
 #: ../../addon/dav/friendica/calendar.friendica.fnk.php:249
+#: ../../addon.old/dav/friendica/calendar.friendica.fnk.php:249
 msgid "Friendica Contacts"
 msgstr ""
 
 #: ../../addon/uhremotestorage/uhremotestorage.php:84
+#: ../../addon.old/uhremotestorage/uhremotestorage.php:84
 #, php-format
 msgid ""
 "Allow to use your friendica id (%s) to connecto to external unhosted-enabled "
@@ -5908,183 +6370,197 @@ msgid ""
 msgstr ""
 
 #: ../../addon/uhremotestorage/uhremotestorage.php:85
+#: ../../addon.old/uhremotestorage/uhremotestorage.php:85
 msgid "Template URL (with {category})"
 msgstr ""
 
 #: ../../addon/uhremotestorage/uhremotestorage.php:86
+#: ../../addon.old/uhremotestorage/uhremotestorage.php:86
 msgid "OAuth end-point"
 msgstr ""
 
 #: ../../addon/uhremotestorage/uhremotestorage.php:87
+#: ../../addon.old/uhremotestorage/uhremotestorage.php:87
 msgid "Api"
 msgstr ""
 
 #: ../../addon/membersince/membersince.php:18
+#: ../../addon.old/membersince/membersince.php:18
 msgid "Member since:"
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:20
+#: ../../addon/tictac/tictac.php:20 ../../addon.old/tictac/tictac.php:20
 msgid "Three Dimensional Tic-Tac-Toe"
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:53
+#: ../../addon/tictac/tictac.php:53 ../../addon.old/tictac/tictac.php:53
 msgid "3D Tic-Tac-Toe"
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:58
+#: ../../addon/tictac/tictac.php:58 ../../addon.old/tictac/tictac.php:58
 msgid "New game"
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:59
+#: ../../addon/tictac/tictac.php:59 ../../addon.old/tictac/tictac.php:59
 msgid "New game with handicap"
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:60
+#: ../../addon/tictac/tictac.php:60 ../../addon.old/tictac/tictac.php:60
 msgid ""
 "Three dimensional tic-tac-toe is just like the traditional game except that "
 "it is played on multiple levels simultaneously. "
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:61
+#: ../../addon/tictac/tictac.php:61 ../../addon.old/tictac/tictac.php:61
 msgid ""
 "In this case there are three levels. You win by getting three in a row on "
 "any level, as well as up, down, and diagonally across the different levels."
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:63
+#: ../../addon/tictac/tictac.php:63 ../../addon.old/tictac/tictac.php:63
 msgid ""
 "The handicap game disables the center position on the middle level because "
 "the player claiming this square often has an unfair advantage."
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:182
+#: ../../addon/tictac/tictac.php:182 ../../addon.old/tictac/tictac.php:182
 msgid "You go first..."
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:187
+#: ../../addon/tictac/tictac.php:187 ../../addon.old/tictac/tictac.php:187
 msgid "I'm going first this time..."
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:193
+#: ../../addon/tictac/tictac.php:193 ../../addon.old/tictac/tictac.php:193
 msgid "You won!"
 msgstr ""
 
 #: ../../addon/tictac/tictac.php:199 ../../addon/tictac/tictac.php:224
+#: ../../addon.old/tictac/tictac.php:199 ../../addon.old/tictac/tictac.php:224
 msgid "\"Cat\" game!"
 msgstr ""
 
-#: ../../addon/tictac/tictac.php:222
+#: ../../addon/tictac/tictac.php:222 ../../addon.old/tictac/tictac.php:222
 msgid "I won!"
 msgstr ""
 
 #: ../../addon/randplace/randplace.php:169
+#: ../../addon.old/randplace/randplace.php:169
 msgid "Randplace Settings"
 msgstr ""
 
 #: ../../addon/randplace/randplace.php:171
+#: ../../addon.old/randplace/randplace.php:171
 msgid "Enable Randplace Plugin"
 msgstr ""
 
-#: ../../addon/dwpost/dwpost.php:39
+#: ../../addon/dwpost/dwpost.php:39 ../../addon.old/dwpost/dwpost.php:39
 msgid "Post to Dreamwidth"
 msgstr ""
 
-#: ../../addon/dwpost/dwpost.php:70
+#: ../../addon/dwpost/dwpost.php:70 ../../addon.old/dwpost/dwpost.php:70
 msgid "Dreamwidth Post Settings"
 msgstr ""
 
-#: ../../addon/dwpost/dwpost.php:72
+#: ../../addon/dwpost/dwpost.php:72 ../../addon.old/dwpost/dwpost.php:72
 msgid "Enable dreamwidth Post Plugin"
 msgstr ""
 
-#: ../../addon/dwpost/dwpost.php:77
+#: ../../addon/dwpost/dwpost.php:77 ../../addon.old/dwpost/dwpost.php:77
 msgid "dreamwidth username"
 msgstr ""
 
-#: ../../addon/dwpost/dwpost.php:82
+#: ../../addon/dwpost/dwpost.php:82 ../../addon.old/dwpost/dwpost.php:82
 msgid "dreamwidth password"
 msgstr ""
 
-#: ../../addon/dwpost/dwpost.php:87
+#: ../../addon/dwpost/dwpost.php:87 ../../addon.old/dwpost/dwpost.php:87
 msgid "Post to dreamwidth by default"
 msgstr ""
 
-#: ../../addon/drpost/drpost.php:35
-msgid "Post to Drupal"
-msgstr ""
-
-#: ../../addon/drpost/drpost.php:72
-msgid "Drupal Post Settings"
+#: ../../addon/remote_permissions/remote_permissions.php:44
+msgid "Remote Permissions Settings"
 msgstr ""
 
-#: ../../addon/drpost/drpost.php:74
-msgid "Enable Drupal Post Plugin"
+#: ../../addon/remote_permissions/remote_permissions.php:45
+msgid ""
+"Allow recipients of your private posts to see the other recipients of the "
+"posts"
 msgstr ""
 
-#: ../../addon/drpost/drpost.php:79
-msgid "Drupal username"
+#: ../../addon/remote_permissions/remote_permissions.php:57
+msgid "Remote Permissions settings updated."
 msgstr ""
 
-#: ../../addon/drpost/drpost.php:84
-msgid "Drupal password"
+#: ../../addon/remote_permissions/remote_permissions.php:177
+msgid "Visible to"
 msgstr ""
 
-#: ../../addon/drpost/drpost.php:89
-msgid "Post Type - article,page,or blog"
+#: ../../addon/remote_permissions/remote_permissions.php:177
+msgid "may only be a partial list"
 msgstr ""
 
-#: ../../addon/drpost/drpost.php:94
-msgid "Drupal site URL"
+#: ../../addon/remote_permissions/remote_permissions.php:196
+msgid "Global"
 msgstr ""
 
-#: ../../addon/drpost/drpost.php:99
-msgid "Drupal site uses clean URLS"
+#: ../../addon/remote_permissions/remote_permissions.php:196
+msgid "The posts of every user on this server show the post recipients"
 msgstr ""
 
-#: ../../addon/drpost/drpost.php:104
-msgid "Post to Drupal by default"
+#: ../../addon/remote_permissions/remote_permissions.php:197
+msgid "Individual"
 msgstr ""
 
-#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:201
-#: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:189
-msgid "Post from Friendica"
+#: ../../addon/remote_permissions/remote_permissions.php:197
+msgid "Each user chooses whether his/her posts show the post recipients"
 msgstr ""
 
 #: ../../addon/startpage/startpage.php:83
+#: ../../addon.old/startpage/startpage.php:83
 msgid "Startpage Settings"
 msgstr ""
 
 #: ../../addon/startpage/startpage.php:85
+#: ../../addon.old/startpage/startpage.php:85
 msgid "Home page to load after login  - leave blank for profile wall"
 msgstr ""
 
 #: ../../addon/startpage/startpage.php:88
+#: ../../addon.old/startpage/startpage.php:88
 msgid "Examples: &quot;network&quot; or &quot;notifications/system&quot;"
 msgstr ""
 
 #: ../../addon/geonames/geonames.php:143
+#: ../../addon.old/geonames/geonames.php:143
 msgid "Geonames settings updated."
 msgstr ""
 
 #: ../../addon/geonames/geonames.php:179
+#: ../../addon.old/geonames/geonames.php:179
 msgid "Geonames Settings"
 msgstr ""
 
 #: ../../addon/geonames/geonames.php:181
+#: ../../addon.old/geonames/geonames.php:181
 msgid "Enable Geonames Plugin"
 msgstr ""
 
 #: ../../addon/public_server/public_server.php:126
 #: ../../addon/testdrive/testdrive.php:94
+#: ../../addon.old/public_server/public_server.php:126
+#: ../../addon.old/testdrive/testdrive.php:94
 #, php-format
 msgid "Your account on %s will expire in a few days."
 msgstr ""
 
 #: ../../addon/public_server/public_server.php:127
+#: ../../addon.old/public_server/public_server.php:127
 msgid "Your Friendica account is about to expire."
 msgstr ""
 
 #: ../../addon/public_server/public_server.php:128
+#: ../../addon.old/public_server/public_server.php:128
 #, php-format
 msgid ""
 "Hi %1$s,\n"
@@ -6094,90 +6570,105 @@ msgid ""
 msgstr ""
 
 #: ../../addon/js_upload/js_upload.php:43
+#: ../../addon.old/js_upload/js_upload.php:43
 msgid "Upload a file"
 msgstr ""
 
 #: ../../addon/js_upload/js_upload.php:44
+#: ../../addon.old/js_upload/js_upload.php:44
 msgid "Drop files here to upload"
 msgstr ""
 
 #: ../../addon/js_upload/js_upload.php:46
+#: ../../addon.old/js_upload/js_upload.php:46
 msgid "Failed"
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:297
+#: ../../addon/js_upload/js_upload.php:303
+#: ../../addon.old/js_upload/js_upload.php:297
 msgid "No files were uploaded."
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:303
+#: ../../addon/js_upload/js_upload.php:309
+#: ../../addon.old/js_upload/js_upload.php:303
 msgid "Uploaded file is empty"
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:326
+#: ../../addon/js_upload/js_upload.php:332
+#: ../../addon.old/js_upload/js_upload.php:326
 msgid "File has an invalid extension, it should be one of "
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:337
+#: ../../addon/js_upload/js_upload.php:343
+#: ../../addon.old/js_upload/js_upload.php:337
 msgid "Upload was cancelled, or server error encountered"
 msgstr ""
 
-#: ../../addon/oembed.old/oembed.php:30
-msgid "OEmbed settings updated"
-msgstr ""
-
-#: ../../addon/oembed.old/oembed.php:43
-msgid "Use OEmbed for YouTube videos"
-msgstr ""
-
-#: ../../addon/oembed.old/oembed.php:71
-msgid "URL to embed:"
-msgstr ""
-
-#: ../../addon/forumlist/forumlist.php:59
+#: ../../addon/forumlist/forumlist.php:63
+#: ../../addon.old/forumlist/forumlist.php:63
 msgid "show/hide"
 msgstr ""
 
-#: ../../addon/forumlist/forumlist.php:73
+#: ../../addon/forumlist/forumlist.php:77
+#: ../../addon.old/forumlist/forumlist.php:77
 msgid "No forum subscriptions"
 msgstr ""
 
-#: ../../addon/forumlist/forumlist.php:126
+#: ../../addon/forumlist/forumlist.php:131
+#: ../../addon.old/forumlist/forumlist.php:131
 msgid "Forumlist settings updated."
 msgstr ""
 
-#: ../../addon/forumlist/forumlist.php:151
+#: ../../addon/forumlist/forumlist.php:159
+#: ../../addon.old/forumlist/forumlist.php:159
 msgid "Forumlist Settings"
 msgstr ""
 
-#: ../../addon/forumlist/forumlist.php:153
+#: ../../addon/forumlist/forumlist.php:161
+#: ../../addon.old/forumlist/forumlist.php:161
 msgid "Randomise forum list"
 msgstr ""
 
-#: ../../addon/forumlist/forumlist.php:156
+#: ../../addon/forumlist/forumlist.php:164
+#: ../../addon.old/forumlist/forumlist.php:164
 msgid "Show forums on profile page"
 msgstr ""
 
+#: ../../addon/forumlist/forumlist.php:167
+#: ../../addon.old/forumlist/forumlist.php:167
+msgid "Show forums on network page"
+msgstr ""
+
 #: ../../addon/impressum/impressum.php:37
+#: ../../addon.old/impressum/impressum.php:37
 msgid "Impressum"
 msgstr ""
 
 #: ../../addon/impressum/impressum.php:50
 #: ../../addon/impressum/impressum.php:52
 #: ../../addon/impressum/impressum.php:84
+#: ../../addon.old/impressum/impressum.php:50
+#: ../../addon.old/impressum/impressum.php:52
+#: ../../addon.old/impressum/impressum.php:84
 msgid "Site Owner"
 msgstr ""
 
 #: ../../addon/impressum/impressum.php:50
 #: ../../addon/impressum/impressum.php:88
+#: ../../addon.old/impressum/impressum.php:50
+#: ../../addon.old/impressum/impressum.php:88
 msgid "Email Address"
 msgstr ""
 
 #: ../../addon/impressum/impressum.php:55
 #: ../../addon/impressum/impressum.php:86
+#: ../../addon.old/impressum/impressum.php:55
+#: ../../addon.old/impressum/impressum.php:86
 msgid "Postal Address"
 msgstr ""
 
 #: ../../addon/impressum/impressum.php:61
+#: ../../addon.old/impressum/impressum.php:61
 msgid ""
 "The impressum addon needs to be configured!<br />Please add at least the "
 "<tt>owner</tt> variable to your config file. For other variables please "
@@ -6185,193 +6676,236 @@ msgid ""
 msgstr ""
 
 #: ../../addon/impressum/impressum.php:84
+#: ../../addon.old/impressum/impressum.php:84
 msgid "The page operators name."
 msgstr ""
 
 #: ../../addon/impressum/impressum.php:85
+#: ../../addon.old/impressum/impressum.php:85
 msgid "Site Owners Profile"
 msgstr ""
 
 #: ../../addon/impressum/impressum.php:85
+#: ../../addon.old/impressum/impressum.php:85
 msgid "Profile address of the operator."
 msgstr ""
 
 #: ../../addon/impressum/impressum.php:86
+#: ../../addon.old/impressum/impressum.php:86
 msgid "How to contact the operator via snail mail. You can use BBCode here."
 msgstr ""
 
 #: ../../addon/impressum/impressum.php:87
+#: ../../addon.old/impressum/impressum.php:87
 msgid "Notes"
 msgstr ""
 
 #: ../../addon/impressum/impressum.php:87
+#: ../../addon.old/impressum/impressum.php:87
 msgid ""
 "Additional notes that are displayed beneath the contact information. You can "
 "use BBCode here."
 msgstr ""
 
 #: ../../addon/impressum/impressum.php:88
+#: ../../addon.old/impressum/impressum.php:88
 msgid "How to contact the operator via email. (will be displayed obfuscated)"
 msgstr ""
 
 #: ../../addon/impressum/impressum.php:89
+#: ../../addon.old/impressum/impressum.php:89
 msgid "Footer note"
 msgstr ""
 
 #: ../../addon/impressum/impressum.php:89
+#: ../../addon.old/impressum/impressum.php:89
 msgid "Text for the footer. You can use BBCode here."
 msgstr ""
 
-#: ../../addon/buglink/buglink.php:15
+#: ../../addon/buglink/buglink.php:15 ../../addon.old/buglink/buglink.php:15
 msgid "Report Bug"
 msgstr ""
 
 #: ../../addon/notimeline/notimeline.php:32
+#: ../../addon.old/notimeline/notimeline.php:32
 msgid "No Timeline settings updated."
 msgstr ""
 
 #: ../../addon/notimeline/notimeline.php:56
+#: ../../addon.old/notimeline/notimeline.php:56
 msgid "No Timeline Settings"
 msgstr ""
 
 #: ../../addon/notimeline/notimeline.php:58
+#: ../../addon.old/notimeline/notimeline.php:58
 msgid "Disable Archive selector on profile wall"
 msgstr ""
 
-#: ../../addon/blockem/blockem.php:51
+#: ../../addon/blockem/blockem.php:51 ../../addon.old/blockem/blockem.php:51
 msgid "\"Blockem\" Settings"
 msgstr ""
 
-#: ../../addon/blockem/blockem.php:53
+#: ../../addon/blockem/blockem.php:53 ../../addon.old/blockem/blockem.php:53
 msgid "Comma separated profile URLS to block"
 msgstr ""
 
-#: ../../addon/blockem/blockem.php:70
+#: ../../addon/blockem/blockem.php:70 ../../addon.old/blockem/blockem.php:70
 msgid "BLOCKEM Settings saved."
 msgstr ""
 
-#: ../../addon/blockem/blockem.php:105
+#: ../../addon/blockem/blockem.php:105 ../../addon.old/blockem/blockem.php:105
 #, php-format
 msgid "Blocked %s - Click to open/close"
 msgstr ""
 
-#: ../../addon/blockem/blockem.php:160
+#: ../../addon/blockem/blockem.php:160 ../../addon.old/blockem/blockem.php:160
 msgid "Unblock Author"
 msgstr ""
 
-#: ../../addon/blockem/blockem.php:162
+#: ../../addon/blockem/blockem.php:162 ../../addon.old/blockem/blockem.php:162
 msgid "Block Author"
 msgstr ""
 
-#: ../../addon/blockem/blockem.php:194
+#: ../../addon/blockem/blockem.php:194 ../../addon.old/blockem/blockem.php:194
 msgid "blockem settings updated"
 msgstr ""
 
 #: ../../addon/qcomment/qcomment.php:51
+#: ../../addon.old/qcomment/qcomment.php:51
 msgid ":-)"
 msgstr ""
 
 #: ../../addon/qcomment/qcomment.php:51
+#: ../../addon.old/qcomment/qcomment.php:51
 msgid ":-("
 msgstr ""
 
 #: ../../addon/qcomment/qcomment.php:51
+#: ../../addon.old/qcomment/qcomment.php:51
 msgid "lol"
 msgstr ""
 
 #: ../../addon/qcomment/qcomment.php:54
+#: ../../addon.old/qcomment/qcomment.php:54
 msgid "Quick Comment Settings"
 msgstr ""
 
 #: ../../addon/qcomment/qcomment.php:56
+#: ../../addon.old/qcomment/qcomment.php:56
 msgid ""
 "Quick comments are found near comment boxes, sometimes hidden. Click them to "
 "provide simple replies."
 msgstr ""
 
 #: ../../addon/qcomment/qcomment.php:57
+#: ../../addon.old/qcomment/qcomment.php:57
 msgid "Enter quick comments, one per line"
 msgstr ""
 
 #: ../../addon/qcomment/qcomment.php:75
+#: ../../addon.old/qcomment/qcomment.php:75
 msgid "Quick Comment settings saved."
 msgstr ""
 
 #: ../../addon/openstreetmap/openstreetmap.php:71
+#: ../../addon.old/openstreetmap/openstreetmap.php:71
 msgid "Tile Server URL"
 msgstr ""
 
 #: ../../addon/openstreetmap/openstreetmap.php:71
+#: ../../addon.old/openstreetmap/openstreetmap.php:71
 msgid ""
 "A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank"
 "\">public tile servers</a>"
 msgstr ""
 
 #: ../../addon/openstreetmap/openstreetmap.php:72
+#: ../../addon.old/openstreetmap/openstreetmap.php:72
 msgid "Default zoom"
 msgstr ""
 
 #: ../../addon/openstreetmap/openstreetmap.php:72
+#: ../../addon.old/openstreetmap/openstreetmap.php:72
 msgid "The default zoom level. (1:world, 18:highest)"
 msgstr ""
 
 #: ../../addon/group_text/group_text.php:46
 #: ../../addon/editplain/editplain.php:46
+#: ../../addon.old/group_text/group_text.php:46
+#: ../../addon.old/editplain/editplain.php:46
 msgid "Editplain settings updated."
 msgstr ""
 
 #: ../../addon/group_text/group_text.php:76
+#: ../../addon.old/group_text/group_text.php:76
 msgid "Group Text"
 msgstr ""
 
 #: ../../addon/group_text/group_text.php:78
+#: ../../addon.old/group_text/group_text.php:78
 msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
 msgstr ""
 
 #: ../../addon/libravatar/libravatar.php:14
+#: ../../addon.old/libravatar/libravatar.php:14
 msgid "Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"
 msgstr ""
 
 #: ../../addon/libravatar/libravatar.php:73
 #: ../../addon/gravatar/gravatar.php:71
+#: ../../addon.old/libravatar/libravatar.php:73
+#: ../../addon.old/gravatar/gravatar.php:71
 msgid "generic profile image"
 msgstr ""
 
 #: ../../addon/libravatar/libravatar.php:74
 #: ../../addon/gravatar/gravatar.php:72
+#: ../../addon.old/libravatar/libravatar.php:74
+#: ../../addon.old/gravatar/gravatar.php:72
 msgid "random geometric pattern"
 msgstr ""
 
 #: ../../addon/libravatar/libravatar.php:75
 #: ../../addon/gravatar/gravatar.php:73
+#: ../../addon.old/libravatar/libravatar.php:75
+#: ../../addon.old/gravatar/gravatar.php:73
 msgid "monster face"
 msgstr ""
 
 #: ../../addon/libravatar/libravatar.php:76
 #: ../../addon/gravatar/gravatar.php:74
+#: ../../addon.old/libravatar/libravatar.php:76
+#: ../../addon.old/gravatar/gravatar.php:74
 msgid "computer generated face"
 msgstr ""
 
 #: ../../addon/libravatar/libravatar.php:77
 #: ../../addon/gravatar/gravatar.php:75
+#: ../../addon.old/libravatar/libravatar.php:77
+#: ../../addon.old/gravatar/gravatar.php:75
 msgid "retro arcade style face"
 msgstr ""
 
 #: ../../addon/libravatar/libravatar.php:83
+#: ../../addon.old/libravatar/libravatar.php:83
 #, php-format
 msgid "Your PHP version %s is lower than the required PHP >= 5.3."
 msgstr ""
 
 #: ../../addon/libravatar/libravatar.php:84
+#: ../../addon.old/libravatar/libravatar.php:84
 msgid "This addon is not functional on your server."
 msgstr ""
 
 #: ../../addon/libravatar/libravatar.php:93
 #: ../../addon/gravatar/gravatar.php:89
+#: ../../addon.old/libravatar/libravatar.php:93
+#: ../../addon.old/gravatar/gravatar.php:89
 msgid "Information"
 msgstr ""
 
 #: ../../addon/libravatar/libravatar.php:93
+#: ../../addon.old/libravatar/libravatar.php:93
 msgid ""
 "Gravatar addon is installed. Please disable the Gravatar addon.<br>The "
 "Libravatar addon will fall back to Gravatar if nothing was found at "
@@ -6380,83 +6914,99 @@ msgstr ""
 
 #: ../../addon/libravatar/libravatar.php:100
 #: ../../addon/gravatar/gravatar.php:96
+#: ../../addon.old/libravatar/libravatar.php:100
+#: ../../addon.old/gravatar/gravatar.php:96
 msgid "Default avatar image"
 msgstr ""
 
 #: ../../addon/libravatar/libravatar.php:100
+#: ../../addon.old/libravatar/libravatar.php:100
 msgid "Select default avatar image if none was found. See README"
 msgstr ""
 
 #: ../../addon/libravatar/libravatar.php:112
+#: ../../addon.old/libravatar/libravatar.php:112
 msgid "Libravatar settings updated."
 msgstr ""
 
 #: ../../addon/libertree/libertree.php:36
+#: ../../addon.old/libertree/libertree.php:36
 msgid "Post to libertree"
 msgstr ""
 
 #: ../../addon/libertree/libertree.php:67
+#: ../../addon.old/libertree/libertree.php:67
 msgid "libertree Post Settings"
 msgstr ""
 
 #: ../../addon/libertree/libertree.php:69
+#: ../../addon.old/libertree/libertree.php:69
 msgid "Enable Libertree Post Plugin"
 msgstr ""
 
 #: ../../addon/libertree/libertree.php:74
+#: ../../addon.old/libertree/libertree.php:74
 msgid "Libertree API token"
 msgstr ""
 
 #: ../../addon/libertree/libertree.php:79
+#: ../../addon.old/libertree/libertree.php:79
 msgid "Libertree site URL"
 msgstr ""
 
 #: ../../addon/libertree/libertree.php:84
+#: ../../addon.old/libertree/libertree.php:84
 msgid "Post to Libertree by default"
 msgstr ""
 
 #: ../../addon/altpager/altpager.php:46
+#: ../../addon.old/altpager/altpager.php:46
 msgid "Altpager settings updated."
 msgstr ""
 
 #: ../../addon/altpager/altpager.php:79
+#: ../../addon.old/altpager/altpager.php:79
 msgid "Alternate Pagination Setting"
 msgstr ""
 
 #: ../../addon/altpager/altpager.php:81
+#: ../../addon.old/altpager/altpager.php:81
 msgid "Use links to \"newer\" and \"older\" pages in place of page numbers?"
 msgstr ""
 
-#: ../../addon/mathjax/mathjax.php:37
+#: ../../addon/mathjax/mathjax.php:37 ../../addon.old/mathjax/mathjax.php:37
 msgid ""
 "The MathJax addon renders mathematical formulae written using the LaTeX "
 "syntax surrounded by the usual $$ or an eqnarray block in the postings of "
 "your wall,network tab and private mail."
 msgstr ""
 
-#: ../../addon/mathjax/mathjax.php:38
+#: ../../addon/mathjax/mathjax.php:38 ../../addon.old/mathjax/mathjax.php:38
 msgid "Use the MathJax renderer"
 msgstr ""
 
-#: ../../addon/mathjax/mathjax.php:74
+#: ../../addon/mathjax/mathjax.php:74 ../../addon.old/mathjax/mathjax.php:74
 msgid "MathJax Base URL"
 msgstr ""
 
-#: ../../addon/mathjax/mathjax.php:74
+#: ../../addon/mathjax/mathjax.php:74 ../../addon.old/mathjax/mathjax.php:74
 msgid ""
 "The URL for the javascript file that should be included to use MathJax. Can "
 "be either the MathJax CDN or another installation of MathJax."
 msgstr ""
 
 #: ../../addon/editplain/editplain.php:76
+#: ../../addon.old/editplain/editplain.php:76
 msgid "Editplain Settings"
 msgstr ""
 
 #: ../../addon/editplain/editplain.php:78
+#: ../../addon.old/editplain/editplain.php:78
 msgid "Disable richtext status editor"
 msgstr ""
 
 #: ../../addon/gravatar/gravatar.php:89
+#: ../../addon.old/gravatar/gravatar.php:89
 msgid ""
 "Libravatar addon is installed, too. Please disable Libravatar addon or this "
 "Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
@@ -6464,26 +7014,32 @@ msgid ""
 msgstr ""
 
 #: ../../addon/gravatar/gravatar.php:96
+#: ../../addon.old/gravatar/gravatar.php:96
 msgid "Select default avatar image if none was found at Gravatar. See README"
 msgstr ""
 
 #: ../../addon/gravatar/gravatar.php:97
+#: ../../addon.old/gravatar/gravatar.php:97
 msgid "Rating of images"
 msgstr ""
 
 #: ../../addon/gravatar/gravatar.php:97
+#: ../../addon.old/gravatar/gravatar.php:97
 msgid "Select the appropriate avatar rating for your site. See README"
 msgstr ""
 
 #: ../../addon/gravatar/gravatar.php:111
+#: ../../addon.old/gravatar/gravatar.php:111
 msgid "Gravatar settings updated."
 msgstr ""
 
 #: ../../addon/testdrive/testdrive.php:95
+#: ../../addon.old/testdrive/testdrive.php:95
 msgid "Your Friendica test account is about to expire."
 msgstr ""
 
 #: ../../addon/testdrive/testdrive.php:96
+#: ../../addon.old/testdrive/testdrive.php:96
 #, php-format
 msgid ""
 "Hi %1$s,\n"
@@ -6497,120 +7053,142 @@ msgid ""
 msgstr ""
 
 #: ../../addon/pageheader/pageheader.php:50
+#: ../../addon.old/pageheader/pageheader.php:50
 msgid "\"pageheader\" Settings"
 msgstr ""
 
 #: ../../addon/pageheader/pageheader.php:68
+#: ../../addon.old/pageheader/pageheader.php:68
 msgid "pageheader Settings saved."
 msgstr ""
 
-#: ../../addon/ijpost/ijpost.php:39
+#: ../../addon/ijpost/ijpost.php:39 ../../addon.old/ijpost/ijpost.php:39
 msgid "Post to Insanejournal"
 msgstr ""
 
-#: ../../addon/ijpost/ijpost.php:70
+#: ../../addon/ijpost/ijpost.php:70 ../../addon.old/ijpost/ijpost.php:70
 msgid "InsaneJournal Post Settings"
 msgstr ""
 
-#: ../../addon/ijpost/ijpost.php:72
+#: ../../addon/ijpost/ijpost.php:72 ../../addon.old/ijpost/ijpost.php:72
 msgid "Enable InsaneJournal Post Plugin"
 msgstr ""
 
-#: ../../addon/ijpost/ijpost.php:77
+#: ../../addon/ijpost/ijpost.php:77 ../../addon.old/ijpost/ijpost.php:77
 msgid "InsaneJournal username"
 msgstr ""
 
-#: ../../addon/ijpost/ijpost.php:82
+#: ../../addon/ijpost/ijpost.php:82 ../../addon.old/ijpost/ijpost.php:82
 msgid "InsaneJournal password"
 msgstr ""
 
-#: ../../addon/ijpost/ijpost.php:87
+#: ../../addon/ijpost/ijpost.php:87 ../../addon.old/ijpost/ijpost.php:87
 msgid "Post to InsaneJournal by default"
 msgstr ""
 
 #: ../../addon/jappixmini/jappixmini.php:266
+#: ../../addon.old/jappixmini/jappixmini.php:266
 msgid "Jappix Mini addon settings"
 msgstr ""
 
 #: ../../addon/jappixmini/jappixmini.php:268
+#: ../../addon.old/jappixmini/jappixmini.php:268
 msgid "Activate addon"
 msgstr ""
 
 #: ../../addon/jappixmini/jappixmini.php:271
+#: ../../addon.old/jappixmini/jappixmini.php:271
 msgid "Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"
 msgstr ""
 
 #: ../../addon/jappixmini/jappixmini.php:274
+#: ../../addon.old/jappixmini/jappixmini.php:274
 msgid "Jabber username"
 msgstr ""
 
 #: ../../addon/jappixmini/jappixmini.php:277
+#: ../../addon.old/jappixmini/jappixmini.php:277
 msgid "Jabber server"
 msgstr ""
 
 #: ../../addon/jappixmini/jappixmini.php:281
+#: ../../addon.old/jappixmini/jappixmini.php:281
 msgid "Jabber BOSH host"
 msgstr ""
 
 #: ../../addon/jappixmini/jappixmini.php:285
+#: ../../addon.old/jappixmini/jappixmini.php:285
 msgid "Jabber password"
 msgstr ""
 
 #: ../../addon/jappixmini/jappixmini.php:290
+#: ../../addon.old/jappixmini/jappixmini.php:290
 msgid "Encrypt Jabber password with Friendica password (recommended)"
 msgstr ""
 
 #: ../../addon/jappixmini/jappixmini.php:293
+#: ../../addon.old/jappixmini/jappixmini.php:293
 msgid "Friendica password"
 msgstr ""
 
 #: ../../addon/jappixmini/jappixmini.php:296
+#: ../../addon.old/jappixmini/jappixmini.php:296
 msgid "Approve subscription requests from Friendica contacts automatically"
 msgstr ""
 
 #: ../../addon/jappixmini/jappixmini.php:299
+#: ../../addon.old/jappixmini/jappixmini.php:299
 msgid "Subscribe to Friendica contacts automatically"
 msgstr ""
 
 #: ../../addon/jappixmini/jappixmini.php:302
+#: ../../addon.old/jappixmini/jappixmini.php:302
 msgid "Purge internal list of jabber addresses of contacts"
 msgstr ""
 
 #: ../../addon/jappixmini/jappixmini.php:308
+#: ../../addon.old/jappixmini/jappixmini.php:308
 msgid "Add contact"
 msgstr ""
 
-#: ../../addon/viewsrc/viewsrc.php:37
+#: ../../addon/viewsrc/viewsrc.php:37 ../../addon.old/viewsrc/viewsrc.php:37
 msgid "View Source"
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:134
+#: ../../addon.old/statusnet/statusnet.php:134
 msgid "Post to StatusNet"
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:176
+#: ../../addon.old/statusnet/statusnet.php:176
 msgid ""
 "Please contact your site administrator.<br />The provided API URL is not "
 "valid."
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:204
+#: ../../addon.old/statusnet/statusnet.php:204
 msgid "We could not contact the StatusNet API with the Path you entered."
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:232
+#: ../../addon.old/statusnet/statusnet.php:232
 msgid "StatusNet settings updated."
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:257
+#: ../../addon.old/statusnet/statusnet.php:257
 msgid "StatusNet Posting Settings"
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:271
+#: ../../addon.old/statusnet/statusnet.php:271
 msgid "Globally Available StatusNet OAuthKeys"
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:272
+#: ../../addon.old/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 "
@@ -6618,10 +7196,12 @@ msgid ""
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:280
+#: ../../addon.old/statusnet/statusnet.php:280
 msgid "Provide your own OAuth Credentials"
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:281
+#: ../../addon.old/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 "
@@ -6631,18 +7211,22 @@ msgid ""
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:283
+#: ../../addon.old/statusnet/statusnet.php:283
 msgid "OAuth Consumer Key"
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:286
+#: ../../addon.old/statusnet/statusnet.php:286
 msgid "OAuth Consumer Secret"
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:289
+#: ../../addon.old/statusnet/statusnet.php:289
 msgid "Base API Path (remember the trailing /)"
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:310
+#: ../../addon.old/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 "
@@ -6651,30 +7235,38 @@ msgid ""
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:311
+#: ../../addon.old/statusnet/statusnet.php:311
 msgid "Log in with StatusNet"
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:313
+#: ../../addon.old/statusnet/statusnet.php:313
 msgid "Copy the security code from StatusNet here"
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:319
+#: ../../addon.old/statusnet/statusnet.php:319
 msgid "Cancel Connection Process"
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:321
+#: ../../addon.old/statusnet/statusnet.php:321
 msgid "Current StatusNet API is"
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:322
+#: ../../addon.old/statusnet/statusnet.php:322
 msgid "Cancel StatusNet Connection"
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:333 ../../addon/twitter/twitter.php:189
+#: ../../addon.old/statusnet/statusnet.php:333
+#: ../../addon.old/twitter/twitter.php:189
 msgid "Currently connected to: "
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:334
+#: ../../addon.old/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 "
@@ -6682,6 +7274,7 @@ msgid ""
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:336
+#: ../../addon.old/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 "
@@ -6690,143 +7283,169 @@ msgid ""
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:339
+#: ../../addon.old/statusnet/statusnet.php:339
 msgid "Allow posting to StatusNet"
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:342
+#: ../../addon.old/statusnet/statusnet.php:342
 msgid "Send public postings to StatusNet by default"
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:345
+#: ../../addon.old/statusnet/statusnet.php:345
 msgid "Send linked #-tags and @-names to StatusNet"
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:350 ../../addon/twitter/twitter.php:206
+#: ../../addon.old/statusnet/statusnet.php:350
+#: ../../addon.old/twitter/twitter.php:206
 msgid "Clear OAuth configuration"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:568
+#: ../../addon/statusnet/statusnet.php:677
+#: ../../addon.old/statusnet/statusnet.php:568
 msgid "API URL"
 msgstr ""
 
 #: ../../addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php:19
+#: ../../addon.old/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php:19
 msgid "Infinite Improbability Drive"
 msgstr ""
 
-#: ../../addon/tumblr/tumblr.php:36
+#: ../../addon/tumblr/tumblr.php:36 ../../addon.old/tumblr/tumblr.php:36
 msgid "Post to Tumblr"
 msgstr ""
 
-#: ../../addon/tumblr/tumblr.php:67
+#: ../../addon/tumblr/tumblr.php:67 ../../addon.old/tumblr/tumblr.php:67
 msgid "Tumblr Post Settings"
 msgstr ""
 
-#: ../../addon/tumblr/tumblr.php:69
+#: ../../addon/tumblr/tumblr.php:69 ../../addon.old/tumblr/tumblr.php:69
 msgid "Enable Tumblr Post Plugin"
 msgstr ""
 
-#: ../../addon/tumblr/tumblr.php:74
+#: ../../addon/tumblr/tumblr.php:74 ../../addon.old/tumblr/tumblr.php:74
 msgid "Tumblr login"
 msgstr ""
 
-#: ../../addon/tumblr/tumblr.php:79
+#: ../../addon/tumblr/tumblr.php:79 ../../addon.old/tumblr/tumblr.php:79
 msgid "Tumblr password"
 msgstr ""
 
-#: ../../addon/tumblr/tumblr.php:84
+#: ../../addon/tumblr/tumblr.php:84 ../../addon.old/tumblr/tumblr.php:84
 msgid "Post to Tumblr by default"
 msgstr ""
 
 #: ../../addon/numfriends/numfriends.php:46
+#: ../../addon.old/numfriends/numfriends.php:46
 msgid "Numfriends settings updated."
 msgstr ""
 
 #: ../../addon/numfriends/numfriends.php:77
+#: ../../addon.old/numfriends/numfriends.php:77
 msgid "Numfriends Settings"
 msgstr ""
 
-#: ../../addon/gnot/gnot.php:48
+#: ../../addon/numfriends/numfriends.php:79 ../../addon.old/bg/bg.php:84
+#: ../../addon.old/numfriends/numfriends.php:79
+msgid "How many contacts to display on profile sidebar"
+msgstr ""
+
+#: ../../addon/gnot/gnot.php:48 ../../addon.old/gnot/gnot.php:48
 msgid "Gnot settings updated."
 msgstr ""
 
-#: ../../addon/gnot/gnot.php:79
+#: ../../addon/gnot/gnot.php:79 ../../addon.old/gnot/gnot.php:79
 msgid "Gnot Settings"
 msgstr ""
 
-#: ../../addon/gnot/gnot.php:81
+#: ../../addon/gnot/gnot.php:81 ../../addon.old/gnot/gnot.php:81
 msgid ""
 "Allows threading of email comment notifications on Gmail and anonymising the "
 "subject line."
 msgstr ""
 
-#: ../../addon/gnot/gnot.php:82
+#: ../../addon/gnot/gnot.php:82 ../../addon.old/gnot/gnot.php:82
 msgid "Enable this plugin/addon?"
 msgstr ""
 
-#: ../../addon/gnot/gnot.php:97
+#: ../../addon/gnot/gnot.php:97 ../../addon.old/gnot/gnot.php:97
 #, php-format
 msgid "[Friendica:Notify] Comment to conversation #%d"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:42
+#: ../../addon/wppost/wppost.php:42 ../../addon.old/wppost/wppost.php:42
 msgid "Post to Wordpress"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:76
+#: ../../addon/wppost/wppost.php:76 ../../addon.old/wppost/wppost.php:76
 msgid "WordPress Post Settings"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:78
+#: ../../addon/wppost/wppost.php:78 ../../addon.old/wppost/wppost.php:78
 msgid "Enable WordPress Post Plugin"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:83
+#: ../../addon/wppost/wppost.php:83 ../../addon.old/wppost/wppost.php:83
 msgid "WordPress username"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:88
+#: ../../addon/wppost/wppost.php:88 ../../addon.old/wppost/wppost.php:88
 msgid "WordPress password"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:93
+#: ../../addon/wppost/wppost.php:93 ../../addon.old/wppost/wppost.php:93
 msgid "WordPress API URL"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:98
+#: ../../addon/wppost/wppost.php:98 ../../addon.old/wppost/wppost.php:98
 msgid "Post to WordPress by default"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:103
+#: ../../addon/wppost/wppost.php:103 ../../addon.old/wppost/wppost.php:103
 msgid "Provide a backlink to the Friendica post"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:207
+#: ../../addon/wppost/wppost.php:201 ../../addon/blogger/blogger.php:172
+#: ../../addon/posterous/posterous.php:189
+#: ../../addon.old/drpost/drpost.php:184 ../../addon.old/wppost/wppost.php:201
+#: ../../addon.old/blogger/blogger.php:172
+#: ../../addon.old/posterous/posterous.php:189
+msgid "Post from Friendica"
+msgstr ""
+
+#: ../../addon/wppost/wppost.php:207 ../../addon.old/wppost/wppost.php:207
 msgid "Read the original post and comment stream on Friendica"
 msgstr ""
 
 #: ../../addon/showmore/showmore.php:38
+#: ../../addon.old/showmore/showmore.php:38
 msgid "\"Show more\" Settings"
 msgstr ""
 
 #: ../../addon/showmore/showmore.php:41
+#: ../../addon.old/showmore/showmore.php:41
 msgid "Enable Show More"
 msgstr ""
 
 #: ../../addon/showmore/showmore.php:44
+#: ../../addon.old/showmore/showmore.php:44
 msgid "Cutting posts after how much characters"
 msgstr ""
 
 #: ../../addon/showmore/showmore.php:65
+#: ../../addon.old/showmore/showmore.php:65
 msgid "Show More Settings saved."
 msgstr ""
 
-#: ../../addon/piwik/piwik.php:79
+#: ../../addon/piwik/piwik.php:79 ../../addon.old/piwik/piwik.php:79
 msgid ""
 "This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
 "analytics tool."
 msgstr ""
 
-#: ../../addon/piwik/piwik.php:82
+#: ../../addon/piwik/piwik.php:82 ../../addon.old/piwik/piwik.php:82
 #, php-format
 msgid ""
 "If you do not want that your visits are logged this way you <a href='%s'>can "
@@ -6834,47 +7453,47 @@ msgid ""
 "(opt-out)."
 msgstr ""
 
-#: ../../addon/piwik/piwik.php:90
+#: ../../addon/piwik/piwik.php:90 ../../addon.old/piwik/piwik.php:90
 msgid "Piwik Base URL"
 msgstr ""
 
-#: ../../addon/piwik/piwik.php:90
+#: ../../addon/piwik/piwik.php:90 ../../addon.old/piwik/piwik.php:90
 msgid ""
 "Absolute path to your Piwik installation. (without protocol (http/s), with "
 "trailing slash)"
 msgstr ""
 
-#: ../../addon/piwik/piwik.php:91
+#: ../../addon/piwik/piwik.php:91 ../../addon.old/piwik/piwik.php:91
 msgid "Site ID"
 msgstr ""
 
-#: ../../addon/piwik/piwik.php:92
+#: ../../addon/piwik/piwik.php:92 ../../addon.old/piwik/piwik.php:92
 msgid "Show opt-out cookie link?"
 msgstr ""
 
-#: ../../addon/piwik/piwik.php:93
+#: ../../addon/piwik/piwik.php:93 ../../addon.old/piwik/piwik.php:93
 msgid "Asynchronous tracking"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:73
+#: ../../addon/twitter/twitter.php:73 ../../addon.old/twitter/twitter.php:73
 msgid "Post to Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:122
+#: ../../addon/twitter/twitter.php:122 ../../addon.old/twitter/twitter.php:122
 msgid "Twitter settings updated."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:146
+#: ../../addon/twitter/twitter.php:146 ../../addon.old/twitter/twitter.php:146
 msgid "Twitter Posting Settings"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:153
+#: ../../addon/twitter/twitter.php:153 ../../addon.old/twitter/twitter.php:153
 msgid ""
 "No consumer key pair for Twitter found. Please contact your site "
 "administrator."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:172
+#: ../../addon/twitter/twitter.php:172 ../../addon.old/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 "
@@ -6883,22 +7502,22 @@ msgid ""
 "be posted to Twitter."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:173
+#: ../../addon/twitter/twitter.php:173 ../../addon.old/twitter/twitter.php:173
 msgid "Log in with Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:175
+#: ../../addon/twitter/twitter.php:175 ../../addon.old/twitter/twitter.php:175
 msgid "Copy the PIN from Twitter here"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:190
+#: ../../addon/twitter/twitter.php:190 ../../addon.old/twitter/twitter.php:190
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated Twitter account. You can choose to do so by default (here) or for "
 "every posting separately in the posting options when writing the entry."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:192
+#: ../../addon/twitter/twitter.php:192 ../../addon.old/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 "
@@ -6906,129 +7525,137 @@ msgid ""
 "the visitor that the access to your profile has been restricted."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:195
+#: ../../addon/twitter/twitter.php:195 ../../addon.old/twitter/twitter.php:195
 msgid "Allow posting to Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:198
+#: ../../addon/twitter/twitter.php:198 ../../addon.old/twitter/twitter.php:198
 msgid "Send public postings to Twitter by default"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:201
+#: ../../addon/twitter/twitter.php:201 ../../addon.old/twitter/twitter.php:201
 msgid "Send linked #-tags and @-names to Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:396
+#: ../../addon/twitter/twitter.php:508 ../../addon.old/twitter/twitter.php:396
 msgid "Consumer key"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:397
+#: ../../addon/twitter/twitter.php:509 ../../addon.old/twitter/twitter.php:397
 msgid "Consumer secret"
 msgstr ""
 
-#: ../../addon/irc/irc.php:44
+#: ../../addon/irc/irc.php:44 ../../addon.old/irc/irc.php:44
 msgid "IRC Settings"
 msgstr ""
 
-#: ../../addon/irc/irc.php:46
+#: ../../addon/irc/irc.php:46 ../../addon.old/irc/irc.php:46
 msgid "Channel(s) to auto connect (comma separated)"
 msgstr ""
 
-#: ../../addon/irc/irc.php:51
+#: ../../addon/irc/irc.php:51 ../../addon.old/irc/irc.php:51
 msgid "Popular Channels (comma separated)"
 msgstr ""
 
-#: ../../addon/irc/irc.php:69
+#: ../../addon/irc/irc.php:69 ../../addon.old/irc/irc.php:69
 msgid "IRC settings saved."
 msgstr ""
 
-#: ../../addon/irc/irc.php:74
+#: ../../addon/irc/irc.php:74 ../../addon.old/irc/irc.php:74
 msgid "IRC Chatroom"
 msgstr ""
 
-#: ../../addon/irc/irc.php:96
+#: ../../addon/irc/irc.php:96 ../../addon.old/irc/irc.php:96
 msgid "Popular Channels"
 msgstr ""
 
-#: ../../addon/fromapp/fromapp.php:38
+#: ../../addon/fromapp/fromapp.php:38 ../../addon.old/fromapp/fromapp.php:38
 msgid "Fromapp settings updated."
 msgstr ""
 
-#: ../../addon/fromapp/fromapp.php:64
+#: ../../addon/fromapp/fromapp.php:64 ../../addon.old/fromapp/fromapp.php:64
 msgid "FromApp Settings"
 msgstr ""
 
-#: ../../addon/fromapp/fromapp.php:66
+#: ../../addon/fromapp/fromapp.php:66 ../../addon.old/fromapp/fromapp.php:66
 msgid ""
 "The application name you would like to show your posts originating from."
 msgstr ""
 
-#: ../../addon/fromapp/fromapp.php:70
+#: ../../addon/fromapp/fromapp.php:70 ../../addon.old/fromapp/fromapp.php:70
 msgid "Use this application name even if another application was used."
 msgstr ""
 
-#: ../../addon/blogger/blogger.php:42
+#: ../../addon/blogger/blogger.php:42 ../../addon.old/blogger/blogger.php:42
 msgid "Post to blogger"
 msgstr ""
 
-#: ../../addon/blogger/blogger.php:74
+#: ../../addon/blogger/blogger.php:74 ../../addon.old/blogger/blogger.php:74
 msgid "Blogger Post Settings"
 msgstr ""
 
-#: ../../addon/blogger/blogger.php:76
+#: ../../addon/blogger/blogger.php:76 ../../addon.old/blogger/blogger.php:76
 msgid "Enable Blogger Post Plugin"
 msgstr ""
 
-#: ../../addon/blogger/blogger.php:81
+#: ../../addon/blogger/blogger.php:81 ../../addon.old/blogger/blogger.php:81
 msgid "Blogger username"
 msgstr ""
 
-#: ../../addon/blogger/blogger.php:86
+#: ../../addon/blogger/blogger.php:86 ../../addon.old/blogger/blogger.php:86
 msgid "Blogger password"
 msgstr ""
 
-#: ../../addon/blogger/blogger.php:91
+#: ../../addon/blogger/blogger.php:91 ../../addon.old/blogger/blogger.php:91
 msgid "Blogger API URL"
 msgstr ""
 
-#: ../../addon/blogger/blogger.php:96
+#: ../../addon/blogger/blogger.php:96 ../../addon.old/blogger/blogger.php:96
 msgid "Post to Blogger by default"
 msgstr ""
 
 #: ../../addon/posterous/posterous.php:37
+#: ../../addon.old/posterous/posterous.php:37
 msgid "Post to Posterous"
 msgstr ""
 
 #: ../../addon/posterous/posterous.php:70
+#: ../../addon.old/posterous/posterous.php:70
 msgid "Posterous Post Settings"
 msgstr ""
 
 #: ../../addon/posterous/posterous.php:72
+#: ../../addon.old/posterous/posterous.php:72
 msgid "Enable Posterous Post Plugin"
 msgstr ""
 
 #: ../../addon/posterous/posterous.php:77
+#: ../../addon.old/posterous/posterous.php:77
 msgid "Posterous login"
 msgstr ""
 
 #: ../../addon/posterous/posterous.php:82
+#: ../../addon.old/posterous/posterous.php:82
 msgid "Posterous password"
 msgstr ""
 
 #: ../../addon/posterous/posterous.php:87
+#: ../../addon.old/posterous/posterous.php:87
 msgid "Posterous site ID"
 msgstr ""
 
 #: ../../addon/posterous/posterous.php:92
+#: ../../addon.old/posterous/posterous.php:92
 msgid "Posterous API token"
 msgstr ""
 
 #: ../../addon/posterous/posterous.php:97
+#: ../../addon.old/posterous/posterous.php:97
 msgid "Post to Posterous by default"
 msgstr ""
 
 #: ../../view/theme/cleanzero/config.php:82
-#: ../../view/theme/diabook/config.php:192
+#: ../../view/theme/diabook/config.php:154
 #: ../../view/theme/quattro/config.php:66 ../../view/theme/dispy/config.php:72
 msgid "Theme settings"
 msgstr ""
@@ -7038,7 +7665,7 @@ msgid "Set resize level for images in posts and comments (width and height)"
 msgstr ""
 
 #: ../../view/theme/cleanzero/config.php:84
-#: ../../view/theme/diabook/config.php:193
+#: ../../view/theme/diabook/config.php:155
 #: ../../view/theme/dispy/config.php:73
 msgid "Set font-size for posts and comments"
 msgstr ""
@@ -7052,174 +7679,158 @@ msgstr ""
 msgid "Color scheme"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:127 ../../include/nav.php:49
-#: ../../include/nav.php:115
+#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49
+#: ../../include/nav.php:116
 msgid "Your posts and conversations"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:128 ../../include/nav.php:50
+#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:50
 msgid "Your profile page"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:129
+#: ../../view/theme/diabook/theme.php:89
 msgid "Your contacts"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:130 ../../include/nav.php:51
+#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51
 msgid "Your photos"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:131 ../../include/nav.php:52
+#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:52
 msgid "Your events"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:132 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53
 msgid "Personal notes"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:132 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53
 msgid "Your personal photos"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:134
-#: ../../view/theme/diabook/theme.php:643
-#: ../../view/theme/diabook/theme.php:747
-#: ../../view/theme/diabook/config.php:201
+#: ../../view/theme/diabook/theme.php:94
+#: ../../view/theme/diabook/theme.php:537
+#: ../../view/theme/diabook/theme.php:632
+#: ../../view/theme/diabook/config.php:163
 msgid "Community Pages"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:490
-#: ../../view/theme/diabook/theme.php:749
-#: ../../view/theme/diabook/config.php:203
+#: ../../view/theme/diabook/theme.php:384
+#: ../../view/theme/diabook/theme.php:634
+#: ../../view/theme/diabook/config.php:165
 msgid "Community Profiles"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:511
-#: ../../view/theme/diabook/theme.php:754
-#: ../../view/theme/diabook/config.php:208
+#: ../../view/theme/diabook/theme.php:405
+#: ../../view/theme/diabook/theme.php:639
+#: ../../view/theme/diabook/config.php:170
 msgid "Last users"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:540
-#: ../../view/theme/diabook/theme.php:756
-#: ../../view/theme/diabook/config.php:210
+#: ../../view/theme/diabook/theme.php:434
+#: ../../view/theme/diabook/theme.php:641
+#: ../../view/theme/diabook/config.php:172
 msgid "Last likes"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:585
-#: ../../view/theme/diabook/theme.php:755
-#: ../../view/theme/diabook/config.php:209
+#: ../../view/theme/diabook/theme.php:479
+#: ../../view/theme/diabook/theme.php:640
+#: ../../view/theme/diabook/config.php:171
 msgid "Last photos"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:622
-#: ../../view/theme/diabook/theme.php:752
-#: ../../view/theme/diabook/config.php:206
+#: ../../view/theme/diabook/theme.php:516
+#: ../../view/theme/diabook/theme.php:637
+#: ../../view/theme/diabook/config.php:168
 msgid "Find Friends"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:623
+#: ../../view/theme/diabook/theme.php:517
 msgid "Local Directory"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:625 ../../include/contact_widgets.php:35
+#: ../../view/theme/diabook/theme.php:519 ../../include/contact_widgets.php:35
 msgid "Similar Interests"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:627 ../../include/contact_widgets.php:37
+#: ../../view/theme/diabook/theme.php:521 ../../include/contact_widgets.php:37
 msgid "Invite Friends"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:678
-#: ../../view/theme/diabook/theme.php:748
-#: ../../view/theme/diabook/config.php:202
+#: ../../view/theme/diabook/theme.php:572
+#: ../../view/theme/diabook/theme.php:633
+#: ../../view/theme/diabook/config.php:164
 msgid "Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:683
+#: ../../view/theme/diabook/theme.php:577
 msgid "Set zoomfactor for Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:684
-#: ../../view/theme/diabook/config.php:199
+#: ../../view/theme/diabook/theme.php:578
+#: ../../view/theme/diabook/config.php:161
 msgid "Set longitude (X) for Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:685
-#: ../../view/theme/diabook/config.php:200
+#: ../../view/theme/diabook/theme.php:579
+#: ../../view/theme/diabook/config.php:162
 msgid "Set latitude (Y) for Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:698
-#: ../../view/theme/diabook/theme.php:750
-#: ../../view/theme/diabook/config.php:204
+#: ../../view/theme/diabook/theme.php:592
+#: ../../view/theme/diabook/theme.php:635
+#: ../../view/theme/diabook/config.php:166
 msgid "Help or @NewHere ?"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:705
-#: ../../view/theme/diabook/theme.php:751
-#: ../../view/theme/diabook/config.php:205
+#: ../../view/theme/diabook/theme.php:599
+#: ../../view/theme/diabook/theme.php:636
+#: ../../view/theme/diabook/config.php:167
 msgid "Connect Services"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:712
-#: ../../view/theme/diabook/theme.php:753
+#: ../../view/theme/diabook/theme.php:606
+#: ../../view/theme/diabook/theme.php:638
 msgid "Last Tweets"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:715
-#: ../../view/theme/diabook/config.php:197
+#: ../../view/theme/diabook/theme.php:609
+#: ../../view/theme/diabook/config.php:159
 msgid "Set twitter search term"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:735
-#: ../../view/theme/diabook/theme.php:736
-#: ../../view/theme/diabook/theme.php:737
-#: ../../view/theme/diabook/theme.php:738
-#: ../../view/theme/diabook/theme.php:739
-#: ../../view/theme/diabook/theme.php:740
-#: ../../view/theme/diabook/theme.php:741
-#: ../../view/theme/diabook/theme.php:742
-#: ../../view/theme/diabook/theme.php:743
-#: ../../view/theme/diabook/theme.php:744 ../../include/acl_selectors.php:288
+#: ../../view/theme/diabook/theme.php:629
+#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:288
 msgid "don't show"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:735
-#: ../../view/theme/diabook/theme.php:736
-#: ../../view/theme/diabook/theme.php:737
-#: ../../view/theme/diabook/theme.php:738
-#: ../../view/theme/diabook/theme.php:739
-#: ../../view/theme/diabook/theme.php:740
-#: ../../view/theme/diabook/theme.php:741
-#: ../../view/theme/diabook/theme.php:742
-#: ../../view/theme/diabook/theme.php:743
-#: ../../view/theme/diabook/theme.php:744 ../../include/acl_selectors.php:287
+#: ../../view/theme/diabook/theme.php:629
+#: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:287
 msgid "show"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:745
+#: ../../view/theme/diabook/theme.php:630
 msgid "Show/hide boxes at right-hand column:"
 msgstr ""
 
-#: ../../view/theme/diabook/config.php:194
+#: ../../view/theme/diabook/config.php:156
 #: ../../view/theme/dispy/config.php:74
 msgid "Set line-height for posts and comments"
 msgstr ""
 
-#: ../../view/theme/diabook/config.php:195
+#: ../../view/theme/diabook/config.php:157
 msgid "Set resolution for middle column"
 msgstr ""
 
-#: ../../view/theme/diabook/config.php:196
+#: ../../view/theme/diabook/config.php:158
 msgid "Set color scheme"
 msgstr ""
 
-#: ../../view/theme/diabook/config.php:198
+#: ../../view/theme/diabook/config.php:160
 msgid "Set zoomfactor for Earth Layer"
 msgstr ""
 
-#: ../../view/theme/diabook/config.php:207
+#: ../../view/theme/diabook/config.php:169
 msgid "Last tweets"
 msgstr ""
 
@@ -7372,6 +7983,10 @@ msgstr ""
 msgid "MySpace"
 msgstr ""
 
+#: ../../include/contact_selectors.php:87
+msgid "Google+"
+msgstr ""
+
 #: ../../include/profile_selectors.php:6
 msgid "Male"
 msgstr ""
@@ -7613,7 +8228,7 @@ msgstr ""
 msgid "Finishes:"
 msgstr ""
 
-#: ../../include/delivery.php:457 ../../include/notifier.php:703
+#: ../../include/delivery.php:457 ../../include/notifier.php:771
 msgid "(no subject)"
 msgstr ""
 
@@ -7645,218 +8260,218 @@ msgstr ""
 msgid "older"
 msgstr ""
 
-#: ../../include/text.php:597
+#: ../../include/text.php:604
 msgid "No contacts"
 msgstr ""
 
-#: ../../include/text.php:606
+#: ../../include/text.php:613
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/text.php:719
+#: ../../include/text.php:726
 msgid "poke"
 msgstr ""
 
-#: ../../include/text.php:719 ../../include/conversation.php:210
+#: ../../include/text.php:726 ../../include/conversation.php:210
 msgid "poked"
 msgstr ""
 
-#: ../../include/text.php:720
+#: ../../include/text.php:727
 msgid "ping"
 msgstr ""
 
-#: ../../include/text.php:720
+#: ../../include/text.php:727
 msgid "pinged"
 msgstr ""
 
-#: ../../include/text.php:721
+#: ../../include/text.php:728
 msgid "prod"
 msgstr ""
 
-#: ../../include/text.php:721
+#: ../../include/text.php:728
 msgid "prodded"
 msgstr ""
 
-#: ../../include/text.php:722
+#: ../../include/text.php:729
 msgid "slap"
 msgstr ""
 
-#: ../../include/text.php:722
+#: ../../include/text.php:729
 msgid "slapped"
 msgstr ""
 
-#: ../../include/text.php:723
+#: ../../include/text.php:730
 msgid "finger"
 msgstr ""
 
-#: ../../include/text.php:723
+#: ../../include/text.php:730
 msgid "fingered"
 msgstr ""
 
-#: ../../include/text.php:724
+#: ../../include/text.php:731
 msgid "rebuff"
 msgstr ""
 
-#: ../../include/text.php:724
+#: ../../include/text.php:731
 msgid "rebuffed"
 msgstr ""
 
-#: ../../include/text.php:736
+#: ../../include/text.php:743
 msgid "happy"
 msgstr ""
 
-#: ../../include/text.php:737
+#: ../../include/text.php:744
 msgid "sad"
 msgstr ""
 
-#: ../../include/text.php:738
+#: ../../include/text.php:745
 msgid "mellow"
 msgstr ""
 
-#: ../../include/text.php:739
+#: ../../include/text.php:746
 msgid "tired"
 msgstr ""
 
-#: ../../include/text.php:740
+#: ../../include/text.php:747
 msgid "perky"
 msgstr ""
 
-#: ../../include/text.php:741
+#: ../../include/text.php:748
 msgid "angry"
 msgstr ""
 
-#: ../../include/text.php:742
+#: ../../include/text.php:749
 msgid "stupified"
 msgstr ""
 
-#: ../../include/text.php:743
+#: ../../include/text.php:750
 msgid "puzzled"
 msgstr ""
 
-#: ../../include/text.php:744
+#: ../../include/text.php:751
 msgid "interested"
 msgstr ""
 
-#: ../../include/text.php:745
+#: ../../include/text.php:752
 msgid "bitter"
 msgstr ""
 
-#: ../../include/text.php:746
+#: ../../include/text.php:753
 msgid "cheerful"
 msgstr ""
 
-#: ../../include/text.php:747
+#: ../../include/text.php:754
 msgid "alive"
 msgstr ""
 
-#: ../../include/text.php:748
+#: ../../include/text.php:755
 msgid "annoyed"
 msgstr ""
 
-#: ../../include/text.php:749
+#: ../../include/text.php:756
 msgid "anxious"
 msgstr ""
 
-#: ../../include/text.php:750
+#: ../../include/text.php:757
 msgid "cranky"
 msgstr ""
 
-#: ../../include/text.php:751
+#: ../../include/text.php:758
 msgid "disturbed"
 msgstr ""
 
-#: ../../include/text.php:752
+#: ../../include/text.php:759
 msgid "frustrated"
 msgstr ""
 
-#: ../../include/text.php:753
+#: ../../include/text.php:760
 msgid "motivated"
 msgstr ""
 
-#: ../../include/text.php:754
+#: ../../include/text.php:761
 msgid "relaxed"
 msgstr ""
 
-#: ../../include/text.php:755
+#: ../../include/text.php:762
 msgid "surprised"
 msgstr ""
 
-#: ../../include/text.php:921
+#: ../../include/text.php:926
 msgid "January"
 msgstr ""
 
-#: ../../include/text.php:921
+#: ../../include/text.php:926
 msgid "February"
 msgstr ""
 
-#: ../../include/text.php:921
+#: ../../include/text.php:926
 msgid "March"
 msgstr ""
 
-#: ../../include/text.php:921
+#: ../../include/text.php:926
 msgid "April"
 msgstr ""
 
-#: ../../include/text.php:921
+#: ../../include/text.php:926
 msgid "May"
 msgstr ""
 
-#: ../../include/text.php:921
+#: ../../include/text.php:926
 msgid "June"
 msgstr ""
 
-#: ../../include/text.php:921
+#: ../../include/text.php:926
 msgid "July"
 msgstr ""
 
-#: ../../include/text.php:921
+#: ../../include/text.php:926
 msgid "August"
 msgstr ""
 
-#: ../../include/text.php:921
+#: ../../include/text.php:926
 msgid "September"
 msgstr ""
 
-#: ../../include/text.php:921
+#: ../../include/text.php:926
 msgid "October"
 msgstr ""
 
-#: ../../include/text.php:921
+#: ../../include/text.php:926
 msgid "November"
 msgstr ""
 
-#: ../../include/text.php:921
+#: ../../include/text.php:926
 msgid "December"
 msgstr ""
 
-#: ../../include/text.php:1007
+#: ../../include/text.php:1010
 msgid "bytes"
 msgstr ""
 
-#: ../../include/text.php:1034 ../../include/text.php:1046
+#: ../../include/text.php:1037 ../../include/text.php:1049
 msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/text.php:1219 ../../include/user.php:236
+#: ../../include/text.php:1222 ../../include/user.php:236
 msgid "default"
 msgstr ""
 
-#: ../../include/text.php:1231
+#: ../../include/text.php:1234
 msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/text.php:1441
+#: ../../include/text.php:1444
 msgid "activity"
 msgstr ""
 
-#: ../../include/text.php:1444
+#: ../../include/text.php:1447
 msgid "post"
 msgstr ""
 
-#: ../../include/text.php:1599
+#: ../../include/text.php:1602
 msgid "Item filed"
 msgstr ""
 
@@ -7864,11 +8479,11 @@ msgstr ""
 msgid "Sharing notification from Diaspora network"
 msgstr ""
 
-#: ../../include/diaspora.php:2222
+#: ../../include/diaspora.php:2236
 msgid "Attachments:"
 msgstr ""
 
-#: ../../include/network.php:849
+#: ../../include/network.php:847
 msgid "view full size"
 msgstr ""
 
@@ -7880,6 +8495,46 @@ msgstr ""
 msgid "Embedding disabled"
 msgstr ""
 
+#: ../../include/uimport.php:61
+msgid "Error decoding account file"
+msgstr ""
+
+#: ../../include/uimport.php:67
+msgid "Error! No version data in file! This is not a Friendica account file?"
+msgstr ""
+
+#: ../../include/uimport.php:72
+msgid "Error! I can't import this file: DB schema version is not compatible."
+msgstr ""
+
+#: ../../include/uimport.php:81
+msgid "Error! Cannot check nickname"
+msgstr ""
+
+#: ../../include/uimport.php:85
+#, php-format
+msgid "User '%s' already exists on this server!"
+msgstr ""
+
+#: ../../include/uimport.php:104
+msgid "User creation error"
+msgstr ""
+
+#: ../../include/uimport.php:122
+msgid "User profile creation error"
+msgstr ""
+
+#: ../../include/uimport.php:167
+#, php-format
+msgid "%d contact not imported"
+msgid_plural "%d contacts not imported"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/uimport.php:245
+msgid "Done. You can now login with your username and password"
+msgstr ""
+
 #: ../../include/group.php:25
 msgid ""
 "A deleted group with this name was revived. Existing item permissions "
@@ -7911,7 +8566,7 @@ msgstr ""
 msgid "Contacts not in any group"
 msgstr ""
 
-#: ../../include/nav.php:46 ../../boot.php:921
+#: ../../include/nav.php:46 ../../boot.php:948
 msgid "Logout"
 msgstr ""
 
@@ -7919,7 +8574,7 @@ msgstr ""
 msgid "End this session"
 msgstr ""
 
-#: ../../include/nav.php:49 ../../boot.php:1676
+#: ../../include/nav.php:49 ../../boot.php:1724
 msgid "Status"
 msgstr ""
 
@@ -7967,55 +8622,63 @@ msgstr ""
 msgid "Conversations from your friends"
 msgstr ""
 
-#: ../../include/nav.php:121
+#: ../../include/nav.php:114
+msgid "Network Reset"
+msgstr ""
+
+#: ../../include/nav.php:114
+msgid "Load Network page with no filters"
+msgstr ""
+
+#: ../../include/nav.php:122
 msgid "Friend Requests"
 msgstr ""
 
-#: ../../include/nav.php:123
+#: ../../include/nav.php:124
 msgid "See all notifications"
 msgstr ""
 
-#: ../../include/nav.php:124
+#: ../../include/nav.php:125
 msgid "Mark all system notifications seen"
 msgstr ""
 
-#: ../../include/nav.php:128
+#: ../../include/nav.php:129
 msgid "Private mail"
 msgstr ""
 
-#: ../../include/nav.php:129
+#: ../../include/nav.php:130
 msgid "Inbox"
 msgstr ""
 
-#: ../../include/nav.php:130
+#: ../../include/nav.php:131
 msgid "Outbox"
 msgstr ""
 
-#: ../../include/nav.php:134
+#: ../../include/nav.php:135
 msgid "Manage"
 msgstr ""
 
-#: ../../include/nav.php:134
+#: ../../include/nav.php:135
 msgid "Manage other pages"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../boot.php:1196
+#: ../../include/nav.php:140 ../../boot.php:1238
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../boot.php:1196
-msgid "Manage/edit profiles"
+#: ../../include/nav.php:140
+msgid "Manage/Edit Profiles"
 msgstr ""
 
-#: ../../include/nav.php:139
+#: ../../include/nav.php:142
 msgid "Manage/edit friends and contacts"
 msgstr ""
 
-#: ../../include/nav.php:146
+#: ../../include/nav.php:149
 msgid "Site setup and configuration"
 msgstr ""
 
-#: ../../include/nav.php:170
+#: ../../include/nav.php:173
 msgid "Nothing new here"
 msgstr ""
 
@@ -8058,37 +8721,37 @@ msgstr ""
 msgid "Random Profile"
 msgstr ""
 
-#: ../../include/contact_widgets.php:68
+#: ../../include/contact_widgets.php:70
 msgid "Networks"
 msgstr ""
 
-#: ../../include/contact_widgets.php:71
+#: ../../include/contact_widgets.php:73
 msgid "All Networks"
 msgstr ""
 
-#: ../../include/contact_widgets.php:98
+#: ../../include/contact_widgets.php:103 ../../include/features.php:59
 msgid "Saved Folders"
 msgstr ""
 
-#: ../../include/contact_widgets.php:101 ../../include/contact_widgets.php:129
+#: ../../include/contact_widgets.php:106 ../../include/contact_widgets.php:138
 msgid "Everything"
 msgstr ""
 
-#: ../../include/contact_widgets.php:126
+#: ../../include/contact_widgets.php:135
 msgid "Categories"
 msgstr ""
 
-#: ../../include/auth.php:35
+#: ../../include/auth.php:36
 msgid "Logged out."
 msgstr ""
 
-#: ../../include/auth.php:114
+#: ../../include/auth.php:126
 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:114
+#: ../../include/auth.php:126
 msgid "The error message was:"
 msgstr ""
 
@@ -8149,38 +8812,186 @@ msgstr ""
 msgid "%1$d %2$s ago"
 msgstr ""
 
-#: ../../include/datetime.php:472 ../../include/items.php:1688
+#: ../../include/datetime.php:472 ../../include/items.php:1695
 #, php-format
 msgid "%s's birthday"
 msgstr ""
 
-#: ../../include/datetime.php:473 ../../include/items.php:1689
+#: ../../include/datetime.php:473 ../../include/items.php:1696
 #, php-format
 msgid "Happy Birthday %s"
 msgstr ""
 
-#: ../../include/onepoll.php:409
+#: ../../include/onepoll.php:421
 msgid "From: "
 msgstr ""
 
-#: ../../include/bbcode.php:185 ../../include/bbcode.php:406
+#: ../../include/bbcode.php:202 ../../include/bbcode.php:423
 msgid "Image/photo"
 msgstr ""
 
-#: ../../include/bbcode.php:371 ../../include/bbcode.php:391
+#: ../../include/bbcode.php:388 ../../include/bbcode.php:408
 msgid "$1 wrote:"
 msgstr ""
 
-#: ../../include/bbcode.php:410 ../../include/bbcode.php:411
+#: ../../include/bbcode.php:427 ../../include/bbcode.php:428
 msgid "Encrypted content"
 msgstr ""
 
+#: ../../include/features.php:23
+msgid "General Features"
+msgstr ""
+
+#: ../../include/features.php:25
+msgid "Multiple Profiles"
+msgstr ""
+
+#: ../../include/features.php:25
+msgid "Ability to create multiple profiles"
+msgstr ""
+
+#: ../../include/features.php:30
+msgid "Post Composition Features"
+msgstr ""
+
+#: ../../include/features.php:31
+msgid "Richtext Editor"
+msgstr ""
+
+#: ../../include/features.php:31
+msgid "Enable richtext editor"
+msgstr ""
+
+#: ../../include/features.php:32
+msgid "Post Preview"
+msgstr ""
+
+#: ../../include/features.php:32
+msgid "Allow previewing posts and comments before publishing them"
+msgstr ""
+
+#: ../../include/features.php:37
+msgid "Network Sidebar Widgets"
+msgstr ""
+
+#: ../../include/features.php:38
+msgid "Search by Date"
+msgstr ""
+
+#: ../../include/features.php:38
+msgid "Ability to select posts by date ranges"
+msgstr ""
+
+#: ../../include/features.php:39
+msgid "Group Filter"
+msgstr ""
+
+#: ../../include/features.php:39
+msgid "Enable widget to display Network posts only from selected group"
+msgstr ""
+
+#: ../../include/features.php:40
+msgid "Network Filter"
+msgstr ""
+
+#: ../../include/features.php:40
+msgid "Enable widget to display Network posts only from selected network"
+msgstr ""
+
+#: ../../include/features.php:41
+msgid "Save search terms for re-use"
+msgstr ""
+
+#: ../../include/features.php:46
+msgid "Network Tabs"
+msgstr ""
+
+#: ../../include/features.php:47
+msgid "Network Personal Tab"
+msgstr ""
+
+#: ../../include/features.php:47
+msgid "Enable tab to display only Network posts that you've interacted on"
+msgstr ""
+
+#: ../../include/features.php:48
+msgid "Network New Tab"
+msgstr ""
+
+#: ../../include/features.php:48
+msgid "Enable tab to display only new Network posts (from the last 12 hours)"
+msgstr ""
+
+#: ../../include/features.php:49
+msgid "Network Shared Links Tab"
+msgstr ""
+
+#: ../../include/features.php:49
+msgid "Enable tab to display only Network posts with links in them"
+msgstr ""
+
+#: ../../include/features.php:54
+msgid "Post/Comment Tools"
+msgstr ""
+
+#: ../../include/features.php:55
+msgid "Multiple Deletion"
+msgstr ""
+
+#: ../../include/features.php:55
+msgid "Select and delete multiple posts/comments at once"
+msgstr ""
+
+#: ../../include/features.php:56
+msgid "Edit Sent Posts"
+msgstr ""
+
+#: ../../include/features.php:56
+msgid "Edit and correct posts and comments after sending"
+msgstr ""
+
+#: ../../include/features.php:57
+msgid "Tagging"
+msgstr ""
+
+#: ../../include/features.php:57
+msgid "Ability to tag existing posts"
+msgstr ""
+
+#: ../../include/features.php:58
+msgid "Post Categories"
+msgstr ""
+
+#: ../../include/features.php:58
+msgid "Add categories to your posts"
+msgstr ""
+
+#: ../../include/features.php:59
+msgid "Ability to file posts under folders"
+msgstr ""
+
+#: ../../include/features.php:60
+msgid "Dislike Posts"
+msgstr ""
+
+#: ../../include/features.php:60
+msgid "Ability to dislike posts/comments"
+msgstr ""
+
+#: ../../include/features.php:61
+msgid "Star Posts"
+msgstr ""
+
+#: ../../include/features.php:61
+msgid "Ability to mark special posts with a star indicator"
+msgstr ""
+
 #: ../../include/dba.php:41
 #, php-format
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: ../../include/message.php:15 ../../include/message.php:171
+#: ../../include/message.php:15 ../../include/message.php:172
 msgid "[no subject]"
 msgstr ""
 
@@ -8428,15 +9239,15 @@ msgstr ""
 msgid "following"
 msgstr ""
 
-#: ../../include/items.php:3299
+#: ../../include/items.php:3363
 msgid "A new person is sharing with you at "
 msgstr ""
 
-#: ../../include/items.php:3299
+#: ../../include/items.php:3363
 msgid "You have a new follower at "
 msgstr ""
 
-#: ../../include/items.php:3980
+#: ../../include/items.php:4047
 msgid "Archives"
 msgstr ""
 
@@ -8520,44 +9331,44 @@ msgstr ""
 msgid "Welcome back "
 msgstr ""
 
-#: ../../include/security.php:354
+#: ../../include/security.php:357
 msgid ""
 "The form security token was not correct. This probably happened because the "
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr ""
 
-#: ../../include/Contact.php:111
+#: ../../include/Contact.php:115
 msgid "stopped following"
 msgstr ""
 
-#: ../../include/Contact.php:220 ../../include/conversation.php:743
+#: ../../include/Contact.php:225 ../../include/conversation.php:795
 msgid "Poke"
 msgstr ""
 
-#: ../../include/Contact.php:221 ../../include/conversation.php:737
+#: ../../include/Contact.php:226 ../../include/conversation.php:789
 msgid "View Status"
 msgstr ""
 
-#: ../../include/Contact.php:222 ../../include/conversation.php:738
+#: ../../include/Contact.php:227 ../../include/conversation.php:790
 msgid "View Profile"
 msgstr ""
 
-#: ../../include/Contact.php:223 ../../include/conversation.php:739
+#: ../../include/Contact.php:228 ../../include/conversation.php:791
 msgid "View Photos"
 msgstr ""
 
-#: ../../include/Contact.php:224 ../../include/Contact.php:237
-#: ../../include/conversation.php:740
+#: ../../include/Contact.php:229 ../../include/Contact.php:242
+#: ../../include/conversation.php:792
 msgid "Network Posts"
 msgstr ""
 
-#: ../../include/Contact.php:225 ../../include/Contact.php:237
-#: ../../include/conversation.php:741
+#: ../../include/Contact.php:230 ../../include/Contact.php:242
+#: ../../include/conversation.php:793
 msgid "Edit Contact"
 msgstr ""
 
-#: ../../include/Contact.php:226 ../../include/Contact.php:237
-#: ../../include/conversation.php:742
+#: ../../include/Contact.php:231 ../../include/Contact.php:242
+#: ../../include/conversation.php:794
 msgid "Send PM"
 msgstr ""
 
@@ -8575,86 +9386,90 @@ msgstr ""
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 
-#: ../../include/conversation.php:548 ../../object/Item.php:218
+#: ../../include/conversation.php:599 ../../object/Item.php:226
 msgid "Categories:"
 msgstr ""
 
-#: ../../include/conversation.php:549 ../../object/Item.php:219
+#: ../../include/conversation.php:600 ../../object/Item.php:227
 msgid "Filed under:"
 msgstr ""
 
-#: ../../include/conversation.php:633
+#: ../../include/conversation.php:685
 msgid "remove"
 msgstr ""
 
-#: ../../include/conversation.php:637
+#: ../../include/conversation.php:689
 msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/conversation.php:736
+#: ../../include/conversation.php:788
 msgid "Follow Thread"
 msgstr ""
 
-#: ../../include/conversation.php:805
+#: ../../include/conversation.php:857
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: ../../include/conversation.php:805
+#: ../../include/conversation.php:857
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/conversation.php:809
+#: ../../include/conversation.php:861
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""
 
-#: ../../include/conversation.php:811
+#: ../../include/conversation.php:863
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:817
+#: ../../include/conversation.php:869
 msgid "and"
 msgstr ""
 
-#: ../../include/conversation.php:820
+#: ../../include/conversation.php:875
 #, php-format
 msgid ", and %d other people"
 msgstr ""
 
-#: ../../include/conversation.php:821
+#: ../../include/conversation.php:877
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../include/conversation.php:821
+#: ../../include/conversation.php:877
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:845 ../../include/conversation.php:862
+#: ../../include/conversation.php:904 ../../include/conversation.php:922
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: ../../include/conversation.php:847 ../../include/conversation.php:864
+#: ../../include/conversation.php:906 ../../include/conversation.php:924
 msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:848 ../../include/conversation.php:865
+#: ../../include/conversation.php:907 ../../include/conversation.php:925
 msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:849 ../../include/conversation.php:866
+#: ../../include/conversation.php:908 ../../include/conversation.php:926
 msgid "Tag term:"
 msgstr ""
 
-#: ../../include/conversation.php:851 ../../include/conversation.php:868
+#: ../../include/conversation.php:910 ../../include/conversation.php:928
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/conversation.php:930
+#: ../../include/conversation.php:911
+msgid "Delete item(s)?"
+msgstr ""
+
+#: ../../include/conversation.php:990
 msgid "permissions"
 msgstr ""
 
@@ -8670,104 +9485,172 @@ msgstr ""
 msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: ../../boot.php:583
+#: ../../boot.php:607
 msgid "Delete this item?"
 msgstr ""
 
-#: ../../boot.php:586
+#: ../../boot.php:610
 msgid "show fewer"
 msgstr ""
 
-#: ../../boot.php:793
+#: ../../boot.php:819
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:795
+#: ../../boot.php:821
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:896
+#: ../../boot.php:922
 msgid "Create a New Account"
 msgstr ""
 
-#: ../../boot.php:924
+#: ../../boot.php:951
 msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../boot.php:925
+#: ../../boot.php:952
 msgid "Password: "
 msgstr ""
 
-#: ../../boot.php:928
+#: ../../boot.php:953
+msgid "Remember me"
+msgstr ""
+
+#: ../../boot.php:956
 msgid "Or login using OpenID: "
 msgstr ""
 
-#: ../../boot.php:934
+#: ../../boot.php:962
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:1045
+#: ../../boot.php:1087
 msgid "Requested account is not available."
 msgstr ""
 
-#: ../../boot.php:1122
+#: ../../boot.php:1164
 msgid "Edit profile"
 msgstr ""
 
-#: ../../boot.php:1188
+#: ../../boot.php:1230
 msgid "Message"
 msgstr ""
 
-#: ../../boot.php:1310 ../../boot.php:1396
+#: ../../boot.php:1238
+msgid "Manage/edit profiles"
+msgstr ""
+
+#: ../../boot.php:1352 ../../boot.php:1438
 msgid "g A l F d"
 msgstr ""
 
-#: ../../boot.php:1311 ../../boot.php:1397
+#: ../../boot.php:1353 ../../boot.php:1439
 msgid "F d"
 msgstr ""
 
-#: ../../boot.php:1356 ../../boot.php:1437
+#: ../../boot.php:1398 ../../boot.php:1479
 msgid "[today]"
 msgstr ""
 
-#: ../../boot.php:1368
+#: ../../boot.php:1410
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../boot.php:1369
+#: ../../boot.php:1411
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../boot.php:1430
+#: ../../boot.php:1472
 msgid "[No description]"
 msgstr ""
 
-#: ../../boot.php:1448
+#: ../../boot.php:1490
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../boot.php:1449
+#: ../../boot.php:1491
 msgid "Events this week:"
 msgstr ""
 
-#: ../../boot.php:1679
+#: ../../boot.php:1727
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../boot.php:1686
+#: ../../boot.php:1734
 msgid "Profile Details"
 msgstr ""
 
-#: ../../boot.php:1703
+#: ../../boot.php:1751
 msgid "Events and Calendar"
 msgstr ""
 
-#: ../../boot.php:1710
+#: ../../boot.php:1758
 msgid "Only You Can See This"
 msgstr ""
 
-#: ../../index.php:378
+#: ../../object/Item.php:238
+msgid "via"
+msgstr ""
+
+#: ../../index.php:398
 msgid "toggle mobile"
 msgstr ""
+
+#: ../../addon.old/bg/bg.php:51
+msgid "Bg settings updated."
+msgstr ""
+
+#: ../../addon.old/bg/bg.php:82
+msgid "Bg Settings"
+msgstr ""
+
+#: ../../addon.old/drpost/drpost.php:35
+msgid "Post to Drupal"
+msgstr ""
+
+#: ../../addon.old/drpost/drpost.php:72
+msgid "Drupal Post Settings"
+msgstr ""
+
+#: ../../addon.old/drpost/drpost.php:74
+msgid "Enable Drupal Post Plugin"
+msgstr ""
+
+#: ../../addon.old/drpost/drpost.php:79
+msgid "Drupal username"
+msgstr ""
+
+#: ../../addon.old/drpost/drpost.php:84
+msgid "Drupal password"
+msgstr ""
+
+#: ../../addon.old/drpost/drpost.php:89
+msgid "Post Type - article,page,or blog"
+msgstr ""
+
+#: ../../addon.old/drpost/drpost.php:94
+msgid "Drupal site URL"
+msgstr ""
+
+#: ../../addon.old/drpost/drpost.php:99
+msgid "Drupal site uses clean URLS"
+msgstr ""
+
+#: ../../addon.old/drpost/drpost.php:104
+msgid "Post to Drupal by default"
+msgstr ""
+
+#: ../../addon.old/oembed.old/oembed.php:30
+msgid "OEmbed settings updated"
+msgstr ""
+
+#: ../../addon.old/oembed.old/oembed.php:43
+msgid "Use OEmbed for YouTube videos"
+msgstr ""
+
+#: ../../addon.old/oembed.old/oembed.php:71
+msgid "URL to embed:"
+msgstr ""