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

[friendica.git] / util / messages.po

diff --git a/util/messages.po b/util/messages.po
index 6becffb1f691428a2c8c8313fbd6b70203e3a565..e6b4928aca4edca5de284eb3eb1518d4c6bd823d 100644 (file)
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
 #, fuzzy
 msgid ""
 msgstr ""

-"Project-Id-Version: 3.0.1456\n"
+"Project-Id-Version: 3.0.1503\n"

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

-"POT-Creation-Date: 2012-09-04 10:00-0700\n"
+"POT-Creation-Date: 2012-10-21 10:00-0700\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -34,31 +34,35 @@ msgstr ""
 msgid "Contact update failed."
 msgstr ""
 
 msgid "Contact update failed."
 msgstr ""
 

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

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

-#: ../../mod/api.php:31 ../../mod/photos.php:116 ../../mod/photos.php:938
+#: ../../mod/api.php:31 ../../mod/photos.php:132 ../../mod/photos.php:994

 #: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:135
 #: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:135

-#: ../../mod/notifications.php:66 ../../mod/contacts.php:139
-#: ../../mod/settings.php:86 ../../mod/settings.php:519
-#: ../../mod/settings.php:524 ../../mod/manage.php:86 ../../mod/network.php:6
+#: ../../mod/notifications.php:66 ../../mod/contacts.php:146
+#: ../../mod/settings.php:86 ../../mod/settings.php:525
+#: ../../mod/settings.php:530 ../../mod/manage.php:90 ../../mod/network.php:6

 #: ../../mod/notes.php:20 ../../mod/wallmessage.php:9
 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
 #: ../../mod/group.php:19 ../../mod/viewcontacts.php:22
 #: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:126
 #: ../../mod/item.php:142 ../../mod/mood.php:114
 #: ../../mod/notes.php:20 ../../mod/wallmessage.php:9
 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
 #: ../../mod/group.php:19 ../../mod/viewcontacts.php:22
 #: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:126
 #: ../../mod/item.php:142 ../../mod/mood.php:114

-#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:142
-#: ../../mod/profile_photo.php:153 ../../mod/profile_photo.php:166
+#: ../../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/allfriends.php:9 ../../mod/nogroup.php:25
 #: ../../mod/message.php:38 ../../mod/message.php:168
 #: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25

-#: ../../mod/wall_upload.php:53 ../../mod/follow.php:9
-#: ../../mod/display.php:131 ../../mod/profiles.php:7
-#: ../../mod/profiles.php:413 ../../mod/delegate.php:6
+#: ../../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/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510
 #: ../../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/dav/friendica/layout.fnk.php:354 ../../include/items.php:3819
-#: ../../index.php:315
+#: ../../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:319 ../../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 ""
 
 msgid "Permission denied."
 msgstr ""
 


@@ -87,8 +91,8 @@ msgstr ""
 msgid "Return to contact editor"
 msgstr ""
 
 msgid "Return to contact editor"
 msgstr ""
 

-#: ../../mod/crepair.php:148 ../../mod/settings.php:539
-#: ../../mod/settings.php:565 ../../mod/admin.php:688 ../../mod/admin.php:697
+#: ../../mod/crepair.php:148 ../../mod/settings.php:545
+#: ../../mod/settings.php:571 ../../mod/admin.php:692 ../../mod/admin.php:702

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


@@ -125,29 +129,32 @@ msgid "New photo from this URL"
 msgstr ""
 
 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
 msgstr ""
 
 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107

-#: ../../mod/events.php:439 ../../mod/photos.php:971 ../../mod/photos.php:1042
-#: ../../mod/photos.php:1285 ../../mod/photos.php:1325
-#: ../../mod/photos.php:1366 ../../mod/photos.php:1398
-#: ../../mod/install.php:246 ../../mod/install.php:284
-#: ../../mod/localtime.php:45 ../../mod/poke.php:199 ../../mod/content.php:691
-#: ../../mod/contacts.php:341 ../../mod/settings.php:537
-#: ../../mod/settings.php:691 ../../mod/settings.php:752
-#: ../../mod/settings.php:958 ../../mod/group.php:85 ../../mod/mood.php:137
-#: ../../mod/message.php:294 ../../mod/message.php:480 ../../mod/admin.php:441
-#: ../../mod/admin.php:685 ../../mod/admin.php:821 ../../mod/admin.php:1020
-#: ../../mod/admin.php:1107 ../../mod/profiles.php:583
-#: ../../mod/invite.php:119 ../../addon/fromgplus/fromgplus.php:40
+#: ../../mod/events.php:455 ../../mod/photos.php:1027
+#: ../../mod/photos.php:1103 ../../mod/photos.php:1366
+#: ../../mod/photos.php:1406 ../../mod/photos.php:1449
+#: ../../mod/photos.php:1520 ../../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

 #: ../../addon/facebook/facebook.php:619
 #: ../../addon/facebook/facebook.php:619

-#: ../../addon/snautofollow/snautofollow.php:64 ../../addon/bg/bg.php:90
-#: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93
-#: ../../addon/nsfw/nsfw.php:57 ../../addon/page/page.php:210
-#: ../../addon/planets/planets.php:158
+#: ../../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/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:169
-#: ../../addon/impressum/impressum.php:82
+#: ../../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
 #: ../../addon/openstreetmap/openstreetmap.php:70
 #: ../../addon/notimeline/notimeline.php:64 ../../addon/blockem/blockem.php:57
 #: ../../addon/qcomment/qcomment.php:61
 #: ../../addon/openstreetmap/openstreetmap.php:70


@@ -157,7 +164,7 @@ msgstr ""
 #: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84
 #: ../../addon/blackout/blackout.php:98 ../../addon/gravatar/gravatar.php:95
 #: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93
 #: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84
 #: ../../addon/blackout/blackout.php:98 ../../addon/gravatar/gravatar.php:95
 #: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93

-#: ../../addon/jappixmini/jappixmini.php:302
+#: ../../addon/jappixmini/jappixmini.php:307

 #: ../../addon/statusnet/statusnet.php:278
 #: ../../addon/statusnet/statusnet.php:292
 #: ../../addon/statusnet/statusnet.php:318
 #: ../../addon/statusnet/statusnet.php:278
 #: ../../addon/statusnet/statusnet.php:292
 #: ../../addon/statusnet/statusnet.php:318


@@ -168,13 +175,58 @@ msgstr ""
 #: ../../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/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/irc/irc.php:55 ../../addon/blogger/blogger.php:102
-#: ../../addon/posterous/posterous.php:103
+#: ../../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/cleanzero/config.php:80

-#: ../../view/theme/diabook/theme.php:757
-#: ../../view/theme/diabook/config.php:190
-#: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70
-#: ../../include/conversation.php:571
+#: ../../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 ../../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 ""
 
 msgid "Submit"
 msgstr ""
 


@@ -183,24 +235,24 @@ msgid "Help:"
 msgstr ""
 
 #: ../../mod/help.php:34 ../../addon/dav/friendica/layout.fnk.php:225
 msgstr ""
 
 #: ../../mod/help.php:34 ../../addon/dav/friendica/layout.fnk.php:225

-#: ../../include/nav.php:86
+#: ../../include/nav.php:86 ../../addon.old/dav/friendica/layout.fnk.php:225

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

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

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

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

 msgid "Page not found."
 msgstr ""
 
 msgid "Page not found."
 msgstr ""
 

-#: ../../mod/wall_attach.php:58
+#: ../../mod/wall_attach.php:69

 #, php-format
 msgid "File exceeds size limit of %d"
 msgstr ""
 
 #, php-format
 msgid "File exceeds size limit of %d"
 msgstr ""
 

-#: ../../mod/wall_attach.php:99 ../../mod/wall_attach.php:110
+#: ../../mod/wall_attach.php:110 ../../mod/wall_attach.php:121

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


@@ -221,90 +273,94 @@ msgstr ""
 msgid "Event title and start time are required."
 msgstr ""
 
 msgid "Event title and start time are required."
 msgstr ""
 

-#: ../../mod/events.php:263
+#: ../../mod/events.php:279

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

-#: ../../mod/events.php:285
+#: ../../mod/events.php:301

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

-#: ../../mod/events.php:307 ../../include/text.php:1147
+#: ../../mod/events.php:323 ../../include/text.php:1185

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

-#: ../../mod/events.php:331 ../../view/theme/diabook/theme.php:131
-#: ../../include/nav.php:52 ../../boot.php:1650
+#: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91
+#: ../../include/nav.php:52 ../../boot.php:1701

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

-#: ../../mod/events.php:332
+#: ../../mod/events.php:348

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

-#: ../../mod/events.php:333 ../../addon/dav/friendica/layout.fnk.php:263
+#: ../../mod/events.php:349 ../../addon/dav/friendica/layout.fnk.php:263
+#: ../../addon.old/dav/friendica/layout.fnk.php:263

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

-#: ../../mod/events.php:334 ../../mod/install.php:205
+#: ../../mod/events.php:350 ../../mod/install.php:205

 #: ../../addon/dav/friendica/layout.fnk.php:266
 #: ../../addon/dav/friendica/layout.fnk.php:266

+#: ../../addon.old/dav/friendica/layout.fnk.php:266

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

-#: ../../mod/events.php:407
+#: ../../mod/events.php:423

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

-#: ../../mod/events.php:417
+#: ../../mod/events.php:433

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

-#: ../../mod/events.php:418
+#: ../../mod/events.php:434

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

-#: ../../mod/events.php:420
+#: ../../mod/events.php:436

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

-#: ../../mod/events.php:420 ../../mod/events.php:434
+#: ../../mod/events.php:436 ../../mod/events.php:450

 msgid "Required"
 msgstr ""
 
 msgid "Required"
 msgstr ""
 

-#: ../../mod/events.php:423
+#: ../../mod/events.php:439

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

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

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

-#: ../../mod/events.php:428
+#: ../../mod/events.php:444

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

-#: ../../mod/events.php:430
+#: ../../mod/events.php:446

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

-#: ../../mod/events.php:432 ../../mod/directory.php:132
+#: ../../mod/events.php:448 ../../mod/directory.php:134

 #: ../../include/event.php:40 ../../include/bb2diaspora.php:412
 #: ../../include/event.php:40 ../../include/bb2diaspora.php:412

-#: ../../boot.php:1199
+#: ../../boot.php:1237

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

-#: ../../mod/events.php:434
+#: ../../mod/events.php:450

 msgid "Title:"
 msgstr ""
 
 msgid "Title:"
 msgstr ""
 

-#: ../../mod/events.php:436
+#: ../../mod/events.php:452

 msgid "Share this event"
 msgstr ""
 
 msgid "Share this event"
 msgstr ""
 

-#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/dfrn_request.php:845 ../../mod/settings.php:538
-#: ../../mod/settings.php:564 ../../addon/js_upload/js_upload.php:45
+#: ../../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:995
+#: ../../addon.old/js_upload/js_upload.php:45

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


@@ -322,10 +378,11 @@ msgstr ""
 
 #: ../../mod/tagrm.php:93 ../../mod/delegate.php:130
 #: ../../addon/dav/common/wdcal_edit.inc.php:468
 
 #: ../../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 ""
 
 msgid "Remove"
 msgstr ""
 

-#: ../../mod/dfrn_poll.php:94 ../../mod/dfrn_poll.php:522
+#: ../../mod/dfrn_poll.php:99 ../../mod/dfrn_poll.php:530

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


@@ -348,290 +405,303 @@ msgid ""
 "and/or create new posts for you?"
 msgstr ""
 
 "and/or create new posts for you?"
 msgstr ""
 

-#: ../../mod/api.php:105 ../../mod/dfrn_request.php:833
-#: ../../mod/settings.php:874 ../../mod/settings.php:880
-#: ../../mod/settings.php:888 ../../mod/settings.php:892
-#: ../../mod/settings.php:897 ../../mod/settings.php:903
-#: ../../mod/settings.php:909 ../../mod/settings.php:915
-#: ../../mod/settings.php:945 ../../mod/settings.php:946
-#: ../../mod/settings.php:947 ../../mod/settings.php:948
-#: ../../mod/settings.php:949 ../../mod/register.php:234
-#: ../../mod/profiles.php:563
+#: ../../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

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

-#: ../../mod/api.php:106 ../../mod/dfrn_request.php:834
-#: ../../mod/settings.php:874 ../../mod/settings.php:880
-#: ../../mod/settings.php:888 ../../mod/settings.php:892
-#: ../../mod/settings.php:897 ../../mod/settings.php:903
-#: ../../mod/settings.php:909 ../../mod/settings.php:915
-#: ../../mod/settings.php:945 ../../mod/settings.php:946
-#: ../../mod/settings.php:947 ../../mod/settings.php:948
-#: ../../mod/settings.php:949 ../../mod/register.php:235
-#: ../../mod/profiles.php:564
+#: ../../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

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

-#: ../../mod/photos.php:46 ../../boot.php:1643
+#: ../../mod/photos.php:50 ../../boot.php:1694

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

-#: ../../mod/photos.php:54 ../../mod/photos.php:137 ../../mod/photos.php:952
-#: ../../mod/photos.php:1034 ../../mod/photos.php:1049
-#: ../../mod/photos.php:1477 ../../mod/photos.php:1489
+#: ../../mod/photos.php:58 ../../mod/photos.php:153 ../../mod/photos.php:1008
+#: ../../mod/photos.php:1095 ../../mod/photos.php:1110
+#: ../../mod/photos.php:1562 ../../mod/photos.php:1574

 #: ../../addon/communityhome/communityhome.php:110
 #: ../../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 ""
 
 msgid "Contact Photos"
 msgstr ""
 

-#: ../../mod/photos.php:61 ../../mod/photos.php:1059 ../../mod/photos.php:1527
+#: ../../mod/photos.php:65 ../../mod/photos.php:1126 ../../mod/photos.php:1612

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

-#: ../../mod/photos.php:74 ../../mod/settings.php:23
+#: ../../mod/photos.php:78 ../../mod/settings.php:23

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

-#: ../../mod/photos.php:126
+#: ../../mod/photos.php:142

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

-#: ../../mod/photos.php:137 ../../mod/photos.php:641 ../../mod/photos.php:1034
-#: ../../mod/photos.php:1049 ../../mod/profile_photo.php:60
-#: ../../mod/profile_photo.php:67 ../../mod/profile_photo.php:74
-#: ../../mod/profile_photo.php:177 ../../mod/profile_photo.php:261
-#: ../../mod/profile_photo.php:270
+#: ../../mod/photos.php:153 ../../mod/photos.php:675 ../../mod/photos.php:1095
+#: ../../mod/photos.php:1110 ../../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
 #: ../../addon/communityhome/communityhome.php:111

-#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:318
-#: ../../include/user.php:325 ../../include/user.php:332
+#: ../../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 ""
 
 msgid "Profile Photos"
 msgstr ""
 

-#: ../../mod/photos.php:147
+#: ../../mod/photos.php:163

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

-#: ../../mod/photos.php:165 ../../mod/photos.php:1043
+#: ../../mod/photos.php:181 ../../mod/photos.php:1104

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

-#: ../../mod/photos.php:228 ../../mod/photos.php:1286
+#: ../../mod/photos.php:244 ../../mod/photos.php:1367

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

-#: ../../mod/photos.php:572
+#: ../../mod/photos.php:606

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

-#: ../../mod/photos.php:572 ../../mod/like.php:145 ../../mod/tagger.php:70
-#: ../../addon/communityhome/communityhome.php:163
-#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1399
-#: ../../include/diaspora.php:1824 ../../include/conversation.php:125
-#: ../../include/conversation.php:255
+#: ../../mod/photos.php:606 ../../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:1437
+#: ../../include/diaspora.php:1835 ../../include/conversation.php:125
+#: ../../include/conversation.php:253
+#: ../../addon.old/communityhome/communityhome.php:163

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

-#: ../../mod/photos.php:572
+#: ../../mod/photos.php:606

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

-#: ../../mod/photos.php:677 ../../addon/js_upload/js_upload.php:315
+#: ../../mod/photos.php:711 ../../addon/js_upload/js_upload.php:315
+#: ../../addon.old/js_upload/js_upload.php:315

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

-#: ../../mod/photos.php:685
+#: ../../mod/photos.php:719

 msgid "Image file is empty."
 msgstr ""
 
 msgid "Image file is empty."
 msgstr ""
 

-#: ../../mod/photos.php:717 ../../mod/profile_photo.php:126
-#: ../../mod/wall_upload.php:99
+#: ../../mod/photos.php:751 ../../mod/profile_photo.php:153
+#: ../../mod/wall_upload.php:110

 msgid "Unable to process image."
 msgstr ""
 
 msgid "Unable to process image."
 msgstr ""
 

-#: ../../mod/photos.php:744 ../../mod/profile_photo.php:266
-#: ../../mod/wall_upload.php:125
+#: ../../mod/photos.php:778 ../../mod/profile_photo.php:301
+#: ../../mod/wall_upload.php:136

 msgid "Image upload failed."
 msgstr ""
 
 msgid "Image upload failed."
 msgstr ""
 

-#: ../../mod/photos.php:830 ../../mod/community.php:16
-#: ../../mod/dfrn_request.php:759 ../../mod/viewcontacts.php:17
-#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29
+#: ../../mod/photos.php:864 ../../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

 msgid "Public access denied."
 msgstr ""
 
 msgid "Public access denied."
 msgstr ""
 

-#: ../../mod/photos.php:840
+#: ../../mod/photos.php:874

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

-#: ../../mod/photos.php:919
+#: ../../mod/photos.php:975

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

-#: ../../mod/photos.php:981
+#: ../../mod/photos.php:1037

 #, php-format
 msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
 msgstr ""
 
 #, php-format
 msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
 msgstr ""
 

-#: ../../mod/photos.php:984
+#: ../../mod/photos.php:1040

 #, php-format
 msgid "You have used %1$.2f Mbytes of photo storage."
 msgstr ""
 
 #, php-format
 msgid "You have used %1$.2f Mbytes of photo storage."
 msgstr ""
 

-#: ../../mod/photos.php:990
+#: ../../mod/photos.php:1046

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

-#: ../../mod/photos.php:994 ../../mod/photos.php:1038
+#: ../../mod/photos.php:1050 ../../mod/photos.php:1099

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

-#: ../../mod/photos.php:995
+#: ../../mod/photos.php:1051

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

-#: ../../mod/photos.php:996
+#: ../../mod/photos.php:1052

 msgid "Do not show a status post for this upload"
 msgstr ""
 
 msgid "Do not show a status post for this upload"
 msgstr ""
 

-#: ../../mod/photos.php:998 ../../mod/photos.php:1281
+#: ../../mod/photos.php:1054 ../../mod/photos.php:1362

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

-#: ../../mod/photos.php:1053
+#: ../../mod/photos.php:1114

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

-#: ../../mod/photos.php:1077 ../../mod/photos.php:1510
+#: ../../mod/photos.php:1120
+msgid "Show Newest First"
+msgstr ""
+
+#: ../../mod/photos.php:1122
+msgid "Show Oldest First"
+msgstr ""
+
+#: ../../mod/photos.php:1146 ../../mod/photos.php:1595

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

-#: ../../mod/photos.php:1112
+#: ../../mod/photos.php:1181

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

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

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

-#: ../../mod/photos.php:1164
+#: ../../mod/photos.php:1239

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

-#: ../../mod/photos.php:1164
+#: ../../mod/photos.php:1239

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

-#: ../../mod/photos.php:1165
+#: ../../mod/photos.php:1240

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

-#: ../../mod/photos.php:1171 ../../mod/content.php:601
-#: ../../include/conversation.php:406
+#: ../../mod/photos.php:1246 ../../mod/content.php:603
+#: ../../object/Item.php:103

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

-#: ../../mod/photos.php:1190
+#: ../../mod/photos.php:1265

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

-#: ../../mod/photos.php:1258
+#: ../../mod/photos.php:1339

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

-#: ../../mod/photos.php:1261
+#: ../../mod/photos.php:1342

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

-#: ../../mod/photos.php:1271
+#: ../../mod/photos.php:1352

 msgid "Rotate CW (right)"
 msgstr ""
 
 msgid "Rotate CW (right)"
 msgstr ""
 

-#: ../../mod/photos.php:1272
+#: ../../mod/photos.php:1353

 msgid "Rotate CCW (left)"
 msgstr ""
 
 msgid "Rotate CCW (left)"
 msgstr ""
 

-#: ../../mod/photos.php:1274
+#: ../../mod/photos.php:1355

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

-#: ../../mod/photos.php:1277
+#: ../../mod/photos.php:1358

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

-#: ../../mod/photos.php:1279
+#: ../../mod/photos.php:1360

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

-#: ../../mod/photos.php:1283
+#: ../../mod/photos.php:1364

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

-#: ../../mod/photos.php:1303 ../../mod/content.php:665
-#: ../../include/conversation.php:545
+#: ../../mod/photos.php:1384 ../../mod/content.php:667
+#: ../../object/Item.php:196

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

-#: ../../mod/photos.php:1304 ../../mod/content.php:666
-#: ../../include/conversation.php:546
+#: ../../mod/photos.php:1385 ../../mod/content.php:668
+#: ../../object/Item.php:197

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

-#: ../../mod/photos.php:1305 ../../include/conversation.php:1175
+#: ../../mod/photos.php:1386 ../../include/conversation.php:956

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

-#: ../../mod/photos.php:1306 ../../mod/editpost.php:112
-#: ../../mod/content.php:482 ../../mod/content.php:843
+#: ../../mod/photos.php:1387 ../../mod/editpost.php:118
+#: ../../mod/content.php:482 ../../mod/content.php:845

 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293
 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293

-#: ../../mod/message.php:481 ../../include/conversation.php:639
-#: ../../include/conversation.php:871 ../../include/conversation.php:1194
+#: ../../mod/message.php:481 ../../include/conversation.php:619
+#: ../../include/conversation.php:975 ../../object/Item.php:258

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

-#: ../../mod/photos.php:1322 ../../mod/photos.php:1363
-#: ../../mod/photos.php:1395 ../../mod/content.php:688
-#: ../../include/conversation.php:568
+#: ../../mod/photos.php:1403 ../../mod/photos.php:1446
+#: ../../mod/photos.php:1517 ../../mod/content.php:690
+#: ../../object/Item.php:555

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

-#: ../../mod/photos.php:1324 ../../mod/photos.php:1365
-#: ../../mod/photos.php:1397 ../../mod/content.php:690
-#: ../../include/conversation.php:570 ../../boot.php:574
+#: ../../mod/photos.php:1405 ../../mod/photos.php:1448
+#: ../../mod/photos.php:1519 ../../mod/content.php:692 ../../boot.php:585
+#: ../../object/Item.php:557

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

-#: ../../mod/photos.php:1326 ../../mod/editpost.php:133
-#: ../../mod/content.php:700 ../../include/conversation.php:580
-#: ../../include/conversation.php:1212
+#: ../../mod/photos.php:1407 ../../mod/photos.php:1450
+#: ../../mod/photos.php:1521 ../../mod/editpost.php:139
+#: ../../mod/content.php:702 ../../include/conversation.php:993
+#: ../../object/Item.php:567

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

-#: ../../mod/photos.php:1426 ../../mod/content.php:439
-#: ../../mod/content.php:721 ../../mod/settings.php:600
-#: ../../mod/settings.php:689 ../../mod/group.php:168 ../../mod/admin.php:692
-#: ../../include/conversation.php:420 ../../include/conversation.php:827
+#: ../../mod/photos.php:1489 ../../mod/content.php:439
+#: ../../mod/content.php:723 ../../mod/settings.php:606
+#: ../../mod/group.php:168 ../../mod/admin.php:696
+#: ../../include/conversation.php:564 ../../object/Item.php:117

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

-#: ../../mod/photos.php:1516
+#: ../../mod/photos.php:1601

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

-#: ../../mod/photos.php:1525
+#: ../../mod/photos.php:1610

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

-#: ../../mod/community.php:21
+#: ../../mod/community.php:23

 msgid "Not available."
 msgstr ""
 
 msgid "Not available."
 msgstr ""
 

-#: ../../mod/community.php:30 ../../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:61 ../../mod/community.php:86
 #: ../../include/nav.php:101
 msgid "Community"
 msgstr ""
 
 #: ../../mod/community.php:61 ../../mod/community.php:86

-#: ../../mod/search.php:146 ../../mod/search.php:172
+#: ../../mod/search.php:159 ../../mod/search.php:185

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


@@ -675,72 +745,96 @@ msgstr ""
 msgid "Edit post"
 msgstr ""
 
 msgid "Edit post"
 msgstr ""
 

-#: ../../mod/editpost.php:88 ../../include/conversation.php:1161
+#: ../../mod/editpost.php:88 ../../include/conversation.php:942

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

-#: ../../mod/editpost.php:103 ../../mod/content.php:708
-#: ../../mod/settings.php:599 ../../include/conversation.php:411
+#: ../../mod/editpost.php:103 ../../mod/content.php:710
+#: ../../mod/settings.php:605 ../../object/Item.php:107

 msgid "Edit"
 msgstr ""
 
 #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
 #: ../../mod/message.php:291 ../../mod/message.php:478
 msgid "Edit"
 msgstr ""
 
 #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
 #: ../../mod/message.php:291 ../../mod/message.php:478

-#: ../../include/conversation.php:1176
+#: ../../include/conversation.php:957

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

-#: ../../mod/editpost.php:105 ../../include/conversation.php:1178
+#: ../../mod/editpost.php:105 ../../include/conversation.php:958
+msgid "upload photo"
+msgstr ""
+
+#: ../../mod/editpost.php:106 ../../include/conversation.php:959

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

-#: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151
+#: ../../mod/editpost.php:107 ../../include/conversation.php:960
+msgid "attach file"
+msgstr ""
+
+#: ../../mod/editpost.php:108 ../../mod/wallmessage.php:151

 #: ../../mod/message.php:292 ../../mod/message.php:479
 #: ../../mod/message.php:292 ../../mod/message.php:479

-#: ../../include/conversation.php:1180
+#: ../../include/conversation.php:961

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

-#: ../../mod/editpost.php:107
-msgid "Insert YouTube video"
+#: ../../mod/editpost.php:109 ../../include/conversation.php:962
+msgid "web link"
+msgstr ""
+
+#: ../../mod/editpost.php:110 ../../include/conversation.php:963
+msgid "Insert video link"

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/editpost.php:108
-msgid "Insert Vorbis [.ogg] video"
+#: ../../mod/editpost.php:111 ../../include/conversation.php:964
+msgid "video link"

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/editpost.php:109
-msgid "Insert Vorbis [.ogg] audio"
+#: ../../mod/editpost.php:112 ../../include/conversation.php:965
+msgid "Insert audio link"

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/editpost.php:110 ../../include/conversation.php:1186
+#: ../../mod/editpost.php:113 ../../include/conversation.php:966
+msgid "audio link"
+msgstr ""
+
+#: ../../mod/editpost.php:114 ../../include/conversation.php:967

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

-#: ../../mod/editpost.php:111 ../../include/conversation.php:1188
+#: ../../mod/editpost.php:115 ../../include/conversation.php:968
+msgid "set location"
+msgstr ""
+
+#: ../../mod/editpost.php:116 ../../include/conversation.php:969

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

-#: ../../mod/editpost.php:113 ../../include/conversation.php:1195
+#: ../../mod/editpost.php:117 ../../include/conversation.php:970
+msgid "clear location"
+msgstr ""
+
+#: ../../mod/editpost.php:119 ../../include/conversation.php:976

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

-#: ../../mod/editpost.php:121 ../../include/conversation.php:1204
+#: ../../mod/editpost.php:127 ../../include/conversation.php:985

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

-#: ../../mod/editpost.php:122 ../../include/conversation.php:1205
+#: ../../mod/editpost.php:128 ../../include/conversation.php:986

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

-#: ../../mod/editpost.php:125 ../../include/conversation.php:1191
+#: ../../mod/editpost.php:131 ../../include/conversation.php:972

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

-#: ../../mod/editpost.php:127 ../../include/conversation.php:1193
+#: ../../mod/editpost.php:133 ../../include/conversation.php:974

 msgid "Categories (comma-separated list)"
 msgstr ""
 
 msgid "Categories (comma-separated list)"
 msgstr ""
 

-#: ../../mod/editpost.php:128 ../../include/conversation.php:1207
+#: ../../mod/editpost.php:134 ../../include/conversation.php:988

 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 


@@ -825,7 +919,7 @@ msgstr ""
 msgid "Disallowed profile URL."
 msgstr ""
 
 msgid "Disallowed profile URL."
 msgstr ""
 

-#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:116
+#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:123

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


@@ -861,75 +955,75 @@ msgstr ""
 msgid "Confirm"
 msgstr ""
 
 msgid "Confirm"
 msgstr ""
 

-#: ../../mod/dfrn_request.php:715 ../../include/items.php:3210
+#: ../../mod/dfrn_request.php:715 ../../include/items.php:3292

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

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

 msgid ""
 "Please enter your 'Identity Address' from one of the following supported "
 "communications networks:"
 msgstr ""
 
 msgid ""
 "Please enter your 'Identity Address' from one of the following supported "
 "communications networks:"
 msgstr ""
 

-#: ../../mod/dfrn_request.php:824
+#: ../../mod/dfrn_request.php:826

 msgid "<strike>Connect as an email follower</strike> (Coming soon)"
 msgstr ""
 
 msgid "<strike>Connect as an email follower</strike> (Coming soon)"
 msgstr ""
 

-#: ../../mod/dfrn_request.php:826
+#: ../../mod/dfrn_request.php:828

 msgid ""
 "If you are not yet a member of the free social web, <a href=\"http://dir."
 "friendica.com/siteinfo\">follow this link to find a public Friendica site "
 "and join us today</a>."
 msgstr ""
 
 msgid ""
 "If you are not yet a member of the free social web, <a href=\"http://dir."
 "friendica.com/siteinfo\">follow this link to find a public Friendica site "
 "and join us today</a>."
 msgstr ""
 

-#: ../../mod/dfrn_request.php:829
+#: ../../mod/dfrn_request.php:831

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

-#: ../../mod/dfrn_request.php:830
+#: ../../mod/dfrn_request.php:832

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

-#: ../../mod/dfrn_request.php:831
+#: ../../mod/dfrn_request.php:833

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

-#: ../../mod/dfrn_request.php:832
+#: ../../mod/dfrn_request.php:834

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

-#: ../../mod/dfrn_request.php:835
+#: ../../mod/dfrn_request.php:837

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

-#: ../../mod/dfrn_request.php:837 ../../include/contact_selectors.php:76
+#: ../../mod/dfrn_request.php:839 ../../include/contact_selectors.php:76

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

-#: ../../mod/dfrn_request.php:838
+#: ../../mod/dfrn_request.php:840

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

-#: ../../mod/dfrn_request.php:839 ../../mod/settings.php:634
+#: ../../mod/dfrn_request.php:841 ../../mod/settings.php:640

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

-#: ../../mod/dfrn_request.php:840
+#: ../../mod/dfrn_request.php:842

 #, php-format
 msgid ""
 " - please do not use this form.  Instead, enter %s into your Diaspora search "
 "bar."
 msgstr ""
 
 #, php-format
 msgid ""
 " - please do not use this form.  Instead, enter %s into your Diaspora search "
 "bar."
 msgstr ""
 

-#: ../../mod/dfrn_request.php:841
+#: ../../mod/dfrn_request.php:843

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

-#: ../../mod/dfrn_request.php:844
+#: ../../mod/dfrn_request.php:846

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


@@ -1197,7 +1291,7 @@ msgstr ""
 
 #: ../../mod/localtime.php:26
 msgid ""
 
 #: ../../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 ""
 
 "friends in unknown timezones."
 msgstr ""
 


@@ -1253,7 +1347,7 @@ msgid "is interested in:"
 msgstr ""
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
 msgstr ""
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59

-#: ../../include/contact_widgets.php:9 ../../boot.php:1143
+#: ../../include/contact_widgets.php:9 ../../boot.php:1175

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


@@ -1261,147 +1355,157 @@ msgstr ""
 msgid "No matches"
 msgstr ""
 
 msgid "No matches"
 msgstr ""
 

-#: ../../mod/lockview.php:39
+#: ../../mod/lockview.php:31 ../../mod/lockview.php:39

 msgid "Remote privacy information not available."
 msgstr ""
 
 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 ""
 
 msgid "Visible to:"
 msgstr ""
 

-#: ../../mod/content.php:119 ../../mod/network.php:436
+#: ../../mod/content.php:119 ../../mod/network.php:544

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

-#: ../../mod/content.php:130 ../../mod/network.php:447
+#: ../../mod/content.php:130 ../../mod/network.php:555

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

-#: ../../mod/content.php:134 ../../mod/network.php:451
+#: ../../mod/content.php:134 ../../mod/network.php:559

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

-#: ../../mod/content.php:438 ../../mod/content.php:720
-#: ../../include/conversation.php:419 ../../include/conversation.php:826
+#: ../../mod/content.php:438 ../../mod/content.php:722
+#: ../../include/conversation.php:563 ../../object/Item.php:116

 msgid "Select"
 msgstr ""
 
 msgid "Select"
 msgstr ""
 

-#: ../../mod/content.php:455 ../../mod/content.php:813
-#: ../../mod/content.php:814 ../../include/conversation.php:607
-#: ../../include/conversation.php:608 ../../include/conversation.php:843
+#: ../../mod/content.php:455 ../../mod/content.php:815
+#: ../../mod/content.php:816 ../../include/conversation.php:582
+#: ../../object/Item.php:227 ../../object/Item.php:228

 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 

-#: ../../mod/content.php:465 ../../mod/content.php:825
-#: ../../include/conversation.php:621 ../../include/conversation.php:854
+#: ../../mod/content.php:465 ../../mod/content.php:827
+#: ../../include/conversation.php:602 ../../object/Item.php:240

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

-#: ../../mod/content.php:480 ../../include/conversation.php:869
+#: ../../mod/content.php:480 ../../include/conversation.php:617

 msgid "View in context"
 msgstr ""
 
 msgid "View in context"
 msgstr ""
 

-#: ../../mod/content.php:586 ../../include/conversation.php:648
+#: ../../mod/content.php:586 ../../object/Item.php:277

 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""
 
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../../mod/content.php:587 ../../addon/page/page.php:76
-#: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119
-#: ../../include/contact_widgets.php:188 ../../include/conversation.php:649
-#: ../../boot.php:575
+#: ../../mod/content.php:588 ../../include/text.php:1441
+#: ../../object/Item.php:279 ../../object/Item.php:292
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] ""
+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:586
+#: ../../object/Item.php:280 ../../addon.old/page/page.php:77
+#: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119

 msgid "show more"
 msgstr ""
 
 msgid "show more"
 msgstr ""
 

-#: ../../mod/content.php:665 ../../include/conversation.php:545
+#: ../../mod/content.php:667 ../../object/Item.php:196

 msgid "like"
 msgstr ""
 
 msgid "like"
 msgstr ""
 

-#: ../../mod/content.php:666 ../../include/conversation.php:546
+#: ../../mod/content.php:668 ../../object/Item.php:197

 msgid "dislike"
 msgstr ""
 
 msgid "dislike"
 msgstr ""
 

-#: ../../mod/content.php:668 ../../include/conversation.php:548
+#: ../../mod/content.php:670 ../../object/Item.php:199

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

-#: ../../mod/content.php:668 ../../include/conversation.php:548
+#: ../../mod/content.php:670 ../../object/Item.php:199

 msgid "share"
 msgstr ""
 
 msgid "share"
 msgstr ""
 

-#: ../../mod/content.php:692 ../../include/conversation.php:572
+#: ../../mod/content.php:694 ../../object/Item.php:559

 msgid "Bold"
 msgstr ""
 
 msgid "Bold"
 msgstr ""
 

-#: ../../mod/content.php:693 ../../include/conversation.php:573
+#: ../../mod/content.php:695 ../../object/Item.php:560

 msgid "Italic"
 msgstr ""
 
 msgid "Italic"
 msgstr ""
 

-#: ../../mod/content.php:694 ../../include/conversation.php:574
+#: ../../mod/content.php:696 ../../object/Item.php:561

 msgid "Underline"
 msgstr ""
 
 msgid "Underline"
 msgstr ""
 

-#: ../../mod/content.php:695 ../../include/conversation.php:575
+#: ../../mod/content.php:697 ../../object/Item.php:562

 msgid "Quote"
 msgstr ""
 
 msgid "Quote"
 msgstr ""
 

-#: ../../mod/content.php:696 ../../include/conversation.php:576
+#: ../../mod/content.php:698 ../../object/Item.php:563

 msgid "Code"
 msgstr ""
 
 msgid "Code"
 msgstr ""
 

-#: ../../mod/content.php:697 ../../include/conversation.php:577
+#: ../../mod/content.php:699 ../../object/Item.php:564

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

-#: ../../mod/content.php:698 ../../include/conversation.php:578
+#: ../../mod/content.php:700 ../../object/Item.php:565

 msgid "Link"
 msgstr ""
 
 msgid "Link"
 msgstr ""
 

-#: ../../mod/content.php:699 ../../include/conversation.php:579
+#: ../../mod/content.php:701 ../../object/Item.php:566

 msgid "Video"
 msgstr ""
 
 msgid "Video"
 msgstr ""
 

-#: ../../mod/content.php:733 ../../include/conversation.php:509
+#: ../../mod/content.php:735 ../../object/Item.php:180

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

-#: ../../mod/content.php:734 ../../include/conversation.php:510
+#: ../../mod/content.php:736 ../../object/Item.php:181

 msgid "remove star"
 msgstr ""
 
 msgid "remove star"
 msgstr ""
 

-#: ../../mod/content.php:735 ../../include/conversation.php:511
+#: ../../mod/content.php:737 ../../object/Item.php:182

 msgid "toggle star status"
 msgstr ""
 
 msgid "toggle star status"
 msgstr ""
 

-#: ../../mod/content.php:738 ../../include/conversation.php:514
+#: ../../mod/content.php:740 ../../object/Item.php:185

 msgid "starred"
 msgstr ""
 
 msgid "starred"
 msgstr ""
 

-#: ../../mod/content.php:739 ../../include/conversation.php:515
+#: ../../mod/content.php:741 ../../object/Item.php:186

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

-#: ../../mod/content.php:743 ../../include/conversation.php:423
+#: ../../mod/content.php:745 ../../object/Item.php:120

 msgid "save to folder"
 msgstr ""
 
 msgid "save to folder"
 msgstr ""
 

-#: ../../mod/content.php:815 ../../include/conversation.php:609
+#: ../../mod/content.php:817 ../../object/Item.php:229

 msgid "to"
 msgstr ""
 
 msgid "to"
 msgstr ""
 

-#: ../../mod/content.php:816 ../../include/conversation.php:610
+#: ../../mod/content.php:818 ../../object/Item.php:230

 msgid "Wall-to-Wall"
 msgstr ""
 
 msgid "Wall-to-Wall"
 msgstr ""
 

-#: ../../mod/content.php:817 ../../include/conversation.php:611
+#: ../../mod/content.php:819 ../../object/Item.php:231

 msgid "via Wall-To-Wall:"
 msgstr ""
 
 msgid "via Wall-To-Wall:"
 msgstr ""
 

-#: ../../mod/home.php:26 ../../addon/communityhome/communityhome.php:179
+#: ../../mod/home.php:28 ../../addon/communityhome/communityhome.php:179
+#: ../../addon.old/communityhome/communityhome.php:179

 #, php-format
 msgid "Welcome to %s"
 msgstr ""
 #, php-format
 msgid "Welcome to %s"
 msgstr ""


@@ -1410,488 +1514,488 @@ msgstr ""
 msgid "Invalid request identifier."
 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 ""
 
 msgid "Discard"
 msgstr ""
 

-#: ../../mod/notifications.php:51 ../../mod/notifications.php:160
-#: ../../mod/notifications.php:206 ../../mod/contacts.php:314
-#: ../../mod/contacts.php:368
+#: ../../mod/notifications.php:51 ../../mod/notifications.php:163
+#: ../../mod/notifications.php:209 ../../mod/contacts.php:321
+#: ../../mod/contacts.php:375

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

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

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

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

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

-#: ../../mod/notifications.php:85 ../../mod/network.php:300
+#: ../../mod/notifications.php:88 ../../mod/network.php:407

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

-#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:127
+#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87

 #: ../../include/nav.php:77 ../../include/nav.php:115
 msgid "Home"
 msgstr ""
 
 #: ../../include/nav.php:77 ../../include/nav.php:115
 msgid "Home"
 msgstr ""
 

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

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

-#: ../../mod/notifications.php:100 ../../mod/message.php:176
+#: ../../mod/notifications.php:103 ../../mod/message.php:176

 #: ../../include/nav.php:128
 msgid "Messages"
 msgstr ""
 
 #: ../../include/nav.php:128
 msgid "Messages"
 msgstr ""
 

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

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

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

 msgid "Hide Ignored Requests"
 msgstr ""
 
 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 ""
 
 msgid "Notification type: "
 msgstr ""
 

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

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

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

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

-#: ../../mod/notifications.php:153 ../../mod/notifications.php:200
-#: ../../mod/contacts.php:374
+#: ../../mod/notifications.php:156 ../../mod/notifications.php:203
+#: ../../mod/contacts.php:381

 msgid "Hide this contact from others"
 msgstr ""
 
 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 ""
 
 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 ""
 
 msgid "if applicable"
 msgstr ""
 

-#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
-#: ../../mod/admin.php:690
+#: ../../mod/notifications.php:160 ../../mod/notifications.php:207
+#: ../../mod/admin.php:694

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 msgid "Notifications"
 msgstr ""
 
 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 ""
 
 #, 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 ""
 
 #, 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 ""
 
 #, 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 ""
 
 #, 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 ""
 
 #, php-format
 msgid "%s commented on %s's post"
 msgstr ""
 

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

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

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

 msgid "Network Notifications"
 msgstr ""
 
 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 ""
 
 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 ""
 
 msgid "System Notifications"
 msgstr ""
 

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

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

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

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

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

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

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

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

-#: ../../mod/contacts.php:77 ../../mod/contacts.php:157
+#: ../../mod/contacts.php:84 ../../mod/contacts.php:164

 msgid "Could not access contact record."
 msgstr ""
 
 msgid "Could not access contact record."
 msgstr ""
 

-#: ../../mod/contacts.php:91
+#: ../../mod/contacts.php:98

 msgid "Could not locate selected profile."
 msgstr ""
 
 msgid "Could not locate selected profile."
 msgstr ""
 

-#: ../../mod/contacts.php:114
+#: ../../mod/contacts.php:121

 msgid "Contact updated."
 msgstr ""
 
 msgid "Contact updated."
 msgstr ""
 

-#: ../../mod/contacts.php:179
+#: ../../mod/contacts.php:186

 msgid "Contact has been blocked"
 msgstr ""
 
 msgid "Contact has been blocked"
 msgstr ""
 

-#: ../../mod/contacts.php:179
+#: ../../mod/contacts.php:186

 msgid "Contact has been unblocked"
 msgstr ""
 
 msgid "Contact has been unblocked"
 msgstr ""
 

-#: ../../mod/contacts.php:193
+#: ../../mod/contacts.php:200

 msgid "Contact has been ignored"
 msgstr ""
 
 msgid "Contact has been ignored"
 msgstr ""
 

-#: ../../mod/contacts.php:193
+#: ../../mod/contacts.php:200

 msgid "Contact has been unignored"
 msgstr ""
 
 msgid "Contact has been unignored"
 msgstr ""
 

-#: ../../mod/contacts.php:209
+#: ../../mod/contacts.php:216

 msgid "Contact has been archived"
 msgstr ""
 
 msgid "Contact has been archived"
 msgstr ""
 

-#: ../../mod/contacts.php:209
+#: ../../mod/contacts.php:216

 msgid "Contact has been unarchived"
 msgstr ""
 
 msgid "Contact has been unarchived"
 msgstr ""
 

-#: ../../mod/contacts.php:222
+#: ../../mod/contacts.php:229

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

-#: ../../mod/contacts.php:256
+#: ../../mod/contacts.php:263

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

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

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

-#: ../../mod/contacts.php:265
+#: ../../mod/contacts.php:272

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

-#: ../../mod/contacts.php:282
+#: ../../mod/contacts.php:289

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

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

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

-#: ../../mod/contacts.php:289
+#: ../../mod/contacts.php:296

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

-#: ../../mod/contacts.php:289
+#: ../../mod/contacts.php:296

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

-#: ../../mod/contacts.php:291
+#: ../../mod/contacts.php:298

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

-#: ../../mod/contacts.php:295
+#: ../../mod/contacts.php:302

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

-#: ../../mod/contacts.php:298 ../../include/contact_widgets.php:183
+#: ../../mod/contacts.php:305 ../../include/contact_widgets.php:190

 #, php-format
 msgid "%d contact in common"
 msgid_plural "%d contacts in common"
 msgstr[0] ""
 msgstr[1] ""
 
 #, php-format
 msgid "%d contact in common"
 msgid_plural "%d contacts in common"
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../../mod/contacts.php:303
+#: ../../mod/contacts.php:310

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

-#: ../../mod/contacts.php:308 ../../mod/contacts.php:367
-#: ../../mod/admin.php:694
+#: ../../mod/contacts.php:315 ../../mod/contacts.php:374
+#: ../../mod/admin.php:698

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

-#: ../../mod/contacts.php:308 ../../mod/contacts.php:367
-#: ../../mod/admin.php:693
+#: ../../mod/contacts.php:315 ../../mod/contacts.php:374
+#: ../../mod/admin.php:697

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

-#: ../../mod/contacts.php:311
+#: ../../mod/contacts.php:318

 msgid "Toggle Blocked status"
 msgstr ""
 
 msgid "Toggle Blocked status"
 msgstr ""
 

-#: ../../mod/contacts.php:314 ../../mod/contacts.php:368
+#: ../../mod/contacts.php:321 ../../mod/contacts.php:375

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

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

 msgid "Toggle Ignored status"
 msgstr ""
 
 msgid "Toggle Ignored status"
 msgstr ""
 

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

 msgid "Unarchive"
 msgstr ""
 
 msgid "Unarchive"
 msgstr ""
 

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

 msgid "Archive"
 msgstr ""
 
 msgid "Archive"
 msgstr ""
 

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

 msgid "Toggle Archive status"
 msgstr ""
 
 msgid "Toggle Archive status"
 msgstr ""
 

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

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

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

 msgid "Advanced Contact Settings"
 msgstr ""
 
 msgid "Advanced Contact Settings"
 msgstr ""
 

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

 msgid "Communications lost with this contact!"
 msgstr ""
 
 msgid "Communications lost with this contact!"
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

-#: ../../mod/contacts.php:350 ../../mod/contacts.php:542
+#: ../../mod/contacts.php:357 ../../mod/contacts.php:549

 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr ""
 
 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr ""
 

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

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

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

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

-#: ../../mod/contacts.php:353
+#: ../../mod/contacts.php:360

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

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

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

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

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

-#: ../../mod/contacts.php:360
+#: ../../mod/contacts.php:367

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

-#: ../../mod/contacts.php:362
+#: ../../mod/contacts.php:369

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

-#: ../../mod/contacts.php:364 ../../mod/admin.php:1165
+#: ../../mod/contacts.php:371 ../../mod/admin.php:1170

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

-#: ../../mod/contacts.php:371
+#: ../../mod/contacts.php:378

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

-#: ../../mod/contacts.php:372
+#: ../../mod/contacts.php:379

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

-#: ../../mod/contacts.php:373
+#: ../../mod/contacts.php:380

 msgid "Currently archived"
 msgstr ""
 
 msgid "Currently archived"
 msgstr ""
 

-#: ../../mod/contacts.php:374
+#: ../../mod/contacts.php:381

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

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

 msgid "Suggestions"
 msgstr ""
 
 msgid "Suggestions"
 msgstr ""
 

-#: ../../mod/contacts.php:430
+#: ../../mod/contacts.php:437

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

-#: ../../mod/contacts.php:433 ../../mod/group.php:191
+#: ../../mod/contacts.php:440 ../../mod/group.php:191

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

-#: ../../mod/contacts.php:436
+#: ../../mod/contacts.php:443

 msgid "Show all contacts"
 msgstr ""
 
 msgid "Show all contacts"
 msgstr ""
 

-#: ../../mod/contacts.php:439
+#: ../../mod/contacts.php:446

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

-#: ../../mod/contacts.php:442
+#: ../../mod/contacts.php:449

 msgid "Only show unblocked contacts"
 msgstr ""
 
 msgid "Only show unblocked contacts"
 msgstr ""
 

-#: ../../mod/contacts.php:446
+#: ../../mod/contacts.php:453

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

-#: ../../mod/contacts.php:449
+#: ../../mod/contacts.php:456

 msgid "Only show blocked contacts"
 msgstr ""
 
 msgid "Only show blocked contacts"
 msgstr ""
 

-#: ../../mod/contacts.php:453
+#: ../../mod/contacts.php:460

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

-#: ../../mod/contacts.php:456
+#: ../../mod/contacts.php:463

 msgid "Only show ignored contacts"
 msgstr ""
 
 msgid "Only show ignored contacts"
 msgstr ""
 

-#: ../../mod/contacts.php:460
+#: ../../mod/contacts.php:467

 msgid "Archived"
 msgstr ""
 
 msgid "Archived"
 msgstr ""
 

-#: ../../mod/contacts.php:463
+#: ../../mod/contacts.php:470

 msgid "Only show archived contacts"
 msgstr ""
 
 msgid "Only show archived contacts"
 msgstr ""
 

-#: ../../mod/contacts.php:467
+#: ../../mod/contacts.php:474

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

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

 msgid "Only show hidden contacts"
 msgstr ""
 
 msgid "Only show hidden contacts"
 msgstr ""
 

-#: ../../mod/contacts.php:518
+#: ../../mod/contacts.php:525

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

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

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

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

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

-#: ../../mod/contacts.php:543 ../../mod/nogroup.php:41
+#: ../../mod/contacts.php:550 ../../mod/nogroup.php:41

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

-#: ../../mod/contacts.php:564 ../../view/theme/diabook/theme.php:129
+#: ../../mod/contacts.php:571 ../../view/theme/diabook/theme.php:89

 #: ../../include/nav.php:139
 msgid "Contacts"
 msgstr ""
 
 #: ../../include/nav.php:139
 msgid "Contacts"
 msgstr ""
 

-#: ../../mod/contacts.php:568
+#: ../../mod/contacts.php:575

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

-#: ../../mod/contacts.php:569 ../../mod/directory.php:57
+#: ../../mod/contacts.php:576 ../../mod/directory.php:59

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

-#: ../../mod/contacts.php:570 ../../mod/directory.php:59
+#: ../../mod/contacts.php:577 ../../mod/directory.php:61

 #: ../../include/contact_widgets.php:33
 msgid "Find"
 msgstr ""
 #: ../../include/contact_widgets.php:33
 msgid "Find"
 msgstr ""


@@ -1913,10 +2017,14 @@ msgstr ""
 #: ../../mod/register.php:90 ../../mod/register.php:144
 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752
 #: ../../addon/facebook/facebook.php:702
 #: ../../mod/register.php:90 ../../mod/register.php:144
 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752
 #: ../../addon/facebook/facebook.php:702

-#: ../../addon/facebook/facebook.php:1200
+#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:661

 #: ../../addon/public_server/public_server.php:62
 #: ../../addon/public_server/public_server.php:62

-#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3219
-#: ../../boot.php:788
+#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3301
+#: ../../boot.php:799 ../../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 ""
 
 msgid "Administrator"
 msgstr ""
 


@@ -1926,7 +2034,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
 "Password reset failed."
 msgstr ""
 

-#: ../../mod/lostpass.php:83 ../../boot.php:925
+#: ../../mod/lostpass.php:83 ../../boot.php:936

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


@@ -1999,10 +2107,12 @@ msgid "Remove account"
 msgstr ""
 
 #: ../../mod/settings.php:69 ../../mod/newmember.php:22
 msgstr ""
 
 #: ../../mod/settings.php:69 ../../mod/newmember.php:22

-#: ../../mod/admin.php:780 ../../mod/admin.php:985
+#: ../../mod/admin.php:785 ../../mod/admin.php:990

 #: ../../addon/dav/friendica/layout.fnk.php:225
 #: ../../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
+#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537
+#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:137
+#: ../../addon.old/dav/friendica/layout.fnk.php:225
+#: ../../addon.old/mathjax/mathjax.php:36

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


@@ -2010,7 +2120,7 @@ msgstr ""
 msgid "Missing some important data!"
 msgstr ""
 
 msgid "Missing some important data!"
 msgstr ""
 

-#: ../../mod/settings.php:116 ../../mod/settings.php:563
+#: ../../mod/settings.php:116 ../../mod/settings.php:569

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


@@ -2022,556 +2132,576 @@ msgstr ""
 msgid "Email settings updated."
 msgstr ""
 
 msgid "Email settings updated."
 msgstr ""
 

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

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

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

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

-#: ../../mod/settings.php:301
+#: ../../mod/settings.php:306

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

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

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

-#: ../../mod/settings.php:368
+#: ../../mod/settings.php:373

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

-#: ../../mod/settings.php:370
+#: ../../mod/settings.php:375

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

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

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

-#: ../../mod/settings.php:378
+#: ../../mod/settings.php:383

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

-#: ../../mod/settings.php:432
+#: ../../mod/settings.php:437

 msgid "Private forum has no privacy permissions. Using default privacy group."
 msgstr ""
 
 msgid "Private forum has no privacy permissions. Using default privacy group."
 msgstr ""
 

-#: ../../mod/settings.php:436
+#: ../../mod/settings.php:441

 msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr ""
 
 msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr ""
 

-#: ../../mod/settings.php:466 ../../addon/facebook/facebook.php:495
-#: ../../addon/impressum/impressum.php:77
+#: ../../mod/settings.php:471 ../../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/openstreetmap/openstreetmap.php:80
 #: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105
 #: ../../addon/twitter/twitter.php:389

+#: ../../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 ""
 
 msgid "Settings updated."
 msgstr ""
 

-#: ../../mod/settings.php:536 ../../mod/settings.php:562
-#: ../../mod/settings.php:598
+#: ../../mod/settings.php:542 ../../mod/settings.php:568
+#: ../../mod/settings.php:604

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

-#: ../../mod/settings.php:540 ../../mod/settings.php:566
+#: ../../mod/settings.php:546 ../../mod/settings.php:572

 #: ../../addon/statusnet/statusnet.php:570
 #: ../../addon/statusnet/statusnet.php:570

+#: ../../addon.old/statusnet/statusnet.php:570

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

-#: ../../mod/settings.php:541 ../../mod/settings.php:567
+#: ../../mod/settings.php:547 ../../mod/settings.php:573

 #: ../../addon/statusnet/statusnet.php:569
 #: ../../addon/statusnet/statusnet.php:569

+#: ../../addon.old/statusnet/statusnet.php:569

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

-#: ../../mod/settings.php:542 ../../mod/settings.php:568
+#: ../../mod/settings.php:548 ../../mod/settings.php:574

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

-#: ../../mod/settings.php:543 ../../mod/settings.php:569
+#: ../../mod/settings.php:549 ../../mod/settings.php:575

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

-#: ../../mod/settings.php:554
+#: ../../mod/settings.php:560

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

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

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

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

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

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

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

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

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

-#: ../../mod/settings.php:614
+#: ../../mod/settings.php:620

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

-#: ../../mod/settings.php:622 ../../addon/widgets/widgets.php:123
+#: ../../mod/settings.php:628 ../../addon/widgets/widgets.php:123
+#: ../../addon.old/widgets/widgets.php:123

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

-#: ../../mod/settings.php:634 ../../mod/settings.php:635
+#: ../../mod/settings.php:640 ../../mod/settings.php:641

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

-#: ../../mod/settings.php:634 ../../mod/settings.php:635
+#: ../../mod/settings.php:640 ../../mod/settings.php:641

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

-#: ../../mod/settings.php:634 ../../mod/settings.php:635
+#: ../../mod/settings.php:640 ../../mod/settings.php:641

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

-#: ../../mod/settings.php:635
+#: ../../mod/settings.php:641

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

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

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

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

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

-#: ../../mod/settings.php:678
+#: ../../mod/settings.php:684

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

-#: ../../mod/settings.php:679
+#: ../../mod/settings.php:685

 msgid ""
 "If you wish to communicate with email contacts using this service "
 "(optional), please specify how to connect to your mailbox."
 msgstr ""
 
 msgid ""
 "If you wish to communicate with email contacts using this service "
 "(optional), please specify how to connect to your mailbox."
 msgstr ""
 

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

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

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

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

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

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

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

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

-#: ../../mod/settings.php:684 ../../mod/settings.php:689
+#: ../../mod/settings.php:690 ../../mod/settings.php:695

 #: ../../addon/dav/common/wdcal_edit.inc.php:191
 #: ../../addon/dav/common/wdcal_edit.inc.php:191

+#: ../../addon.old/dav/common/wdcal_edit.inc.php:191

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: ../../mod/settings.php:750
+#: ../../mod/settings.php:727 ../../mod/admin.php:402
+msgid "No special theme for mobile devices"
+msgstr ""
+
+#: ../../mod/settings.php:767

 msgid "Display Settings"
 msgstr ""
 
 msgid "Display Settings"
 msgstr ""
 

-#: ../../mod/settings.php:756 ../../mod/settings.php:766
+#: ../../mod/settings.php:773 ../../mod/settings.php:784

 msgid "Display Theme:"
 msgstr ""
 
 msgid "Display Theme:"
 msgstr ""
 

-#: ../../mod/settings.php:757
+#: ../../mod/settings.php:774
+msgid "Mobile Theme:"
+msgstr ""
+
+#: ../../mod/settings.php:775

 msgid "Update browser every xx seconds"
 msgstr ""
 
 msgid "Update browser every xx seconds"
 msgstr ""
 

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

 msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
 msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 

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

 msgid "Number of items to display per page:"
 msgstr ""
 
 msgid "Number of items to display per page:"
 msgstr ""
 

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

 msgid "Maximum of 100 items"
 msgstr ""
 
 msgid "Maximum of 100 items"
 msgstr ""
 

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

 msgid "Don't show emoticons"
 msgstr ""
 
 msgid "Don't show emoticons"
 msgstr ""
 

-#: ../../mod/settings.php:835
+#: ../../mod/settings.php:853

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

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

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

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

 msgid "Soapbox Page"
 msgstr ""
 
 msgid "Soapbox Page"
 msgstr ""
 

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

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

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

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

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

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

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

 msgid "Automatic Friend Page"
 msgstr ""
 
 msgid "Automatic Friend Page"
 msgstr ""
 

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

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

-#: ../../mod/settings.php:851
+#: ../../mod/settings.php:869

 msgid "Private Forum [Experimental]"
 msgstr ""
 
 msgid "Private Forum [Experimental]"
 msgstr ""
 

-#: ../../mod/settings.php:852
+#: ../../mod/settings.php:870

 msgid "Private forum - approved members only"
 msgstr ""
 
 msgid "Private forum - approved members only"
 msgstr ""
 

-#: ../../mod/settings.php:864
+#: ../../mod/settings.php:882

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

-#: ../../mod/settings.php:864
+#: ../../mod/settings.php:882

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

-#: ../../mod/settings.php:874
+#: ../../mod/settings.php:892

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

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

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

-#: ../../mod/settings.php:888
+#: ../../mod/settings.php:906

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

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

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

-#: ../../mod/settings.php:897
+#: ../../mod/settings.php:915

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

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

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

-#: ../../mod/settings.php:909
+#: ../../mod/settings.php:927

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

-#: ../../mod/settings.php:915
+#: ../../mod/settings.php:933

 msgid "Permit unknown people to send you private mail?"
 msgstr ""
 
 msgid "Permit unknown people to send you private mail?"
 msgstr ""
 

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

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

-#: ../../mod/settings.php:926 ../../mod/profile_photo.php:214
+#: ../../mod/settings.php:944 ../../mod/profile_photo.php:248

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

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

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

-#: ../../mod/settings.php:942
+#: ../../mod/settings.php:960

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

-#: ../../mod/settings.php:942
+#: ../../mod/settings.php:960

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 msgid "Only expire posts by others:"
 msgstr ""
 
 msgid "Only expire posts by others:"
 msgstr ""
 

-#: ../../mod/settings.php:956
+#: ../../mod/settings.php:974

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

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

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

-#: ../../mod/settings.php:965
+#: ../../mod/settings.php:983

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

-#: ../../mod/settings.php:966
+#: ../../mod/settings.php:984

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

-#: ../../mod/settings.php:966
+#: ../../mod/settings.php:984

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

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

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

-#: ../../mod/settings.php:971 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:989 ../../include/profile_advanced.php:15

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

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

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

-#: ../../mod/settings.php:973
+#: ../../mod/settings.php:991

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

-#: ../../mod/settings.php:974
+#: ../../mod/settings.php:992

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

-#: ../../mod/settings.php:975
+#: ../../mod/settings.php:993

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

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

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

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

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

-#: ../../mod/settings.php:980 ../../mod/settings.php:999
+#: ../../mod/settings.php:998 ../../mod/settings.php:1017

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

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

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

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

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

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

 msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
 msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 

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

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

-#: ../../mod/settings.php:1003
+#: ../../mod/settings.php:1021

 msgid "By default post a status message when:"
 msgstr ""
 
 msgid "By default post a status message when:"
 msgstr ""
 

-#: ../../mod/settings.php:1004
+#: ../../mod/settings.php:1022

 msgid "accepting a friend request"
 msgstr ""
 
 msgid "accepting a friend request"
 msgstr ""
 

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

 msgid "joining a forum/community"
 msgstr ""
 
 msgid "joining a forum/community"
 msgstr ""
 

-#: ../../mod/settings.php:1006
+#: ../../mod/settings.php:1024

 msgid "making an <em>interesting</em> profile change"
 msgstr ""
 
 msgid "making an <em>interesting</em> profile change"
 msgstr ""
 

-#: ../../mod/settings.php:1007
+#: ../../mod/settings.php:1025

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

-#: ../../mod/settings.php:1008
+#: ../../mod/settings.php:1026

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

-#: ../../mod/settings.php:1009
+#: ../../mod/settings.php:1027

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

-#: ../../mod/settings.php:1010
+#: ../../mod/settings.php:1028

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

-#: ../../mod/settings.php:1011
+#: ../../mod/settings.php:1029

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

-#: ../../mod/settings.php:1012
+#: ../../mod/settings.php:1030

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

-#: ../../mod/settings.php:1013
+#: ../../mod/settings.php:1031

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

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

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

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

 msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
 msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 

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

 msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
 msgid "Advanced Account/Page Type Settings"
 msgstr ""
 

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

 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 

-#: ../../mod/manage.php:90
+#: ../../mod/manage.php:94

 msgid "Manage Identities and/or Pages"
 msgstr ""
 
 msgid "Manage Identities and/or Pages"
 msgstr ""
 

-#: ../../mod/manage.php:93
+#: ../../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 ""
 
 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:95
+#: ../../mod/manage.php:99

 msgid "Select an identity to manage: "
 msgstr ""
 
 msgid "Select an identity to manage: "
 msgstr ""
 

-#: ../../mod/network.php:97
+#: ../../mod/network.php:181

 msgid "Search Results For:"
 msgstr ""
 
 msgid "Search Results For:"
 msgstr ""
 

-#: ../../mod/network.php:137 ../../mod/search.php:16
+#: ../../mod/network.php:221 ../../mod/search.php:18

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

-#: ../../mod/network.php:146 ../../mod/search.php:13
+#: ../../mod/network.php:230 ../../mod/search.php:27

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

-#: ../../mod/network.php:147 ../../include/group.php:244
+#: ../../mod/network.php:231 ../../include/group.php:275

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

-#: ../../mod/network.php:287
+#: ../../mod/network.php:394

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

-#: ../../mod/network.php:290
+#: ../../mod/network.php:397

 msgid "Sort by Comment Date"
 msgstr ""
 
 msgid "Sort by Comment Date"
 msgstr ""
 

-#: ../../mod/network.php:293
+#: ../../mod/network.php:400

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

-#: ../../mod/network.php:296
+#: ../../mod/network.php:403

 msgid "Sort by Post Date"
 msgstr ""
 
 msgid "Sort by Post Date"
 msgstr ""
 

-#: ../../mod/network.php:303
+#: ../../mod/network.php:410

 msgid "Posts that mention or involve you"
 msgstr ""
 
 msgid "Posts that mention or involve you"
 msgstr ""
 

-#: ../../mod/network.php:306
+#: ../../mod/network.php:413

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

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

 msgid "Activity Stream - by date"
 msgstr ""
 
 msgid "Activity Stream - by date"
 msgstr ""
 

-#: ../../mod/network.php:312
+#: ../../mod/network.php:419

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

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

 msgid "Favourite Posts"
 msgstr ""
 
 msgid "Favourite Posts"
 msgstr ""
 

-#: ../../mod/network.php:318
+#: ../../mod/network.php:425

 msgid "Shared Links"
 msgstr ""
 
 msgid "Shared Links"
 msgstr ""
 

-#: ../../mod/network.php:321
+#: ../../mod/network.php:428

 msgid "Interesting Links"
 msgstr ""
 
 msgid "Interesting Links"
 msgstr ""
 

-#: ../../mod/network.php:388
+#: ../../mod/network.php:496

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


@@ -2579,31 +2709,37 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../../mod/network.php:391
+#: ../../mod/network.php:499

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

-#: ../../mod/network.php:461
+#: ../../mod/network.php:569

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

-#: ../../mod/network.php:463
+#: ../../mod/network.php:571

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

-#: ../../mod/network.php:468
+#: ../../mod/network.php:576

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

-#: ../../mod/notes.php:44 ../../boot.php:1657
+#: ../../mod/notes.php:44 ../../boot.php:1708

 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
 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/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:441
 #: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:681

+#: ../../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 ""
 
 msgid "Save"
 msgstr ""
 


@@ -2638,7 +2774,7 @@ msgstr ""
 
 #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
 #: ../../mod/message.php:242 ../../mod/message.php:250
 
 #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
 #: ../../mod/message.php:242 ../../mod/message.php:250

-#: ../../include/conversation.php:1112 ../../include/conversation.php:1129
+#: ../../include/conversation.php:893 ../../include/conversation.php:910

 msgid "Please enter a link URL:"
 msgstr ""
 
 msgid "Please enter a link URL:"
 msgstr ""
 


@@ -2719,13 +2855,13 @@ msgid ""
 msgstr ""
 
 #: ../../mod/newmember.php:32 ../../mod/profperm.php:103
 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
 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50

-#: ../../boot.php:1633
+#: ../../boot.php:1684

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

-#: ../../mod/newmember.php:36 ../../mod/profile_photo.php:211
+#: ../../mod/newmember.php:36 ../../mod/profile_photo.php:244

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


@@ -2763,8 +2899,10 @@ msgid "Connecting"
 msgstr ""
 
 #: ../../mod/newmember.php:49 ../../mod/newmember.php:51
 msgstr ""
 
 #: ../../mod/newmember.php:49 ../../mod/newmember.php:51

-#: ../../addon/facebook/facebook.php:728
+#: ../../addon/facebook/facebook.php:728 ../../addon/fbpost/fbpost.php:239

 #: ../../include/contact_selectors.php:81
 #: ../../include/contact_selectors.php:81

+#: ../../addon.old/facebook/facebook.php:728
+#: ../../addon.old/fbpost/fbpost.php:239

 msgid "Facebook"
 msgstr ""
 
 msgid "Facebook"
 msgstr ""
 


@@ -2826,7 +2964,7 @@ msgid ""
 "hours."
 msgstr ""
 
 "hours."
 msgstr ""
 

-#: ../../mod/newmember.php:66 ../../include/group.php:239
+#: ../../mod/newmember.php:66 ../../include/group.php:270

 msgid "Groups"
 msgstr ""
 
 msgid "Groups"
 msgstr ""
 


@@ -2890,7 +3028,7 @@ msgstr ""
 msgid "Group name changed."
 msgstr ""
 
 msgid "Group name changed."
 msgstr ""
 

-#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:314
+#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:318

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


@@ -2979,58 +3117,58 @@ msgid ""
 "Please try again tomorrow."
 msgstr ""
 
 "Please try again tomorrow."
 msgstr ""
 

-#: ../../mod/register.php:215
+#: ../../mod/register.php:217

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

-#: ../../mod/register.php:216
+#: ../../mod/register.php:218

 msgid ""
 "If you are not familiar with OpenID, please leave that field blank and fill "
 "in the rest of the items."
 msgstr ""
 
 msgid ""
 "If you are not familiar with OpenID, please leave that field blank and fill "
 "in the rest of the items."
 msgstr ""
 

-#: ../../mod/register.php:217
+#: ../../mod/register.php:219

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

-#: ../../mod/register.php:231
+#: ../../mod/register.php:233

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

-#: ../../mod/register.php:251
+#: ../../mod/register.php:255

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

-#: ../../mod/register.php:252
+#: ../../mod/register.php:256

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

-#: ../../mod/register.php:255 ../../mod/admin.php:442
+#: ../../mod/register.php:259 ../../mod/admin.php:444

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

-#: ../../mod/register.php:263
+#: ../../mod/register.php:267

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

-#: ../../mod/register.php:264
+#: ../../mod/register.php:268

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

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

 msgid ""
 "Choose a profile nickname. This must begin with a text character. Your "
 "profile address on this site will then be '<strong>nickname@$sitename</"
 "strong>'."
 msgstr ""
 
 msgid ""
 "Choose a profile nickname. This must begin with a text character. Your "
 "profile address on this site will then be '<strong>nickname@$sitename</"
 "strong>'."
 msgstr ""
 

-#: ../../mod/register.php:266
+#: ../../mod/register.php:270

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

-#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:887
+#: ../../mod/register.php:273 ../../include/nav.php:81 ../../boot.php:898

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


@@ -3038,33 +3176,38 @@ msgstr ""
 msgid "People Search"
 msgstr ""
 
 msgid "People Search"
 msgstr ""
 

-#: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/tagger.php:70
-#: ../../addon/facebook/facebook.php:1594
+#: ../../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
 #: ../../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:1824
+#: ../../view/theme/diabook/theme.php:459
+#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1835

 #: ../../include/conversation.php:120 ../../include/conversation.php:129
 #: ../../include/conversation.php:120 ../../include/conversation.php:129

-#: ../../include/conversation.php:250 ../../include/conversation.php:259
+#: ../../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 ""
 
 msgid "status"
 msgstr ""
 

-#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1598
+#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602

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

-#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1840
-#: ../../include/conversation.php:137
+#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1851
+#: ../../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 ""
 
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 

-#: ../../mod/like.php:164 ../../include/conversation.php:140
+#: ../../mod/like.php:164 ../../include/conversation.php:139

 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
 #, php-format
 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:729 ../../mod/admin.php:928 ../../mod/display.php:29
-#: ../../mod/display.php:135 ../../include/items.php:3697
+#: ../../mod/admin.php:734 ../../mod/admin.php:933 ../../mod/display.php:29
+#: ../../mod/display.php:145 ../../include/items.php:3779

 msgid "Item not found."
 msgstr ""
 
 msgid "Item not found."
 msgstr ""
 


@@ -3072,8 +3215,8 @@ msgstr ""
 msgid "Access denied."
 msgstr ""
 
 msgid "Access denied."
 msgstr ""
 

-#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130
-#: ../../include/nav.php:51 ../../boot.php:1640
+#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90
+#: ../../include/nav.php:51 ../../boot.php:1691

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


@@ -3102,39 +3245,39 @@ msgstr ""
 msgid "Empty post discarded."
 msgstr ""
 
 msgid "Empty post discarded."
 msgstr ""
 

-#: ../../mod/item.php:396 ../../mod/wall_upload.php:122
-#: ../../mod/wall_upload.php:131 ../../mod/wall_upload.php:138
+#: ../../mod/item.php:407 ../../mod/wall_upload.php:133
+#: ../../mod/wall_upload.php:142 ../../mod/wall_upload.php:149

 #: ../../include/message.php:144
 msgid "Wall Photos"
 msgstr ""
 
 #: ../../include/message.php:144
 msgid "Wall Photos"
 msgstr ""
 

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

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

-#: ../../mod/item.php:834
+#: ../../mod/item.php:845

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

-#: ../../mod/item.php:836
+#: ../../mod/item.php:847

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

-#: ../../mod/item.php:837
+#: ../../mod/item.php:848

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

-#: ../../mod/item.php:839
+#: ../../mod/item.php:850

 #, php-format
 msgid "%s posted an update."
 msgstr ""
 
 #, php-format
 msgid "%s posted an update."
 msgstr ""
 

-#: ../../mod/mood.php:62 ../../include/conversation.php:228
+#: ../../mod/mood.php:62 ../../include/conversation.php:226

 #, php-format
 msgid "%1$s is currently %2$s"
 msgstr ""
 #, php-format
 msgid "%1$s is currently %2$s"
 msgstr ""


@@ -3147,61 +3290,66 @@ msgstr ""
 msgid "Set your current mood and tell your friends"
 msgstr ""
 
 msgid "Set your current mood and tell your friends"
 msgstr ""
 

-#: ../../mod/profile_photo.php:30
+#: ../../mod/profile_photo.php:44

 msgid "Image uploaded but image cropping failed."
 msgstr ""
 
 msgid "Image uploaded but image cropping failed."
 msgstr ""
 

-#: ../../mod/profile_photo.php:63 ../../mod/profile_photo.php:70
-#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:273
+#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:84
+#: ../../mod/profile_photo.php:91 ../../mod/profile_photo.php:308

 #, php-format
 msgid "Image size reduction [%s] failed."
 msgstr ""
 
 #, php-format
 msgid "Image size reduction [%s] failed."
 msgstr ""
 

-#: ../../mod/profile_photo.php:91
+#: ../../mod/profile_photo.php:118

 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
 msgstr ""
 
 msgid ""
 "Shift-reload the page or clear browser cache if the new photo does not "
 "display immediately."
 msgstr ""
 

-#: ../../mod/profile_photo.php:101
+#: ../../mod/profile_photo.php:128

 msgid "Unable to process image"
 msgstr ""
 
 msgid "Unable to process image"
 msgstr ""
 

-#: ../../mod/profile_photo.php:117 ../../mod/wall_upload.php:77
+#: ../../mod/profile_photo.php:144 ../../mod/wall_upload.php:88

 #, php-format
 msgid "Image exceeds size limit of %d"
 msgstr ""
 
 #, php-format
 msgid "Image exceeds size limit of %d"
 msgstr ""
 

-#: ../../mod/profile_photo.php:210
+#: ../../mod/profile_photo.php:242

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

-#: ../../mod/profile_photo.php:212
+#: ../../mod/profile_photo.php:243
+msgid "Select a profile:"
+msgstr ""
+
+#: ../../mod/profile_photo.php:245

 #: ../../addon/dav/friendica/layout.fnk.php:152
 #: ../../addon/dav/friendica/layout.fnk.php:152

+#: ../../addon.old/dav/friendica/layout.fnk.php:152

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

-#: ../../mod/profile_photo.php:214
+#: ../../mod/profile_photo.php:248

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

-#: ../../mod/profile_photo.php:214
+#: ../../mod/profile_photo.php:248

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

-#: ../../mod/profile_photo.php:227
+#: ../../mod/profile_photo.php:262

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

-#: ../../mod/profile_photo.php:228
+#: ../../mod/profile_photo.php:263

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

-#: ../../mod/profile_photo.php:230
+#: ../../mod/profile_photo.php:265

 msgid "Done Editing"
 msgstr ""
 
 msgid "Done Editing"
 msgstr ""
 

-#: ../../mod/profile_photo.php:264
+#: ../../mod/profile_photo.php:299

 msgid "Image uploaded successfully."
 msgstr ""
 
 msgid "Image uploaded successfully."
 msgstr ""
 


@@ -3304,19 +3452,19 @@ msgstr ""
 msgid "Theme settings updated."
 msgstr ""
 
 msgid "Theme settings updated."
 msgstr ""
 

-#: ../../mod/admin.php:96 ../../mod/admin.php:440
+#: ../../mod/admin.php:96 ../../mod/admin.php:442

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

-#: ../../mod/admin.php:97 ../../mod/admin.php:684 ../../mod/admin.php:696
+#: ../../mod/admin.php:97 ../../mod/admin.php:688 ../../mod/admin.php:701

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

-#: ../../mod/admin.php:98 ../../mod/admin.php:778 ../../mod/admin.php:820
+#: ../../mod/admin.php:98 ../../mod/admin.php:783 ../../mod/admin.php:825

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

-#: ../../mod/admin.php:99 ../../mod/admin.php:983 ../../mod/admin.php:1019
+#: ../../mod/admin.php:99 ../../mod/admin.php:988 ../../mod/admin.php:1024

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


@@ -3324,7 +3472,7 @@ msgstr ""
 msgid "DB updates"
 msgstr ""
 
 msgid "DB updates"
 msgstr ""
 

-#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1106
+#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1111

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


@@ -3340,19 +3488,19 @@ msgstr ""
 msgid "User registrations waiting for confirmation"
 msgstr ""
 
 msgid "User registrations waiting for confirmation"
 msgstr ""
 

-#: ../../mod/admin.php:183 ../../mod/admin.php:666
+#: ../../mod/admin.php:183 ../../mod/admin.php:669

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

-#: ../../mod/admin.php:184 ../../mod/admin.php:667
+#: ../../mod/admin.php:184 ../../mod/admin.php:670

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

-#: ../../mod/admin.php:185 ../../mod/admin.php:668
+#: ../../mod/admin.php:185 ../../mod/admin.php:671

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

-#: ../../mod/admin.php:186 ../../mod/admin.php:669
+#: ../../mod/admin.php:186 ../../mod/admin.php:672

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


@@ -3368,9 +3516,9 @@ msgstr ""
 msgid "Message queues"
 msgstr ""
 
 msgid "Message queues"
 msgstr ""
 

-#: ../../mod/admin.php:212 ../../mod/admin.php:439 ../../mod/admin.php:683
-#: ../../mod/admin.php:777 ../../mod/admin.php:819 ../../mod/admin.php:982
-#: ../../mod/admin.php:1018 ../../mod/admin.php:1105
+#: ../../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

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


@@ -3398,606 +3546,607 @@ msgstr ""
 msgid "Site settings updated."
 msgstr ""
 
 msgid "Site settings updated."
 msgstr ""
 

-#: ../../mod/admin.php:402
-msgid "Don't apply a special theme for mobile devices."
-msgstr ""
-
-#: ../../mod/admin.php:426
+#: ../../mod/admin.php:428

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

-#: ../../mod/admin.php:427
+#: ../../mod/admin.php:429

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

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

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

-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:434

 msgid "No SSL policy, links will track page SSL state"
 msgstr ""
 
 msgid "No SSL policy, links will track page SSL state"
 msgstr ""
 

-#: ../../mod/admin.php:433
+#: ../../mod/admin.php:435

 msgid "Force all links to use SSL"
 msgstr ""
 
 msgid "Force all links to use SSL"
 msgstr ""
 

-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:436

 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr ""
 
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr ""
 

-#: ../../mod/admin.php:443
+#: ../../mod/admin.php:445

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

-#: ../../mod/admin.php:444
+#: ../../mod/admin.php:446

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

-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:447

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

-#: ../../mod/admin.php:449 ../../addon/statusnet/statusnet.php:567
+#: ../../mod/admin.php:451 ../../addon/statusnet/statusnet.php:567
+#: ../../addon.old/statusnet/statusnet.php:567

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

-#: ../../mod/admin.php:450
+#: ../../mod/admin.php:452

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

-#: ../../mod/admin.php:451
+#: ../../mod/admin.php:453

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

-#: ../../mod/admin.php:452
+#: ../../mod/admin.php:454

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

-#: ../../mod/admin.php:452
+#: ../../mod/admin.php:454

 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr ""
 
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr ""
 

-#: ../../mod/admin.php:453
+#: ../../mod/admin.php:455

 msgid "Mobile system theme"
 msgstr ""
 
 msgid "Mobile system theme"
 msgstr ""
 

-#: ../../mod/admin.php:453
+#: ../../mod/admin.php:455

 msgid "Theme for mobile devices"
 msgstr ""
 
 msgid "Theme for mobile devices"
 msgstr ""
 

-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:456

 msgid "SSL link policy"
 msgstr ""
 
 msgid "SSL link policy"
 msgstr ""
 

-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:456

 msgid "Determines whether generated links should be forced to use SSL"
 msgstr ""
 
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr ""
 

-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:457

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

-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:457

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

-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:458

 msgid "Maximum image length"
 msgstr ""
 
 msgid "Maximum image length"
 msgstr ""
 

-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:458

 msgid ""
 "Maximum length in pixels of the longest side of uploaded images. Default is -"
 "1, which means no limits."
 msgstr ""
 
 msgid ""
 "Maximum length in pixels of the longest side of uploaded images. Default is -"
 "1, which means no limits."
 msgstr ""
 

-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:459

 msgid "JPEG image quality"
 msgstr ""
 
 msgid "JPEG image quality"
 msgstr ""
 

-#: ../../mod/admin.php:457
+#: ../../mod/admin.php:459

 msgid ""
 "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
 "100, which is full quality."
 msgstr ""
 
 msgid ""
 "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is "
 "100, which is full quality."
 msgstr ""
 

-#: ../../mod/admin.php:459
+#: ../../mod/admin.php:461

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

-#: ../../mod/admin.php:460
+#: ../../mod/admin.php:462

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

-#: ../../mod/admin.php:460
+#: ../../mod/admin.php:462

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

-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:463

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

-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:463

 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 

-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:464

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

-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:464

 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr ""
 
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr ""
 

-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:465

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

-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:465

 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr ""
 
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr ""
 

-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:466

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

-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:466

 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr ""
 
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr ""
 

-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:467

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

-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:467

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

-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:468

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

-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:468

 msgid ""
 "URL to update the global directory. If this is not set, the global directory "
 "is completely unavailable to the application."
 msgstr ""
 
 msgid ""
 "URL to update the global directory. If this is not set, the global directory "
 "is completely unavailable to the application."
 msgstr ""
 

-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:469

 msgid "Allow threaded items"
 msgstr ""
 
 msgid "Allow threaded items"
 msgstr ""
 

-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:469

 msgid "Allow infinite level threading for items on this site."
 msgstr ""
 
 msgid "Allow infinite level threading for items on this site."
 msgstr ""
 

-#: ../../mod/admin.php:468
-msgid "No default permissions for new users"
+#: ../../mod/admin.php:470
+msgid "Private posts by default for new users"

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/admin.php:468
+#: ../../mod/admin.php:470

 msgid ""
 msgid ""

-"New users will have no private permissions set for their posts by default, "
-"making their posts public until they change it."
+"Set default post permissions for all new members to the default privacy "
+"group rather than public."

 msgstr ""
 
 msgstr ""
 

-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:472

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

-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:472

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

-#: ../../mod/admin.php:471
+#: ../../mod/admin.php:473

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

-#: ../../mod/admin.php:471
+#: ../../mod/admin.php:473

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

-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:474

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

-#: ../../mod/admin.php:472
+#: ../../mod/admin.php:474

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

-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:475

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

-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:475

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

-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:476

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

-#: ../../mod/admin.php:474
+#: ../../mod/admin.php:476

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

-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:477

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

-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:477

 msgid ""
 "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All "
 "communications in OStatus are public, so privacy warnings will be "
 "occasionally displayed."
 msgstr ""
 
 msgid ""
 "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All "
 "communications in OStatus are public, so privacy warnings will be "
 "occasionally displayed."
 msgstr ""
 

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

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

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

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

-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:479

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

-#: ../../mod/admin.php:477
+#: ../../mod/admin.php:479

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

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

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

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

 msgid ""
 "If you wish, you can turn on strict certificate checking. This will mean you "
 "cannot connect (at all) to self-signed SSL sites."
 msgstr ""
 
 msgid ""
 "If you wish, you can turn on strict certificate checking. This will mean you "
 "cannot connect (at all) to self-signed SSL sites."
 msgstr ""
 

-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:481

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

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

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

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

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

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

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

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

 msgid "Delivery interval"
 msgstr ""
 
 msgid "Delivery interval"
 msgstr ""
 

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

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

 msgid "Poll interval"
 msgstr ""
 
 msgid "Poll interval"
 msgstr ""
 

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

 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr ""
 
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr ""
 

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

 msgid "Maximum Load Average"
 msgstr ""
 
 msgid "Maximum Load Average"
 msgstr ""
 

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

 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr ""
 
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr ""
 

-#: ../../mod/admin.php:501
+#: ../../mod/admin.php:503

 msgid "Update has been marked successful"
 msgstr ""
 
 msgid "Update has been marked successful"
 msgstr ""
 

-#: ../../mod/admin.php:511
+#: ../../mod/admin.php:513

 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr ""
 
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr ""
 

-#: ../../mod/admin.php:514
+#: ../../mod/admin.php:516

 #, php-format
 msgid "Update %s was successfully applied."
 msgstr ""
 
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr ""
 

-#: ../../mod/admin.php:518
+#: ../../mod/admin.php:520

 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 

-#: ../../mod/admin.php:521
+#: ../../mod/admin.php:523

 #, php-format
 msgid "Update function %s could not be found."
 msgstr ""
 
 #, php-format
 msgid "Update function %s could not be found."
 msgstr ""
 

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

 msgid "No failed updates."
 msgstr ""
 
 msgid "No failed updates."
 msgstr ""
 

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

 msgid "Failed Updates"
 msgstr ""
 
 msgid "Failed Updates"
 msgstr ""
 

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

 msgid ""
 "This does not include updates prior to 1139, which did not return a status."
 msgstr ""
 
 msgid ""
 "This does not include updates prior to 1139, which did not return a status."
 msgstr ""
 

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

 msgid "Mark success (if update was manually applied)"
 msgstr ""
 
 msgid "Mark success (if update was manually applied)"
 msgstr ""
 

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

 msgid "Attempt to execute this update step automatically"
 msgstr ""
 
 msgid "Attempt to execute this update step automatically"
 msgstr ""
 

-#: ../../mod/admin.php:568
+#: ../../mod/admin.php:570

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

-#: ../../mod/admin.php:575
+#: ../../mod/admin.php:577

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

-#: ../../mod/admin.php:614
+#: ../../mod/admin.php:616

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

-#: ../../mod/admin.php:622
+#: ../../mod/admin.php:624

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

-#: ../../mod/admin.php:622
+#: ../../mod/admin.php:624

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

-#: ../../mod/admin.php:686
+#: ../../mod/admin.php:690

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

-#: ../../mod/admin.php:687
+#: ../../mod/admin.php:691

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

-#: ../../mod/admin.php:688
+#: ../../mod/admin.php:692

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

-#: ../../mod/admin.php:688 ../../mod/admin.php:697
+#: ../../mod/admin.php:692 ../../mod/admin.php:702

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

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

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

-#: ../../mod/admin.php:691
+#: ../../mod/admin.php:695

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

-#: ../../mod/admin.php:697
+#: ../../mod/admin.php:699
+msgid "Site admin"
+msgstr ""
+
+#: ../../mod/admin.php:702

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

-#: ../../mod/admin.php:697
+#: ../../mod/admin.php:702

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

-#: ../../mod/admin.php:697
+#: ../../mod/admin.php:702

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

-#: ../../mod/admin.php:697
+#: ../../mod/admin.php:702

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

-#: ../../mod/admin.php:699
+#: ../../mod/admin.php:704

 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 

-#: ../../mod/admin.php:700
+#: ../../mod/admin.php:705

 msgid ""
 "The user {0} will be deleted!\\n\\nEverything this user has posted on this "
 "site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
 msgid ""
 "The user {0} will be deleted!\\n\\nEverything this user has posted on this "
 "site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 

-#: ../../mod/admin.php:741
+#: ../../mod/admin.php:746

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

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

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

-#: ../../mod/admin.php:755 ../../mod/admin.php:953
+#: ../../mod/admin.php:760 ../../mod/admin.php:958

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

-#: ../../mod/admin.php:757 ../../mod/admin.php:955
+#: ../../mod/admin.php:762 ../../mod/admin.php:960

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

-#: ../../mod/admin.php:779 ../../mod/admin.php:984
+#: ../../mod/admin.php:784 ../../mod/admin.php:989

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

-#: ../../mod/admin.php:787 ../../mod/admin.php:994
+#: ../../mod/admin.php:792 ../../mod/admin.php:999

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

-#: ../../mod/admin.php:788 ../../mod/admin.php:995
+#: ../../mod/admin.php:793 ../../mod/admin.php:1000

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

-#: ../../mod/admin.php:917
+#: ../../mod/admin.php:922

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

-#: ../../mod/admin.php:976
+#: ../../mod/admin.php:981

 msgid "Screenshot"
 msgstr ""
 
 msgid "Screenshot"
 msgstr ""
 

-#: ../../mod/admin.php:1024
+#: ../../mod/admin.php:1029

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

-#: ../../mod/admin.php:1025
+#: ../../mod/admin.php:1030

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

-#: ../../mod/admin.php:1052
+#: ../../mod/admin.php:1057

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

-#: ../../mod/admin.php:1108
+#: ../../mod/admin.php:1113

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

-#: ../../mod/admin.php:1114
+#: ../../mod/admin.php:1119

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

-#: ../../mod/admin.php:1115
+#: ../../mod/admin.php:1120

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

-#: ../../mod/admin.php:1115
+#: ../../mod/admin.php:1120

 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr ""
 
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr ""
 

-#: ../../mod/admin.php:1116
+#: ../../mod/admin.php:1121

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

-#: ../../mod/admin.php:1166
+#: ../../mod/admin.php:1171

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

-#: ../../mod/admin.php:1172
+#: ../../mod/admin.php:1177

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

-#: ../../mod/admin.php:1173
+#: ../../mod/admin.php:1178

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

-#: ../../mod/admin.php:1174
+#: ../../mod/admin.php:1179

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

-#: ../../mod/admin.php:1175
+#: ../../mod/admin.php:1180

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

-#: ../../mod/profile.php:22 ../../boot.php:1056
+#: ../../mod/profile.php:21 ../../boot.php:1085

 msgid "Requested profile is not available."
 msgstr ""
 
 msgid "Requested profile is not available."
 msgstr ""
 

-#: ../../mod/profile.php:142 ../../mod/display.php:67
+#: ../../mod/profile.php:155 ../../mod/display.php:77

 msgid "Access to this profile has been restricted."
 msgstr ""
 
 msgid "Access to this profile has been restricted."
 msgstr ""
 

-#: ../../mod/profile.php:167
+#: ../../mod/profile.php:180

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

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

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

-#: ../../mod/ping.php:190
+#: ../../mod/ping.php:243

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

-#: ../../mod/ping.php:195
+#: ../../mod/ping.php:248

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

-#: ../../mod/ping.php:201
+#: ../../mod/ping.php:254

 #, php-format
 msgid "{0} commented %s's post"
 msgstr ""
 
 #, php-format
 msgid "{0} commented %s's post"
 msgstr ""
 

-#: ../../mod/ping.php:206
+#: ../../mod/ping.php:259

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

-#: ../../mod/ping.php:211
+#: ../../mod/ping.php:264

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

-#: ../../mod/ping.php:216
+#: ../../mod/ping.php:269

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

-#: ../../mod/ping.php:221
+#: ../../mod/ping.php:274

 msgid "{0} posted"
 msgstr ""
 
 msgid "{0} posted"
 msgstr ""
 

-#: ../../mod/ping.php:226
+#: ../../mod/ping.php:279

 #, php-format
 msgid "{0} tagged %s's post with #%s"
 msgstr ""
 
 #, php-format
 msgid "{0} tagged %s's post with #%s"
 msgstr ""
 

-#: ../../mod/ping.php:232
+#: ../../mod/ping.php:285

 msgid "{0} mentioned you in a post"
 msgstr ""
 
 msgid "{0} mentioned you in a post"
 msgstr ""
 


@@ -4014,8 +4163,8 @@ msgid ""
 "Account not found and OpenID registration is not permitted on this site."
 msgstr ""
 
 "Account not found and OpenID registration is not permitted on this site."
 msgstr ""
 

-#: ../../mod/openid.php:93 ../../include/auth.php:99
-#: ../../include/auth.php:162
+#: ../../mod/openid.php:93 ../../include/auth.php:98
+#: ../../include/auth.php:161

 msgid "Login failed."
 msgstr ""
 
 msgid "Login failed."
 msgstr ""
 


@@ -4031,11 +4180,16 @@ msgstr ""
 msgid "No contacts in common."
 msgstr ""
 
 msgid "No contacts in common."
 msgstr ""
 

+#: ../../mod/subthread.php:103
+#, php-format
+msgid "%1$s is following %2$s's %3$s"
+msgstr ""
+

 #: ../../mod/share.php:28
 msgid "link"
 msgstr ""
 
 #: ../../mod/share.php:28
 msgid "link"
 msgstr ""
 

-#: ../../mod/display.php:128
+#: ../../mod/display.php:138

 msgid "Item has been removed."
 msgstr ""
 
 msgid "Item has been removed."
 msgstr ""
 


@@ -4047,13 +4201,13 @@ msgstr ""
 msgid "No installed applications."
 msgstr ""
 
 msgid "No installed applications."
 msgstr ""
 

-#: ../../mod/search.php:83 ../../include/text.php:678
+#: ../../mod/search.php:96 ../../include/text.php:678

 #: ../../include/text.php:679 ../../include/nav.php:91
 msgid "Search"
 msgstr ""
 
 #: ../../include/text.php:679 ../../include/nav.php:91
 msgid "Search"
 msgstr ""
 

-#: ../../mod/profiles.php:21 ../../mod/profiles.php:423
-#: ../../mod/profiles.php:537 ../../mod/dfrn_confirm.php:62
+#: ../../mod/profiles.php:21 ../../mod/profiles.php:434
+#: ../../mod/profiles.php:548 ../../mod/dfrn_confirm.php:62

 msgid "Profile not found."
 msgstr ""
 
 msgid "Profile not found."
 msgstr ""
 


@@ -4061,306 +4215,307 @@ msgstr ""
 msgid "Profile Name is required."
 msgstr ""
 
 msgid "Profile Name is required."
 msgstr ""
 

-#: ../../mod/profiles.php:160
+#: ../../mod/profiles.php:171

 msgid "Marital Status"
 msgstr ""
 
 msgid "Marital Status"
 msgstr ""
 

-#: ../../mod/profiles.php:164
+#: ../../mod/profiles.php:175

 msgid "Romantic Partner"
 msgstr ""
 
 msgid "Romantic Partner"
 msgstr ""
 

-#: ../../mod/profiles.php:168
+#: ../../mod/profiles.php:179

 msgid "Likes"
 msgstr ""
 
 msgid "Likes"
 msgstr ""
 

-#: ../../mod/profiles.php:172
+#: ../../mod/profiles.php:183

 msgid "Dislikes"
 msgstr ""
 
 msgid "Dislikes"
 msgstr ""
 

-#: ../../mod/profiles.php:176
+#: ../../mod/profiles.php:187

 msgid "Work/Employment"
 msgstr ""
 
 msgid "Work/Employment"
 msgstr ""
 

-#: ../../mod/profiles.php:179
+#: ../../mod/profiles.php:190

 msgid "Religion"
 msgstr ""
 
 msgid "Religion"
 msgstr ""
 

-#: ../../mod/profiles.php:183
+#: ../../mod/profiles.php:194

 msgid "Political Views"
 msgstr ""
 
 msgid "Political Views"
 msgstr ""
 

-#: ../../mod/profiles.php:187
+#: ../../mod/profiles.php:198

 msgid "Gender"
 msgstr ""
 
 msgid "Gender"
 msgstr ""
 

-#: ../../mod/profiles.php:191
+#: ../../mod/profiles.php:202

 msgid "Sexual Preference"
 msgstr ""
 
 msgid "Sexual Preference"
 msgstr ""
 

-#: ../../mod/profiles.php:195
+#: ../../mod/profiles.php:206

 msgid "Homepage"
 msgstr ""
 
 msgid "Homepage"
 msgstr ""
 

-#: ../../mod/profiles.php:199
+#: ../../mod/profiles.php:210

 msgid "Interests"
 msgstr ""
 
 msgid "Interests"
 msgstr ""
 

-#: ../../mod/profiles.php:203
+#: ../../mod/profiles.php:214

 msgid "Address"
 msgstr ""
 
 msgid "Address"
 msgstr ""
 

-#: ../../mod/profiles.php:210 ../../addon/dav/common/wdcal_edit.inc.php:183
+#: ../../mod/profiles.php:221 ../../addon/dav/common/wdcal_edit.inc.php:183
+#: ../../addon.old/dav/common/wdcal_edit.inc.php:183

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

-#: ../../mod/profiles.php:293
+#: ../../mod/profiles.php:304

 msgid "Profile updated."
 msgstr ""
 
 msgid "Profile updated."
 msgstr ""
 

-#: ../../mod/profiles.php:360
+#: ../../mod/profiles.php:371

 msgid " and "
 msgstr ""
 
 msgid " and "
 msgstr ""
 

-#: ../../mod/profiles.php:368
+#: ../../mod/profiles.php:379

 msgid "public profile"
 msgstr ""
 
 msgid "public profile"
 msgstr ""
 

-#: ../../mod/profiles.php:371
+#: ../../mod/profiles.php:382

 #, php-format
 msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
 msgstr ""
 
 #, php-format
 msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
 msgstr ""
 

-#: ../../mod/profiles.php:372
+#: ../../mod/profiles.php:383

 #, php-format
 msgid " - Visit %1$s's %2$s"
 msgstr ""
 
 #, php-format
 msgid " - Visit %1$s's %2$s"
 msgstr ""
 

-#: ../../mod/profiles.php:375
+#: ../../mod/profiles.php:386

 #, php-format
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
 #, php-format
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 

-#: ../../mod/profiles.php:442
+#: ../../mod/profiles.php:453

 msgid "Profile deleted."
 msgstr ""
 
 msgid "Profile deleted."
 msgstr ""
 

-#: ../../mod/profiles.php:460 ../../mod/profiles.php:494
+#: ../../mod/profiles.php:471 ../../mod/profiles.php:505

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

-#: ../../mod/profiles.php:479 ../../mod/profiles.php:521
+#: ../../mod/profiles.php:490 ../../mod/profiles.php:532

 msgid "New profile created."
 msgstr ""
 
 msgid "New profile created."
 msgstr ""
 

-#: ../../mod/profiles.php:500
+#: ../../mod/profiles.php:511

 msgid "Profile unavailable to clone."
 msgstr ""
 
 msgid "Profile unavailable to clone."
 msgstr ""
 

-#: ../../mod/profiles.php:562
+#: ../../mod/profiles.php:573

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

-#: ../../mod/profiles.php:582
+#: ../../mod/profiles.php:593

 msgid "Edit Profile Details"
 msgstr ""
 
 msgid "Edit Profile Details"
 msgstr ""
 

-#: ../../mod/profiles.php:584
+#: ../../mod/profiles.php:595

 msgid "View this profile"
 msgstr ""
 
 msgid "View this profile"
 msgstr ""
 

-#: ../../mod/profiles.php:585
+#: ../../mod/profiles.php:596

 msgid "Create a new profile using these settings"
 msgstr ""
 
 msgid "Create a new profile using these settings"
 msgstr ""
 

-#: ../../mod/profiles.php:586
+#: ../../mod/profiles.php:597

 msgid "Clone this profile"
 msgstr ""
 
 msgid "Clone this profile"
 msgstr ""
 

-#: ../../mod/profiles.php:587
+#: ../../mod/profiles.php:598

 msgid "Delete this profile"
 msgstr ""
 
 msgid "Delete this profile"
 msgstr ""
 

-#: ../../mod/profiles.php:588
+#: ../../mod/profiles.php:599

 msgid "Profile Name:"
 msgstr ""
 
 msgid "Profile Name:"
 msgstr ""
 

-#: ../../mod/profiles.php:589
+#: ../../mod/profiles.php:600

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

-#: ../../mod/profiles.php:590
+#: ../../mod/profiles.php:601

 msgid "Title/Description:"
 msgstr ""
 
 msgid "Title/Description:"
 msgstr ""
 

-#: ../../mod/profiles.php:591
+#: ../../mod/profiles.php:602

 msgid "Your Gender:"
 msgstr ""
 
 msgid "Your Gender:"
 msgstr ""
 

-#: ../../mod/profiles.php:592
+#: ../../mod/profiles.php:603

 #, php-format
 msgid "Birthday (%s):"
 msgstr ""
 
 #, php-format
 msgid "Birthday (%s):"
 msgstr ""
 

-#: ../../mod/profiles.php:593
+#: ../../mod/profiles.php:604

 msgid "Street Address:"
 msgstr ""
 
 msgid "Street Address:"
 msgstr ""
 

-#: ../../mod/profiles.php:594
+#: ../../mod/profiles.php:605

 msgid "Locality/City:"
 msgstr ""
 
 msgid "Locality/City:"
 msgstr ""
 

-#: ../../mod/profiles.php:595
+#: ../../mod/profiles.php:606

 msgid "Postal/Zip Code:"
 msgstr ""
 
 msgid "Postal/Zip Code:"
 msgstr ""
 

-#: ../../mod/profiles.php:596
+#: ../../mod/profiles.php:607

 msgid "Country:"
 msgstr ""
 
 msgid "Country:"
 msgstr ""
 

-#: ../../mod/profiles.php:597
+#: ../../mod/profiles.php:608

 msgid "Region/State:"
 msgstr ""
 
 msgid "Region/State:"
 msgstr ""
 

-#: ../../mod/profiles.php:598
+#: ../../mod/profiles.php:609

 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr ""
 
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr ""
 

-#: ../../mod/profiles.php:599
+#: ../../mod/profiles.php:610

 msgid "Who: (if applicable)"
 msgstr ""
 
 msgid "Who: (if applicable)"
 msgstr ""
 

-#: ../../mod/profiles.php:600
+#: ../../mod/profiles.php:611

 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 

-#: ../../mod/profiles.php:601
+#: ../../mod/profiles.php:612

 msgid "Since [date]:"
 msgstr ""
 
 msgid "Since [date]:"
 msgstr ""
 

-#: ../../mod/profiles.php:602 ../../include/profile_advanced.php:46
+#: ../../mod/profiles.php:613 ../../include/profile_advanced.php:46

 msgid "Sexual Preference:"
 msgstr ""
 
 msgid "Sexual Preference:"
 msgstr ""
 

-#: ../../mod/profiles.php:603
+#: ../../mod/profiles.php:614

 msgid "Homepage URL:"
 msgstr ""
 
 msgid "Homepage URL:"
 msgstr ""
 

-#: ../../mod/profiles.php:604 ../../include/profile_advanced.php:50
+#: ../../mod/profiles.php:615 ../../include/profile_advanced.php:50

 msgid "Hometown:"
 msgstr ""
 
 msgid "Hometown:"
 msgstr ""
 

-#: ../../mod/profiles.php:605 ../../include/profile_advanced.php:54
+#: ../../mod/profiles.php:616 ../../include/profile_advanced.php:54

 msgid "Political Views:"
 msgstr ""
 
 msgid "Political Views:"
 msgstr ""
 

-#: ../../mod/profiles.php:606
+#: ../../mod/profiles.php:617

 msgid "Religious Views:"
 msgstr ""
 
 msgid "Religious Views:"
 msgstr ""
 

-#: ../../mod/profiles.php:607
+#: ../../mod/profiles.php:618

 msgid "Public Keywords:"
 msgstr ""
 
 msgid "Public Keywords:"
 msgstr ""
 

-#: ../../mod/profiles.php:608
+#: ../../mod/profiles.php:619

 msgid "Private Keywords:"
 msgstr ""
 
 msgid "Private Keywords:"
 msgstr ""
 

-#: ../../mod/profiles.php:609 ../../include/profile_advanced.php:62
+#: ../../mod/profiles.php:620 ../../include/profile_advanced.php:62

 msgid "Likes:"
 msgstr ""
 
 msgid "Likes:"
 msgstr ""
 

-#: ../../mod/profiles.php:610 ../../include/profile_advanced.php:64
+#: ../../mod/profiles.php:621 ../../include/profile_advanced.php:64

 msgid "Dislikes:"
 msgstr ""
 
 msgid "Dislikes:"
 msgstr ""
 

-#: ../../mod/profiles.php:611
+#: ../../mod/profiles.php:622

 msgid "Example: fishing photography software"
 msgstr ""
 
 msgid "Example: fishing photography software"
 msgstr ""
 

-#: ../../mod/profiles.php:612
+#: ../../mod/profiles.php:623

 msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr ""
 
 msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr ""
 

-#: ../../mod/profiles.php:613
+#: ../../mod/profiles.php:624

 msgid "(Used for searching profiles, never shown to others)"
 msgstr ""
 
 msgid "(Used for searching profiles, never shown to others)"
 msgstr ""
 

-#: ../../mod/profiles.php:614
+#: ../../mod/profiles.php:625

 msgid "Tell us about yourself..."
 msgstr ""
 
 msgid "Tell us about yourself..."
 msgstr ""
 

-#: ../../mod/profiles.php:615
+#: ../../mod/profiles.php:626

 msgid "Hobbies/Interests"
 msgstr ""
 
 msgid "Hobbies/Interests"
 msgstr ""
 

-#: ../../mod/profiles.php:616
+#: ../../mod/profiles.php:627

 msgid "Contact information and Social Networks"
 msgstr ""
 
 msgid "Contact information and Social Networks"
 msgstr ""
 

-#: ../../mod/profiles.php:617
+#: ../../mod/profiles.php:628

 msgid "Musical interests"
 msgstr ""
 
 msgid "Musical interests"
 msgstr ""
 

-#: ../../mod/profiles.php:618
+#: ../../mod/profiles.php:629

 msgid "Books, literature"
 msgstr ""
 
 msgid "Books, literature"
 msgstr ""
 

-#: ../../mod/profiles.php:619
+#: ../../mod/profiles.php:630

 msgid "Television"
 msgstr ""
 
 msgid "Television"
 msgstr ""
 

-#: ../../mod/profiles.php:620
+#: ../../mod/profiles.php:631

 msgid "Film/dance/culture/entertainment"
 msgstr ""
 
 msgid "Film/dance/culture/entertainment"
 msgstr ""
 

-#: ../../mod/profiles.php:621
+#: ../../mod/profiles.php:632

 msgid "Love/romance"
 msgstr ""
 
 msgid "Love/romance"
 msgstr ""
 

-#: ../../mod/profiles.php:622
+#: ../../mod/profiles.php:633

 msgid "Work/employment"
 msgstr ""
 
 msgid "Work/employment"
 msgstr ""
 

-#: ../../mod/profiles.php:623
+#: ../../mod/profiles.php:634

 msgid "School/education"
 msgstr ""
 
 msgid "School/education"
 msgstr ""
 

-#: ../../mod/profiles.php:628
+#: ../../mod/profiles.php:639

 msgid ""
 "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
 "be visible to anybody using the internet."
 msgstr ""
 
 msgid ""
 "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
 "be visible to anybody using the internet."
 msgstr ""
 

-#: ../../mod/profiles.php:638 ../../mod/directory.php:109
+#: ../../mod/profiles.php:649 ../../mod/directory.php:111

 msgid "Age: "
 msgstr ""
 
 msgid "Age: "
 msgstr ""
 

-#: ../../mod/profiles.php:677
+#: ../../mod/profiles.php:688

 msgid "Edit/Manage Profiles"
 msgstr ""
 
 msgid "Edit/Manage Profiles"
 msgstr ""
 

-#: ../../mod/profiles.php:678 ../../boot.php:1165
+#: ../../mod/profiles.php:689 ../../boot.php:1203

 msgid "Change profile photo"
 msgstr ""
 
 msgid "Change profile photo"
 msgstr ""
 

-#: ../../mod/profiles.php:679 ../../boot.php:1166
+#: ../../mod/profiles.php:690 ../../boot.php:1204

 msgid "Create New Profile"
 msgstr ""
 
 msgid "Create New Profile"
 msgstr ""
 

-#: ../../mod/profiles.php:690 ../../boot.php:1176
+#: ../../mod/profiles.php:701 ../../boot.php:1214

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

-#: ../../mod/profiles.php:692 ../../boot.php:1179
+#: ../../mod/profiles.php:703 ../../boot.php:1217

 msgid "visible to everybody"
 msgstr ""
 
 msgid "visible to everybody"
 msgstr ""
 

-#: ../../mod/profiles.php:693 ../../boot.php:1180
+#: ../../mod/profiles.php:704 ../../boot.php:1218

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

-#: ../../mod/filer.php:29 ../../include/conversation.php:1116
-#: ../../include/conversation.php:1133
+#: ../../mod/filer.php:29 ../../include/conversation.php:897
+#: ../../include/conversation.php:914

 msgid "Save to Folder:"
 msgstr ""
 
 msgid "Save to Folder:"
 msgstr ""
 


@@ -4368,7 +4523,7 @@ msgstr ""
 msgid "- select -"
 msgstr ""
 
 msgid "- select -"
 msgstr ""
 

-#: ../../mod/tagger.php:103 ../../include/conversation.php:267
+#: ../../mod/tagger.php:95 ../../include/conversation.php:265

 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""


@@ -4452,7 +4607,7 @@ msgstr ""
 msgid "diaspora2bb: "
 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 ""
 #: ../../include/contact_widgets.php:34
 msgid "Friend Suggestions"
 msgstr ""


@@ -4467,42 +4622,42 @@ msgstr ""
 msgid "Ignore/Hide"
 msgstr ""
 
 msgid "Ignore/Hide"
 msgstr ""
 

-#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:624
+#: ../../mod/directory.php:49 ../../view/theme/diabook/theme.php:518

 msgid "Global Directory"
 msgstr ""
 
 msgid "Global Directory"
 msgstr ""
 

-#: ../../mod/directory.php:55
+#: ../../mod/directory.php:57

 msgid "Find on this site"
 msgstr ""
 
 msgid "Find on this site"
 msgstr ""
 

-#: ../../mod/directory.php:58
+#: ../../mod/directory.php:60

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

-#: ../../mod/directory.php:112
+#: ../../mod/directory.php:114

 msgid "Gender: "
 msgstr ""
 
 msgid "Gender: "
 msgstr ""
 

-#: ../../mod/directory.php:134 ../../include/profile_advanced.php:17
-#: ../../boot.php:1201
+#: ../../mod/directory.php:136 ../../include/profile_advanced.php:17
+#: ../../boot.php:1239

 msgid "Gender:"
 msgstr ""
 
 msgid "Gender:"
 msgstr ""
 

-#: ../../mod/directory.php:136 ../../include/profile_advanced.php:37
-#: ../../boot.php:1204
+#: ../../mod/directory.php:138 ../../include/profile_advanced.php:37
+#: ../../boot.php:1242

 msgid "Status:"
 msgstr ""
 
 msgid "Status:"
 msgstr ""
 

-#: ../../mod/directory.php:138 ../../include/profile_advanced.php:48
-#: ../../boot.php:1206
+#: ../../mod/directory.php:140 ../../include/profile_advanced.php:48
+#: ../../boot.php:1244

 msgid "Homepage:"
 msgstr ""
 
 msgid "Homepage:"
 msgstr ""
 

-#: ../../mod/directory.php:140 ../../include/profile_advanced.php:58
+#: ../../mod/directory.php:142 ../../include/profile_advanced.php:58

 msgid "About:"
 msgstr ""
 
 msgid "About:"
 msgstr ""
 

-#: ../../mod/directory.php:178
+#: ../../mod/directory.php:180

 msgid "No entries (some entries may be hidden)."
 msgstr ""
 
 msgid "No entries (some entries may be hidden)."
 msgstr ""
 


@@ -4625,8 +4780,8 @@ msgstr ""
 msgid "Unable to set contact photo."
 msgstr ""
 
 msgid "Unable to set contact photo."
 msgstr ""
 

-#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:608
-#: ../../include/conversation.php:173
+#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:619
+#: ../../include/conversation.php:171

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


@@ -4678,98 +4833,122 @@ msgid "%1$s has joined %2$s"
 msgstr ""
 
 #: ../../addon/fromgplus/fromgplus.php:29
 msgstr ""
 
 #: ../../addon/fromgplus/fromgplus.php:29

+#: ../../addon.old/fromgplus/fromgplus.php:29

 msgid "Google+ Import Settings"
 msgstr ""
 
 #: ../../addon/fromgplus/fromgplus.php:32
 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
 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
 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
 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
 msgid "Facebook disabled"
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:528

+#: ../../addon.old/facebook/facebook.php:528

 msgid "Updating contacts"
 msgstr ""
 
 msgid "Updating contacts"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:551
+#: ../../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
 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
 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
 msgid "Install Facebook connector for this account."
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:571

+#: ../../addon.old/facebook/facebook.php:571

 msgid "Remove Facebook connector"
 msgstr ""
 
 msgid "Remove Facebook connector"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:576
+#: ../../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 ""
 
 msgid ""
 "Re-authenticate [This is necessary whenever your Facebook password is "
 "changed.]"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:583
+#: ../../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
 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
 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
 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
 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
 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
 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
 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
 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
 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 "
 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 "


@@ -4778,22 +4957,29 @@ msgid ""
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:616
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:616

+#: ../../addon.old/facebook/facebook.php:616

 msgid "Comma separated applications to ignore"
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:700
 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
 msgid "Problems with Facebook Real-Time Updates"
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:729

+#: ../../addon.old/facebook/facebook.php:729

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

-#: ../../addon/facebook/facebook.php:744
+#: ../../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 ""
 
 msgid "Facebook API Key"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:754
+#: ../../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 "
 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 "


@@ -4801,92 +4987,123 @@ msgid ""
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:759
 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
 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
 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 ""
 
 msgid ""
 "The correctness of the API Key could not be detected. Something strange's "
 "going on."
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:766
+#: ../../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 ""
 
 msgid "App-ID / API-Key"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:767
+#: ../../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
 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
 #, 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
 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
 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
 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
 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
 msgid "Real-Time Updates not activated."
 msgstr ""
 
 #: ../../addon/facebook/facebook.php:780

+#: ../../addon.old/facebook/facebook.php:780

 msgid "Activate Real-Time Updates"
 msgstr ""
 
 msgid "Activate Real-Time Updates"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:799
+#: ../../addon/facebook/facebook.php:799 ../../addon/fbpost/fbpost.php:282

 #: ../../addon/dav/friendica/layout.fnk.php:361
 #: ../../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 ""
 
 msgid "The new values have been saved."
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:823
+#: ../../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 ""
 
 msgid "Post to Facebook"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:921
+#: ../../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 ""
 
 msgid ""
 "Post to Facebook cancelled because of multi-network access permission "
 "conflict."
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:1149
+#: ../../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 ""
 
 msgid "View on Friendica"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:1182
+#: ../../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 ""
 
 msgid "Facebook post failed. Queued for retry."
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:1222
+#: ../../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 ""
 
 msgid "Your Facebook connection became invalid. Please Re-authenticate."
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:1223
+#: ../../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 ""
 
 msgid "Facebook connection became invalid"
 msgstr ""
 

-#: ../../addon/facebook/facebook.php:1224
+#: ../../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"
 #, php-format
 msgid ""
 "Hi %1$s,\n"


@@ -4897,50 +5114,67 @@ msgid ""
 msgstr ""
 
 #: ../../addon/snautofollow/snautofollow.php:32
 msgstr ""
 
 #: ../../addon/snautofollow/snautofollow.php:32

+#: ../../addon.old/snautofollow/snautofollow.php:32

 msgid "StatusNet AutoFollow settings updated."
 msgstr ""
 
 #: ../../addon/snautofollow/snautofollow.php:56
 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
 msgid "StatusNet AutoFollow Settings"
 msgstr ""
 
 #: ../../addon/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"
+#: ../../addon.old/snautofollow/snautofollow.php:58
+msgid "Automatically follow any StatusNet followers/mentioners"

 msgstr ""
 
 #: ../../addon/privacy_image_cache/privacy_image_cache.php:260
 msgstr ""
 
 #: ../../addon/privacy_image_cache/privacy_image_cache.php:260

+#: ../../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
 msgid "Lifetime of the cache (in hours)"
 msgstr ""
 
 #: ../../addon/privacy_image_cache/privacy_image_cache.php:265

+#: ../../addon.old/privacy_image_cache/privacy_image_cache.php:265

 msgid "Cache Statistics"
 msgstr ""
 
 #: ../../addon/privacy_image_cache/privacy_image_cache.php:268
 msgid "Cache Statistics"
 msgstr ""
 
 #: ../../addon/privacy_image_cache/privacy_image_cache.php:268

+#: ../../addon.old/privacy_image_cache/privacy_image_cache.php:268

 msgid "Number of items"
 msgstr ""
 
 #: ../../addon/privacy_image_cache/privacy_image_cache.php:270
 msgid "Number of items"
 msgstr ""
 
 #: ../../addon/privacy_image_cache/privacy_image_cache.php:270

+#: ../../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
 msgid "Size of the cache"
 msgstr ""
 
 #: ../../addon/privacy_image_cache/privacy_image_cache.php:272

+#: ../../addon.old/privacy_image_cache/privacy_image_cache.php:272

 msgid "Delete the whole cache"
 msgstr ""
 
 msgid "Delete the whole cache"
 msgstr ""
 

+#: ../../addon/fbpost/fbpost.php:172 ../../addon.old/fbpost/fbpost.php:172
+msgid "Facebook Post disabled"
+msgstr ""
+
+#: ../../addon/fbpost/fbpost.php:199 ../../addon.old/fbpost/fbpost.php:199
+msgid "Facebook Post"
+msgstr ""
+
+#: ../../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.old/fbpost/fbpost.php:212
+msgid "Remove Facebook Post connector"
+msgstr ""
+
+#: ../../addon/fbpost/fbpost.php:240 ../../addon.old/fbpost/fbpost.php:240
+msgid "Facebook Post Settings"
+msgstr ""
+

 #: ../../addon/widgets/widget_like.php:58
 #: ../../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"
 #, php-format
 msgid "%d person likes this"
 msgid_plural "%d people like this"


@@ -4948,6 +5182,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../../addon/widgets/widget_like.php:61
 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"
 #, php-format
 msgid "%d person doesn't like this"
 msgid_plural "%d people don't like this"


@@ -4955,228 +5190,262 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../../addon/widgets/widget_friendheader.php:40
 msgstr[1] ""
 
 #: ../../addon/widgets/widget_friendheader.php:40

+#: ../../addon.old/widgets/widget_friendheader.php:40

 msgid "Get added to this list!"
 msgstr ""
 
 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 ""
 
 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 ""
 
 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
 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
 msgid "Connect on Friendica!"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:19

+#: ../../addon.old/morepokes/morepokes.php:19

 msgid "bitchslap"
 msgstr ""
 
 #: ../../addon/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
 msgid "bitchslapped"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:20

+#: ../../addon.old/morepokes/morepokes.php:20

 msgid "shag"
 msgstr ""
 
 #: ../../addon/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
 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
 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
 msgid "did something obscenely biological to"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:22

-msgid "point out the new poke feature to"
+#: ../../addon.old/morepokes/morepokes.php:22
+msgid "point out the poke feature to"

 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:22
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:22

-msgid "pointed out the new poke feature to"
+#: ../../addon.old/morepokes/morepokes.php:22
+msgid "pointed out the poke feature to"

 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:23
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:23

+#: ../../addon.old/morepokes/morepokes.php:23

 msgid "declare undying love for"
 msgstr ""
 
 #: ../../addon/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
 msgid "declared undying love for"
 msgstr ""
 
 #: ../../addon/morepokes/morepokes.php:24

-msgid "set fire to"
-msgstr ""
-
-#: ../../addon/morepokes/morepokes.php:25
+#: ../../addon.old/morepokes/morepokes.php:24

 msgid "patent"
 msgstr ""
 
 msgid "patent"
 msgstr ""
 

-#: ../../addon/morepokes/morepokes.php:25
+#: ../../addon/morepokes/morepokes.php:24
+#: ../../addon.old/morepokes/morepokes.php:24

 msgid "patented"
 msgstr ""
 
 msgid "patented"
 msgstr ""
 

-#: ../../addon/morepokes/morepokes.php:26
+#: ../../addon/morepokes/morepokes.php:25
+#: ../../addon.old/morepokes/morepokes.php:25

 msgid "stroke beard"
 msgstr ""
 
 msgid "stroke beard"
 msgstr ""
 

-#: ../../addon/morepokes/morepokes.php:26
+#: ../../addon/morepokes/morepokes.php:25
+#: ../../addon.old/morepokes/morepokes.php:25

 msgid "stroked their beard at"
 msgstr ""
 
 msgid "stroked their beard at"
 msgstr ""
 

-#: ../../addon/morepokes/morepokes.php:27
+#: ../../addon/morepokes/morepokes.php:26
+#: ../../addon.old/morepokes/morepokes.php:26

 msgid ""
 "bemoan the declining standards of modern secondary and tertiary education to"
 msgstr ""
 
 msgid ""
 "bemoan the declining standards of modern secondary and tertiary education to"
 msgstr ""
 

-#: ../../addon/morepokes/morepokes.php:27
+#: ../../addon/morepokes/morepokes.php:26
+#: ../../addon.old/morepokes/morepokes.php:26

 msgid ""
 "bemoans the declining standards of modern secondary and tertiary education to"
 msgstr ""
 
 msgid ""
 "bemoans the declining standards of modern secondary and tertiary education to"
 msgstr ""
 

-#: ../../addon/morepokes/morepokes.php:28
+#: ../../addon/morepokes/morepokes.php:27
+#: ../../addon.old/morepokes/morepokes.php:27

 msgid "hug"
 msgstr ""
 
 msgid "hug"
 msgstr ""
 

-#: ../../addon/morepokes/morepokes.php:28
+#: ../../addon/morepokes/morepokes.php:27
+#: ../../addon.old/morepokes/morepokes.php:27

 msgid "hugged"
 msgstr ""
 
 msgid "hugged"
 msgstr ""
 

-#: ../../addon/morepokes/morepokes.php:29
+#: ../../addon/morepokes/morepokes.php:28
+#: ../../addon.old/morepokes/morepokes.php:28

 msgid "kiss"
 msgstr ""
 
 msgid "kiss"
 msgstr ""
 

-#: ../../addon/morepokes/morepokes.php:29
+#: ../../addon/morepokes/morepokes.php:28
+#: ../../addon.old/morepokes/morepokes.php:28

 msgid "kissed"
 msgstr ""
 
 msgid "kissed"
 msgstr ""
 

-#: ../../addon/morepokes/morepokes.php:30
+#: ../../addon/morepokes/morepokes.php:29
+#: ../../addon.old/morepokes/morepokes.php:29

 msgid "raise eyebrows at"
 msgstr ""
 
 msgid "raise eyebrows at"
 msgstr ""
 

-#: ../../addon/morepokes/morepokes.php:30
+#: ../../addon/morepokes/morepokes.php:29
+#: ../../addon.old/morepokes/morepokes.php:29

 msgid "raised their eyebrows at"
 msgstr ""
 
 msgid "raised their eyebrows at"
 msgstr ""
 

-#: ../../addon/morepokes/morepokes.php:31
+#: ../../addon/morepokes/morepokes.php:30
+#: ../../addon.old/morepokes/morepokes.php:30

 msgid "insult"
 msgstr ""
 
 msgid "insult"
 msgstr ""
 

-#: ../../addon/morepokes/morepokes.php:31
+#: ../../addon/morepokes/morepokes.php:30
+#: ../../addon.old/morepokes/morepokes.php:30

 msgid "insulted"
 msgstr ""
 
 msgid "insulted"
 msgstr ""
 

-#: ../../addon/morepokes/morepokes.php:32
+#: ../../addon/morepokes/morepokes.php:31
+#: ../../addon.old/morepokes/morepokes.php:31

 msgid "praise"
 msgstr ""
 
 msgid "praise"
 msgstr ""
 

-#: ../../addon/morepokes/morepokes.php:32
+#: ../../addon/morepokes/morepokes.php:31
+#: ../../addon.old/morepokes/morepokes.php:31

 msgid "praised"
 msgstr ""
 
 msgid "praised"
 msgstr ""
 

-#: ../../addon/morepokes/morepokes.php:33
+#: ../../addon/morepokes/morepokes.php:32
+#: ../../addon.old/morepokes/morepokes.php:32

 msgid "be dubious of"
 msgstr ""
 
 msgid "be dubious of"
 msgstr ""
 

-#: ../../addon/morepokes/morepokes.php:33
+#: ../../addon/morepokes/morepokes.php:32
+#: ../../addon.old/morepokes/morepokes.php:32

 msgid "was dubious of"
 msgstr ""
 
 msgid "was dubious of"
 msgstr ""
 

-#: ../../addon/morepokes/morepokes.php:34
+#: ../../addon/morepokes/morepokes.php:33
+#: ../../addon.old/morepokes/morepokes.php:33

 msgid "eat"
 msgstr ""
 
 msgid "eat"
 msgstr ""
 

-#: ../../addon/morepokes/morepokes.php:34
+#: ../../addon/morepokes/morepokes.php:33
+#: ../../addon.old/morepokes/morepokes.php:33

 msgid "ate"
 msgstr ""
 
 msgid "ate"
 msgstr ""
 

-#: ../../addon/morepokes/morepokes.php:35
+#: ../../addon/morepokes/morepokes.php:34
+#: ../../addon.old/morepokes/morepokes.php:34

 msgid "giggle and fawn at"
 msgstr ""
 
 msgid "giggle and fawn at"
 msgstr ""
 

-#: ../../addon/morepokes/morepokes.php:35
+#: ../../addon/morepokes/morepokes.php:34
+#: ../../addon.old/morepokes/morepokes.php:34

 msgid "giggled and fawned at"
 msgstr ""
 
 msgid "giggled and fawned at"
 msgstr ""
 

-#: ../../addon/morepokes/morepokes.php:36
+#: ../../addon/morepokes/morepokes.php:35
+#: ../../addon.old/morepokes/morepokes.php:35

 msgid "doubt"
 msgstr ""
 
 msgid "doubt"
 msgstr ""
 

-#: ../../addon/morepokes/morepokes.php:36
+#: ../../addon/morepokes/morepokes.php:35
+#: ../../addon.old/morepokes/morepokes.php:35

 msgid "doubted"
 msgstr ""
 
 msgid "doubted"
 msgstr ""
 

-#: ../../addon/morepokes/morepokes.php:37
+#: ../../addon/morepokes/morepokes.php:36
+#: ../../addon.old/morepokes/morepokes.php:36

 msgid "glare"
 msgstr ""
 
 msgid "glare"
 msgstr ""
 

-#: ../../addon/morepokes/morepokes.php:37
+#: ../../addon/morepokes/morepokes.php:36
+#: ../../addon.old/morepokes/morepokes.php:36

 msgid "glared at"
 msgstr ""
 
 msgid "glared at"
 msgstr ""
 

-#: ../../addon/yourls/yourls.php:55
+#: ../../addon/yourls/yourls.php:55 ../../addon.old/yourls/yourls.php:55

 msgid "YourLS Settings"
 msgstr ""
 
 msgid "YourLS Settings"
 msgstr ""
 

-#: ../../addon/yourls/yourls.php:57
+#: ../../addon/yourls/yourls.php:57 ../../addon.old/yourls/yourls.php:57

 msgid "URL: http://"
 msgstr ""
 
 msgid "URL: http://"
 msgstr ""
 

-#: ../../addon/yourls/yourls.php:62
+#: ../../addon/yourls/yourls.php:62 ../../addon.old/yourls/yourls.php:62

 msgid "Username:"
 msgstr ""
 
 msgid "Username:"
 msgstr ""
 

-#: ../../addon/yourls/yourls.php:67
+#: ../../addon/yourls/yourls.php:67 ../../addon.old/yourls/yourls.php:67

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

-#: ../../addon/yourls/yourls.php:72
+#: ../../addon/yourls/yourls.php:72 ../../addon.old/yourls/yourls.php:72

 msgid "Use SSL "
 msgstr ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 msgid "LiveJournal username"
 msgstr ""
 

-#: ../../addon/ljpost/ljpost.php:82
+#: ../../addon/ljpost/ljpost.php:82 ../../addon.old/ljpost/ljpost.php:82

 msgid "LiveJournal password"
 msgstr ""
 
 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 ""
 
 msgid "Post to LiveJournal by default"
 msgstr ""
 

-#: ../../addon/nsfw/nsfw.php:47
+#: ../../addon/nsfw/nsfw.php:78 ../../addon.old/nsfw/nsfw.php:78

 msgid "Not Safe For Work (General Purpose Content Filter) settings"
 msgstr ""
 
 msgid "Not Safe For Work (General Purpose Content Filter) settings"
 msgstr ""
 

-#: ../../addon/nsfw/nsfw.php:49
+#: ../../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 "
 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 "


@@ -5186,61 +5455,64 @@ msgid ""
 "can thereby be used as a general purpose content filter."
 msgstr ""
 
 "can thereby be used as a general purpose content filter."
 msgstr ""
 

-#: ../../addon/nsfw/nsfw.php:50
+#: ../../addon/nsfw/nsfw.php:81 ../../addon.old/nsfw/nsfw.php:81

 msgid "Enable Content filter"
 msgstr ""
 
 msgid "Enable Content filter"
 msgstr ""
 

-#: ../../addon/nsfw/nsfw.php:53
+#: ../../addon/nsfw/nsfw.php:84 ../../addon.old/nsfw/nsfw.php:84

 msgid "Comma separated list of keywords to hide"
 msgstr ""
 
 msgid "Comma separated list of keywords to hide"
 msgstr ""
 

-#: ../../addon/nsfw/nsfw.php:58
+#: ../../addon/nsfw/nsfw.php:89 ../../addon.old/nsfw/nsfw.php:89

 msgid "Use /expression/ to provide regular expressions"
 msgstr ""
 
 msgid "Use /expression/ to provide regular expressions"
 msgstr ""
 

-#: ../../addon/nsfw/nsfw.php:74
+#: ../../addon/nsfw/nsfw.php:105 ../../addon.old/nsfw/nsfw.php:105

 msgid "NSFW Settings saved."
 msgstr ""
 
 msgid "NSFW Settings saved."
 msgstr ""
 

-#: ../../addon/nsfw/nsfw.php:121
+#: ../../addon/nsfw/nsfw.php:157 ../../addon.old/nsfw/nsfw.php:157

 #, php-format
 msgid "%s - Click to open/close"
 msgstr ""
 
 #, php-format
 msgid "%s - Click to open/close"
 msgstr ""
 

-#: ../../addon/page/page.php:61 ../../addon/page/page.php:91
-#: ../../addon/forumlist/forumlist.php:54
+#: ../../addon/page/page.php:62 ../../addon/page/page.php:92
+#: ../../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 ""
 
 msgid "Forums"
 msgstr ""
 

-#: ../../addon/page/page.php:129 ../../addon/forumlist/forumlist.php:88
+#: ../../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 ""
 
 msgid "Forums:"
 msgstr ""
 

-#: ../../addon/page/page.php:165
+#: ../../addon/page/page.php:166 ../../addon.old/page/page.php:166

 msgid "Page settings updated."
 msgstr ""
 
 msgid "Page settings updated."
 msgstr ""
 

-#: ../../addon/page/page.php:194
+#: ../../addon/page/page.php:195 ../../addon.old/page/page.php:195

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

-#: ../../addon/page/page.php:196 ../../addon/forumlist/forumlist.php:155
+#: ../../addon/page/page.php:197 ../../addon.old/page/page.php:197

 msgid "How many forums to display on sidebar without paging"
 msgstr ""
 
 msgid "How many forums to display on sidebar without paging"
 msgstr ""
 

-#: ../../addon/page/page.php:199
+#: ../../addon/page/page.php:200 ../../addon.old/page/page.php:200

 msgid "Randomise Page/Forum list"
 msgstr ""
 
 msgid "Randomise Page/Forum list"
 msgstr ""
 

-#: ../../addon/page/page.php:202
+#: ../../addon/page/page.php:203 ../../addon.old/page/page.php:203

 msgid "Show pages/forums on profile page"
 msgstr ""
 
 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 ""
 
 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 ""
 
 msgid "Enable Planets Plugin"
 msgstr ""
 


@@ -5248,36 +5520,49 @@ msgstr ""
 #: ../../addon/communityhome/communityhome.php:34
 #: ../../addon/communityhome/twillingham/communityhome.php:28
 #: ../../addon/communityhome/twillingham/communityhome.php:34
 #: ../../addon/communityhome/communityhome.php:34
 #: ../../addon/communityhome/twillingham/communityhome.php:28
 #: ../../addon/communityhome/twillingham/communityhome.php:34

-#: ../../include/nav.php:64 ../../boot.php:912
+#: ../../include/nav.php:64 ../../boot.php:923
+#: ../../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
 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
 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
 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
 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
 msgid "Latest photos"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:133

+#: ../../addon.old/communityhome/communityhome.php:133

 msgid "Latest likes"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:155
 msgid "Latest likes"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:155

-#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1397
-#: ../../include/conversation.php:117 ../../include/conversation.php:247
+#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1435
+#: ../../include/conversation.php:117 ../../include/conversation.php:245
+#: ../../addon.old/communityhome/communityhome.php:155

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


@@ -5287,107 +5572,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/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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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 ""
 
 msgid "Days"
 msgstr ""
 


@@ -5395,317 +5714,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: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:915
+#: ../../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
 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:915
+#: ../../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
 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:915
+#: ../../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
 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:915
+#: ../../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
 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:915
+#: ../../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
 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:915
+#: ../../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
 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:915
+#: ../../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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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 "
 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 "


@@ -5713,52 +6123,65 @@ msgid ""
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:242
 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
 msgid "Extended calendar with CalDAV-support"
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:279

-#: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:463
+#: ../../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:710

+#: ../../addon.old/dav/friendica/main.php:279
+#: ../../addon.old/dav/friendica/main.php:280

 msgid "noreply"
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:282
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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 "
 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 "


@@ -5768,22 +6191,27 @@ msgid ""
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:343
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:343

+#: ../../addon.old/dav/friendica/main.php:343

 msgid "Upgrade"
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:346
 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
 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
 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
 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 "
 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 "


@@ -5792,38 +6220,47 @@ msgid ""
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:355
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:355

+#: ../../addon.old/dav/friendica/main.php:355

 msgid "Troubleshooting"
 msgstr ""
 
 #: ../../addon/dav/friendica/main.php:356
 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
 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
 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
 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
 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
 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
 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
 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 "
 #, php-format
 msgid ""
 "Allow to use your friendica id (%s) to connecto to external unhosted-enabled "


@@ -5832,183 +6269,197 @@ msgid ""
 msgstr ""
 
 #: ../../addon/uhremotestorage/uhremotestorage.php:85
 msgstr ""
 
 #: ../../addon/uhremotestorage/uhremotestorage.php:85

+#: ../../addon.old/uhremotestorage/uhremotestorage.php:85

 msgid "Template URL (with {category})"
 msgstr ""
 
 #: ../../addon/uhremotestorage/uhremotestorage.php:86
 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
 msgid "OAuth end-point"
 msgstr ""
 
 #: ../../addon/uhremotestorage/uhremotestorage.php:87

+#: ../../addon.old/uhremotestorage/uhremotestorage.php:87

 msgid "Api"
 msgstr ""
 
 #: ../../addon/membersince/membersince.php:18
 msgid "Api"
 msgstr ""
 
 #: ../../addon/membersince/membersince.php:18

+#: ../../addon.old/membersince/membersince.php:18

 msgid "Member since:"
 msgstr ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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
 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 ""
 
 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
 msgid "I won!"
 msgstr ""
 
 #: ../../addon/randplace/randplace.php:169

+#: ../../addon.old/randplace/randplace.php:169

 msgid "Randplace Settings"
 msgstr ""
 
 #: ../../addon/randplace/randplace.php:171
 msgid "Randplace Settings"
 msgstr ""
 
 #: ../../addon/randplace/randplace.php:171

+#: ../../addon.old/randplace/randplace.php:171

 msgid "Enable Randplace Plugin"
 msgstr ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 msgid "dreamwidth username"
 msgstr ""
 

-#: ../../addon/dwpost/dwpost.php:82
+#: ../../addon/dwpost/dwpost.php:82 ../../addon.old/dwpost/dwpost.php:82

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

-#: ../../addon/drpost/drpost.php:79
-msgid "Drupal username"
+#: ../../addon/remote_permissions/remote_permissions.php:57
+msgid "Remote Permissions settings updated."

 msgstr ""
 
 msgstr ""
 

-#: ../../addon/drpost/drpost.php:84
-msgid "Drupal password"
+#: ../../addon/remote_permissions/remote_permissions.php:177
+msgid "Visible to"

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

-#: ../../addon/drpost/drpost.php:94
-msgid "Drupal site URL"
+#: ../../addon/remote_permissions/remote_permissions.php:196
+msgid "Global"

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

-#: ../../addon/drpost/drpost.php:104
-msgid "Post to Drupal by default"
+#: ../../addon/remote_permissions/remote_permissions.php:197
+msgid "Individual"

 msgstr ""
 
 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
 msgstr ""
 
 #: ../../addon/startpage/startpage.php:83

+#: ../../addon.old/startpage/startpage.php:83

 msgid "Startpage Settings"
 msgstr ""
 
 #: ../../addon/startpage/startpage.php:85
 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
 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
 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
 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
 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
 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
 #, 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
 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"
 #, php-format
 msgid ""
 "Hi %1$s,\n"


@@ -6018,284 +6469,342 @@ msgid ""
 msgstr ""
 
 #: ../../addon/js_upload/js_upload.php:43
 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
 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
 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
 msgid "Failed"
 msgstr ""
 
 #: ../../addon/js_upload/js_upload.php:297

+#: ../../addon.old/js_upload/js_upload.php:297

 msgid "No files were uploaded."
 msgstr ""
 
 #: ../../addon/js_upload/js_upload.php:303
 msgid "No files were uploaded."
 msgstr ""
 
 #: ../../addon/js_upload/js_upload.php:303

+#: ../../addon.old/js_upload/js_upload.php:303

 msgid "Uploaded file is empty"
 msgstr ""
 
 #: ../../addon/js_upload/js_upload.php:326
 msgid "Uploaded file is empty"
 msgstr ""
 
 #: ../../addon/js_upload/js_upload.php:326

+#: ../../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
 msgid "File has an invalid extension, it should be one of "
 msgstr ""
 
 #: ../../addon/js_upload/js_upload.php:337

+#: ../../addon.old/js_upload/js_upload.php:337

 msgid "Upload was cancelled, or server error encountered"
 msgstr ""
 
 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:57
+#: ../../addon/forumlist/forumlist.php:63
+#: ../../addon.old/forumlist/forumlist.php:63

 msgid "show/hide"
 msgstr ""
 
 msgid "show/hide"
 msgstr ""
 

-#: ../../addon/forumlist/forumlist.php:72
+#: ../../addon/forumlist/forumlist.php:77
+#: ../../addon.old/forumlist/forumlist.php:77

 msgid "No forum subscriptions"
 msgstr ""
 
 msgid "No forum subscriptions"
 msgstr ""
 

-#: ../../addon/forumlist/forumlist.php:124
+#: ../../addon/forumlist/forumlist.php:131
+#: ../../addon.old/forumlist/forumlist.php:131

 msgid "Forumlist settings updated."
 msgstr ""
 
 msgid "Forumlist settings updated."
 msgstr ""
 

-#: ../../addon/forumlist/forumlist.php:153
+#: ../../addon/forumlist/forumlist.php:159
+#: ../../addon.old/forumlist/forumlist.php:159

 msgid "Forumlist Settings"
 msgstr ""
 
 msgid "Forumlist Settings"
 msgstr ""
 

-#: ../../addon/forumlist/forumlist.php:158
-msgid "Randomise Forumlist/Forum list"
+#: ../../addon/forumlist/forumlist.php:161
+#: ../../addon.old/forumlist/forumlist.php:161
+msgid "Randomise forum list"

 msgstr ""
 
 msgstr ""
 

-#: ../../addon/forumlist/forumlist.php:161
-msgid "Show forumlists/forums on profile forumlist"
+#: ../../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 ""
 
 msgstr ""
 

-#: ../../addon/impressum/impressum.php:36
+#: ../../addon/impressum/impressum.php:37
+#: ../../addon.old/impressum/impressum.php:37

 msgid "Impressum"
 msgstr ""
 
 msgid "Impressum"
 msgstr ""
 

-#: ../../addon/impressum/impressum.php:49
-#: ../../addon/impressum/impressum.php:51
-#: ../../addon/impressum/impressum.php:83
+#: ../../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 ""
 
 msgid "Site Owner"
 msgstr ""
 

-#: ../../addon/impressum/impressum.php:49
-#: ../../addon/impressum/impressum.php:87
+#: ../../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 ""
 
 msgid "Email Address"
 msgstr ""
 

-#: ../../addon/impressum/impressum.php:54
-#: ../../addon/impressum/impressum.php:85
+#: ../../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 ""
 
 msgid "Postal Address"
 msgstr ""
 

-#: ../../addon/impressum/impressum.php:60
+#: ../../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 "
 "refer to the README file of the addon."
 msgstr ""
 
 msgid ""
 "The impressum addon needs to be configured!<br />Please add at least the "
 "<tt>owner</tt> variable to your config file. For other variables please "
 "refer to the README file of the addon."
 msgstr ""
 

-#: ../../addon/impressum/impressum.php:83
+#: ../../addon/impressum/impressum.php:84
+#: ../../addon.old/impressum/impressum.php:84

 msgid "The page operators name."
 msgstr ""
 
 msgid "The page operators name."
 msgstr ""
 

-#: ../../addon/impressum/impressum.php:84
+#: ../../addon/impressum/impressum.php:85
+#: ../../addon.old/impressum/impressum.php:85

 msgid "Site Owners Profile"
 msgstr ""
 
 msgid "Site Owners Profile"
 msgstr ""
 

-#: ../../addon/impressum/impressum.php:84
+#: ../../addon/impressum/impressum.php:85
+#: ../../addon.old/impressum/impressum.php:85

 msgid "Profile address of the operator."
 msgstr ""
 
 msgid "Profile address of the operator."
 msgstr ""
 

-#: ../../addon/impressum/impressum.php:85
+#: ../../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 ""
 
 msgid "How to contact the operator via snail mail. You can use BBCode here."
 msgstr ""
 

-#: ../../addon/impressum/impressum.php:86
+#: ../../addon/impressum/impressum.php:87
+#: ../../addon.old/impressum/impressum.php:87

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

-#: ../../addon/impressum/impressum.php:86
+#: ../../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 ""
 
 msgid ""
 "Additional notes that are displayed beneath the contact information. You can "
 "use BBCode here."
 msgstr ""
 

-#: ../../addon/impressum/impressum.php:87
+#: ../../addon/impressum/impressum.php:88
+#: ../../addon.old/impressum/impressum.php:88

 msgid "How to contact the operator via email. (will be displayed obfuscated)"
 msgstr ""
 
 msgid "How to contact the operator via email. (will be displayed obfuscated)"
 msgstr ""
 

-#: ../../addon/impressum/impressum.php:88
+#: ../../addon/impressum/impressum.php:89
+#: ../../addon.old/impressum/impressum.php:89

 msgid "Footer note"
 msgstr ""
 
 msgid "Footer note"
 msgstr ""
 

-#: ../../addon/impressum/impressum.php:88
+#: ../../addon/impressum/impressum.php:89
+#: ../../addon.old/impressum/impressum.php:89

 msgid "Text for the footer. You can use BBCode here."
 msgstr ""
 
 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
 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
 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
 msgid "No Timeline Settings"
 msgstr ""
 
 #: ../../addon/notimeline/notimeline.php:58

+#: ../../addon.old/notimeline/notimeline.php:58

 msgid "Disable Archive selector on profile wall"
 msgstr ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 #, 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 ""
 
 msgid "Unblock Author"
 msgstr ""
 

-#: ../../addon/blockem/blockem.php:162
+#: ../../addon/blockem/blockem.php:162 ../../addon.old/blockem/blockem.php:162

 msgid "Block Author"
 msgstr ""
 
 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
 msgid "blockem settings updated"
 msgstr ""
 
 #: ../../addon/qcomment/qcomment.php:51

+#: ../../addon.old/qcomment/qcomment.php:51

 msgid ":-)"
 msgstr ""
 
 #: ../../addon/qcomment/qcomment.php:51
 msgid ":-)"
 msgstr ""
 
 #: ../../addon/qcomment/qcomment.php:51

+#: ../../addon.old/qcomment/qcomment.php:51

 msgid ":-("
 msgstr ""
 
 #: ../../addon/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
 msgid "lol"
 msgstr ""
 
 #: ../../addon/qcomment/qcomment.php:54

+#: ../../addon.old/qcomment/qcomment.php:54

 msgid "Quick Comment Settings"
 msgstr ""
 
 #: ../../addon/qcomment/qcomment.php:56
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 #, 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
 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
 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 "
 msgid ""
 "Gravatar addon is installed. Please disable the Gravatar addon.<br>The "
 "Libravatar addon will fall back to Gravatar if nothing was found at "


@@ -6304,83 +6813,99 @@ msgstr ""
 
 #: ../../addon/libravatar/libravatar.php:100
 #: ../../addon/gravatar/gravatar.php:96
 
 #: ../../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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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
 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
 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
 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 "
 msgid ""
 "Libravatar addon is installed, too. Please disable Libravatar addon or this "
 "Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "


@@ -6388,26 +6913,32 @@ msgid ""
 msgstr ""
 
 #: ../../addon/gravatar/gravatar.php:96
 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
 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
 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
 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
 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
 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"
 #, php-format
 msgid ""
 "Hi %1$s,\n"


@@ -6421,68 +6952,142 @@ msgid ""
 msgstr ""
 
 #: ../../addon/pageheader/pageheader.php:50
 msgstr ""
 
 #: ../../addon/pageheader/pageheader.php:50

+#: ../../addon.old/pageheader/pageheader.php:50

 msgid "\"pageheader\" Settings"
 msgstr ""
 
 #: ../../addon/pageheader/pageheader.php:68
 msgid "\"pageheader\" Settings"
 msgstr ""
 
 #: ../../addon/pageheader/pageheader.php:68

+#: ../../addon.old/pageheader/pageheader.php:68

 msgid "pageheader Settings saved."
 msgstr ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 msgid "InsaneJournal username"
 msgstr ""
 

-#: ../../addon/ijpost/ijpost.php:82
+#: ../../addon/ijpost/ijpost.php:82 ../../addon.old/ijpost/ijpost.php:82

 msgid "InsaneJournal password"
 msgstr ""
 
 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 ""
 
 msgid "Post to InsaneJournal by default"
 msgstr ""
 

-#: ../../addon/viewsrc/viewsrc.php:37
+#: ../../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.old/viewsrc/viewsrc.php:37

 msgid "View Source"
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:134
 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
 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
 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
 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
 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
 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
 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 "
 msgid ""
 "There are preconfigured OAuth key pairs for some StatusNet servers "
 "available. If you are useing one of them, please use these credentials. If "


@@ -6490,10 +7095,12 @@ msgid ""
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:280
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:280

+#: ../../addon.old/statusnet/statusnet.php:280

 msgid "Provide your own OAuth Credentials"
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:281
 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 "
 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 "


@@ -6503,18 +7110,22 @@ msgid ""
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:283
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:283

+#: ../../addon.old/statusnet/statusnet.php:283

 msgid "OAuth Consumer Key"
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:286
 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
 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
 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 "
 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 "


@@ -6523,30 +7134,38 @@ msgid ""
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:311
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:311

+#: ../../addon.old/statusnet/statusnet.php:311

 msgid "Log in with StatusNet"
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:313
 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
 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
 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
 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
 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
 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 "
 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 "


@@ -6554,6 +7173,7 @@ msgid ""
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:336
 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 "
 msgid ""
 "<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
 "details from unknown viewers?</em>) the link potentially included in public "


@@ -6562,143 +7182,169 @@ msgid ""
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:339
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:339

+#: ../../addon.old/statusnet/statusnet.php:339

 msgid "Allow posting to StatusNet"
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:342
 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
 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
 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
 msgid "Clear OAuth configuration"
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:568

+#: ../../addon.old/statusnet/statusnet.php:568

 msgid "API URL"
 msgstr ""
 
 #: ../../addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php:19
 msgid "API URL"
 msgstr ""
 
 #: ../../addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php:19

+#: ../../addon.old/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php:19

 msgid "Infinite Improbability Drive"
 msgstr ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 msgid "Tumblr login"
 msgstr ""
 

-#: ../../addon/tumblr/tumblr.php:79
+#: ../../addon/tumblr/tumblr.php:79 ../../addon.old/tumblr/tumblr.php:79

 msgid "Tumblr password"
 msgstr ""
 
 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
 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
 msgid "Numfriends settings updated."
 msgstr ""
 
 #: ../../addon/numfriends/numfriends.php:77

+#: ../../addon.old/numfriends/numfriends.php:77

 msgid "Numfriends Settings"
 msgstr ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 #, 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 msgid "WordPress username"
 msgstr ""
 

-#: ../../addon/wppost/wppost.php:88
+#: ../../addon/wppost/wppost.php:88 ../../addon.old/wppost/wppost.php:88

 msgid "WordPress password"
 msgstr ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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
 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
 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
 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
 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 ""
 
 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 ""
 
 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 "
 #, php-format
 msgid ""
 "If you do not want that your visits are logged this way you <a href='%s'>can "


@@ -6706,47 +7352,47 @@ msgid ""
 "(opt-out)."
 msgstr ""
 
 "(opt-out)."
 msgstr ""
 

-#: ../../addon/piwik/piwik.php:90
+#: ../../addon/piwik/piwik.php:90 ../../addon.old/piwik/piwik.php:90

 msgid "Piwik Base URL"
 msgstr ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 "
 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 "


@@ -6755,22 +7401,22 @@ msgid ""
 "be posted to Twitter."
 msgstr ""
 
 "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 ""
 
 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 ""
 
 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 ""
 
 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 "
 msgid ""
 "<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
 "details from unknown viewers?</em>) the link potentially included in public "


@@ -6778,113 +7424,138 @@ msgid ""
 "the visitor that the access to your profile has been restricted."
 msgstr ""
 
 "the visitor that the access to your profile has been restricted."
 msgstr ""
 

-#: ../../addon/twitter/twitter.php:195
+#: ../../addon/twitter/twitter.php:195 ../../addon.old/twitter/twitter.php:195

 msgid "Allow posting to Twitter"
 msgstr ""
 
 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 ""
 
 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 ""
 
 msgid "Send linked #-tags and @-names to Twitter"
 msgstr ""
 

-#: ../../addon/twitter/twitter.php:396
+#: ../../addon/twitter/twitter.php:396 ../../addon.old/twitter/twitter.php:396

 msgid "Consumer key"
 msgstr ""
 
 msgid "Consumer key"
 msgstr ""
 

-#: ../../addon/twitter/twitter.php:397
+#: ../../addon/twitter/twitter.php:397 ../../addon.old/twitter/twitter.php:397

 msgid "Consumer secret"
 msgstr ""
 
 msgid "Consumer secret"
 msgstr ""
 

-#: ../../addon/irc/irc.php:44
+#: ../../addon/irc/irc.php:44 ../../addon.old/irc/irc.php:44

 msgid "IRC Settings"
 msgstr ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 msgid "IRC Chatroom"
 msgstr ""
 

-#: ../../addon/irc/irc.php:96
+#: ../../addon/irc/irc.php:96 ../../addon.old/irc/irc.php:96

 msgid "Popular Channels"
 msgstr ""
 
 msgid "Popular Channels"
 msgstr ""
 

-#: ../../addon/blogger/blogger.php:42
+#: ../../addon/fromapp/fromapp.php:38 ../../addon.old/fromapp/fromapp.php:38
+msgid "Fromapp settings updated."
+msgstr ""
+
+#: ../../addon/fromapp/fromapp.php:64 ../../addon.old/fromapp/fromapp.php:64
+msgid "FromApp Settings"
+msgstr ""
+
+#: ../../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.old/fromapp/fromapp.php:70
+msgid "Use this application name even if another application was used."
+msgstr ""
+
+#: ../../addon/blogger/blogger.php:42 ../../addon.old/blogger/blogger.php:42

 msgid "Post to blogger"
 msgstr ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 msgid "Blogger username"
 msgstr ""
 

-#: ../../addon/blogger/blogger.php:86
+#: ../../addon/blogger/blogger.php:86 ../../addon.old/blogger/blogger.php:86

 msgid "Blogger password"
 msgstr ""
 
 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 ""
 
 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
 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
 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
 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
 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
 msgid "Posterous login"
 msgstr ""
 
 #: ../../addon/posterous/posterous.php:82

+#: ../../addon.old/posterous/posterous.php:82

 msgid "Posterous password"
 msgstr ""
 
 #: ../../addon/posterous/posterous.php:87
 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
 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
 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
 msgid "Post to Posterous by default"
 msgstr ""
 
 #: ../../view/theme/cleanzero/config.php:82

-#: ../../view/theme/diabook/config.php:192
-#: ../../view/theme/quattro/config.php:54 ../../view/theme/dispy/config.php:72
+#: ../../view/theme/diabook/config.php:154
+#: ../../view/theme/quattro/config.php:66 ../../view/theme/dispy/config.php:72

 msgid "Theme settings"
 msgstr ""
 
 msgid "Theme settings"
 msgstr ""
 


@@ -6893,7 +7564,7 @@ msgid "Set resize level for images in posts and comments (width and height)"
 msgstr ""
 
 #: ../../view/theme/cleanzero/config.php:84
 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 ""
 #: ../../view/theme/dispy/config.php:73
 msgid "Set font-size for posts and comments"
 msgstr ""


@@ -6903,193 +7574,185 @@ msgid "Set theme width"
 msgstr ""
 
 #: ../../view/theme/cleanzero/config.php:86
 msgstr ""
 
 #: ../../view/theme/cleanzero/config.php:86

-#: ../../view/theme/quattro/config.php:56
+#: ../../view/theme/quattro/config.php:68

 msgid "Color scheme"
 msgstr ""
 
 msgid "Color scheme"
 msgstr ""
 

-#: ../../view/theme/diabook/theme.php:127 ../../include/nav.php:49
+#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49

 #: ../../include/nav.php:115
 msgid "Your posts and conversations"
 msgstr ""
 
 #: ../../include/nav.php:115
 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 ""
 
 msgid "Your profile page"
 msgstr ""
 

-#: ../../view/theme/diabook/theme.php:129
+#: ../../view/theme/diabook/theme.php:89

 msgid "Your contacts"
 msgstr ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 msgid "Find Friends"
 msgstr ""
 

-#: ../../view/theme/diabook/theme.php:623
+#: ../../view/theme/diabook/theme.php:517

 msgid "Local Directory"
 msgstr ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 msgid "Earth Layers"
 msgstr ""
 

-#: ../../view/theme/diabook/theme.php:683
+#: ../../view/theme/diabook/theme.php:577

 msgid "Set zoomfactor for Earth Layers"
 msgstr ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 msgid "show"
 msgstr ""
 

-#: ../../view/theme/diabook/theme.php:745
+#: ../../view/theme/diabook/theme.php:630

 msgid "Show/hide boxes at right-hand column:"
 msgstr ""
 
 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/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 ""
 
 msgid "Set resolution for middle column"
 msgstr ""
 

-#: ../../view/theme/diabook/config.php:196
+#: ../../view/theme/diabook/config.php:158

 msgid "Set color scheme"
 msgstr ""
 
 msgid "Set color scheme"
 msgstr ""
 

-#: ../../view/theme/diabook/config.php:198
+#: ../../view/theme/diabook/config.php:160

 msgid "Set zoomfactor for Earth Layer"
 msgstr ""
 
 msgid "Set zoomfactor for Earth Layer"
 msgstr ""
 

-#: ../../view/theme/diabook/config.php:207
+#: ../../view/theme/diabook/config.php:169

 msgid "Last tweets"
 msgstr ""
 
 msgid "Last tweets"
 msgstr ""
 

-#: ../../view/theme/quattro/config.php:55
+#: ../../view/theme/quattro/config.php:67

 msgid "Alignment"
 msgstr ""
 
 msgid "Alignment"
 msgstr ""
 

-#: ../../view/theme/quattro/config.php:55
+#: ../../view/theme/quattro/config.php:67

 msgid "Left"
 msgstr ""
 
 msgid "Left"
 msgstr ""
 

-#: ../../view/theme/quattro/config.php:55
+#: ../../view/theme/quattro/config.php:67

 msgid "Center"
 msgstr ""
 
 msgid "Center"
 msgstr ""
 

+#: ../../view/theme/quattro/config.php:69
+msgid "Posts font size"
+msgstr ""
+
+#: ../../view/theme/quattro/config.php:70
+msgid "Textareas font size"
+msgstr ""
+

 #: ../../view/theme/dispy/config.php:75
 msgid "Set colour scheme"
 msgstr ""
 #: ../../view/theme/dispy/config.php:75
 msgid "Set colour scheme"
 msgstr ""


@@ -7364,7 +8027,7 @@ msgid "Sex Addict"
 msgstr ""
 
 #: ../../include/profile_selectors.php:42 ../../include/user.php:278
 msgstr ""
 
 #: ../../include/profile_selectors.php:42 ../../include/user.php:278

-#: ../../include/user.php:283
+#: ../../include/user.php:282

 msgid "Friends"
 msgstr ""
 
 msgid "Friends"
 msgstr ""
 


@@ -7460,11 +8123,11 @@ msgstr ""
 msgid "Finishes:"
 msgstr ""
 
 msgid "Finishes:"
 msgstr ""
 

-#: ../../include/delivery.php:456 ../../include/notifier.php:703
+#: ../../include/delivery.php:457 ../../include/notifier.php:703

 msgid "(no subject)"
 msgstr ""
 
 msgid "(no subject)"
 msgstr ""
 

-#: ../../include/Scrape.php:575
+#: ../../include/Scrape.php:583

 msgid " on Last.fm"
 msgstr ""
 
 msgid " on Last.fm"
 msgstr ""
 


@@ -7507,7 +8170,7 @@ msgstr[1] ""
 msgid "poke"
 msgstr ""
 
 msgid "poke"
 msgstr ""
 

-#: ../../include/text.php:719 ../../include/conversation.php:212
+#: ../../include/text.php:719 ../../include/conversation.php:210

 msgid "poked"
 msgstr ""
 
 msgid "poked"
 msgstr ""
 


@@ -7631,107 +8294,87 @@ msgstr ""
 msgid "surprised"
 msgstr ""
 
 msgid "surprised"
 msgstr ""
 

-#: ../../include/text.php:921
+#: ../../include/text.php:919

 msgid "January"
 msgstr ""
 
 msgid "January"
 msgstr ""
 

-#: ../../include/text.php:921
+#: ../../include/text.php:919

 msgid "February"
 msgstr ""
 
 msgid "February"
 msgstr ""
 

-#: ../../include/text.php:921
+#: ../../include/text.php:919

 msgid "March"
 msgstr ""
 
 msgid "March"
 msgstr ""
 

-#: ../../include/text.php:921
+#: ../../include/text.php:919

 msgid "April"
 msgstr ""
 
 msgid "April"
 msgstr ""
 

-#: ../../include/text.php:921
+#: ../../include/text.php:919

 msgid "May"
 msgstr ""
 
 msgid "May"
 msgstr ""
 

-#: ../../include/text.php:921
+#: ../../include/text.php:919

 msgid "June"
 msgstr ""
 
 msgid "June"
 msgstr ""
 

-#: ../../include/text.php:921
+#: ../../include/text.php:919

 msgid "July"
 msgstr ""
 
 msgid "July"
 msgstr ""
 

-#: ../../include/text.php:921
+#: ../../include/text.php:919

 msgid "August"
 msgstr ""
 
 msgid "August"
 msgstr ""
 

-#: ../../include/text.php:921
+#: ../../include/text.php:919

 msgid "September"
 msgstr ""
 
 msgid "September"
 msgstr ""
 

-#: ../../include/text.php:921
+#: ../../include/text.php:919

 msgid "October"
 msgstr ""
 
 msgid "October"
 msgstr ""
 

-#: ../../include/text.php:921
+#: ../../include/text.php:919

 msgid "November"
 msgstr ""
 
 msgid "November"
 msgstr ""
 

-#: ../../include/text.php:921
+#: ../../include/text.php:919

 msgid "December"
 msgstr ""
 
 msgid "December"
 msgstr ""
 

-#: ../../include/text.php:1007
+#: ../../include/text.php:1005

 msgid "bytes"
 msgstr ""
 
 msgid "bytes"
 msgstr ""
 

-#: ../../include/text.php:1027 ../../include/text.php:1042
-msgid "remove"
-msgstr ""
-
-#: ../../include/text.php:1027 ../../include/text.php:1042
-msgid "[remove]"
-msgstr ""
-
-#: ../../include/text.php:1030
-msgid "Categories:"
-msgstr ""
-
-#: ../../include/text.php:1045
-msgid "Filed under:"
-msgstr ""
-
-#: ../../include/text.php:1061 ../../include/text.php:1073
+#: ../../include/text.php:1032 ../../include/text.php:1044

 msgid "Click to open/close"
 msgstr ""
 
 msgid "Click to open/close"
 msgstr ""
 

-#: ../../include/text.php:1179 ../../include/user.php:236
+#: ../../include/text.php:1217 ../../include/user.php:236

 msgid "default"
 msgstr ""
 
 msgid "default"
 msgstr ""
 

-#: ../../include/text.php:1191
+#: ../../include/text.php:1229

 msgid "Select an alternate language"
 msgstr ""
 
 msgid "Select an alternate language"
 msgstr ""
 

-#: ../../include/text.php:1401
+#: ../../include/text.php:1439

 msgid "activity"
 msgstr ""
 
 msgid "activity"
 msgstr ""
 

-#: ../../include/text.php:1403
-msgid "comment"
-msgstr ""
-
-#: ../../include/text.php:1404
+#: ../../include/text.php:1442

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

-#: ../../include/text.php:1559
+#: ../../include/text.php:1597

 msgid "Item filed"
 msgstr ""
 
 msgid "Item filed"
 msgstr ""
 

-#: ../../include/diaspora.php:691
+#: ../../include/diaspora.php:702

 msgid "Sharing notification from Diaspora network"
 msgstr ""
 
 msgid "Sharing notification from Diaspora network"
 msgstr ""
 

-#: ../../include/diaspora.php:2202
+#: ../../include/diaspora.php:2222

 msgid "Attachments:"
 msgstr ""
 
 msgid "Attachments:"
 msgstr ""
 


@@ -7754,31 +8397,31 @@ msgid ""
 "not what you intended, please create another group with a different name."
 msgstr ""
 
 "not what you intended, please create another group with a different name."
 msgstr ""
 

-#: ../../include/group.php:176
+#: ../../include/group.php:207

 msgid "Default privacy group for new contacts"
 msgstr ""
 
 msgid "Default privacy group for new contacts"
 msgstr ""
 

-#: ../../include/group.php:195
+#: ../../include/group.php:226

 msgid "Everybody"
 msgstr ""
 
 msgid "Everybody"
 msgstr ""
 

-#: ../../include/group.php:218
+#: ../../include/group.php:249

 msgid "edit"
 msgstr ""
 
 msgid "edit"
 msgstr ""
 

-#: ../../include/group.php:240
+#: ../../include/group.php:271

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

-#: ../../include/group.php:241
+#: ../../include/group.php:272

 msgid "Create a new group"
 msgstr ""
 
 msgid "Create a new group"
 msgstr ""
 

-#: ../../include/group.php:242
+#: ../../include/group.php:273

 msgid "Contacts not in any group"
 msgstr ""
 
 msgid "Contacts not in any group"
 msgstr ""
 

-#: ../../include/nav.php:46 ../../boot.php:911
+#: ../../include/nav.php:46 ../../boot.php:922

 msgid "Logout"
 msgstr ""
 
 msgid "Logout"
 msgstr ""
 


@@ -7786,7 +8429,7 @@ msgstr ""
 msgid "End this session"
 msgstr ""
 
 msgid "End this session"
 msgstr ""
 

-#: ../../include/nav.php:49 ../../boot.php:1626
+#: ../../include/nav.php:49 ../../boot.php:1677

 msgid "Status"
 msgstr ""
 
 msgid "Status"
 msgstr ""
 


@@ -7866,11 +8509,11 @@ msgstr ""
 msgid "Manage other pages"
 msgstr ""
 
 msgid "Manage other pages"
 msgstr ""
 

-#: ../../include/nav.php:138 ../../boot.php:1159
+#: ../../include/nav.php:138 ../../boot.php:1197

 msgid "Profiles"
 msgstr ""
 
 msgid "Profiles"
 msgstr ""
 

-#: ../../include/nav.php:138 ../../boot.php:1159
+#: ../../include/nav.php:138 ../../boot.php:1197

 msgid "Manage/edit profiles"
 msgstr ""
 
 msgid "Manage/edit profiles"
 msgstr ""
 


@@ -7945,17 +8588,17 @@ msgstr ""
 msgid "Categories"
 msgstr ""
 
 msgid "Categories"
 msgstr ""
 

-#: ../../include/auth.php:36
+#: ../../include/auth.php:35

 msgid "Logged out."
 msgstr ""
 
 msgid "Logged out."
 msgstr ""
 

-#: ../../include/auth.php:115
+#: ../../include/auth.php:114

 msgid ""
 "We encountered a problem while logging in with the OpenID you provided. "
 "Please check the correct spelling of the ID."
 msgstr ""
 
 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:115
+#: ../../include/auth.php:114

 msgid "The error message was:"
 msgstr ""
 
 msgid "The error message was:"
 msgstr ""
 


@@ -8016,17 +8659,17 @@ msgstr ""
 msgid "%1$d %2$s ago"
 msgstr ""
 
 msgid "%1$d %2$s ago"
 msgstr ""
 

-#: ../../include/datetime.php:472 ../../include/items.php:1621
+#: ../../include/datetime.php:472 ../../include/items.php:1688

 #, php-format
 msgid "%s's birthday"
 msgstr ""
 
 #, php-format
 msgid "%s's birthday"
 msgstr ""
 

-#: ../../include/datetime.php:473 ../../include/items.php:1622
+#: ../../include/datetime.php:473 ../../include/items.php:1689

 #, php-format
 msgid "Happy Birthday %s"
 msgstr ""
 
 #, php-format
 msgid "Happy Birthday %s"
 msgstr ""
 

-#: ../../include/onepoll.php:399
+#: ../../include/onepoll.php:409

 msgid "From: "
 msgstr ""
 
 msgid "From: "
 msgstr ""
 


@@ -8295,15 +8938,15 @@ msgstr ""
 msgid "following"
 msgstr ""
 
 msgid "following"
 msgstr ""
 

-#: ../../include/items.php:3217
+#: ../../include/items.php:3299

 msgid "A new person is sharing with you at "
 msgstr ""
 
 msgid "A new person is sharing with you at "
 msgstr ""
 

-#: ../../include/items.php:3217
+#: ../../include/items.php:3299

 msgid "You have a new follower at "
 msgstr ""
 
 msgid "You have a new follower at "
 msgstr ""
 

-#: ../../include/items.php:3886
+#: ../../include/items.php:3980

 msgid "Archives"
 msgstr ""
 
 msgid "Archives"
 msgstr ""
 


@@ -8375,19 +9018,19 @@ msgstr ""
 msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
 
 msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
 

-#: ../../include/security.php:21
+#: ../../include/security.php:22

 msgid "Welcome "
 msgstr ""
 
 msgid "Welcome "
 msgstr ""
 

-#: ../../include/security.php:22
+#: ../../include/security.php:23

 msgid "Please upload a profile photo."
 msgstr ""
 
 msgid "Please upload a profile photo."
 msgstr ""
 

-#: ../../include/security.php:25
+#: ../../include/security.php:26

 msgid "Welcome back "
 msgstr ""
 
 msgid "Welcome back "
 msgstr ""
 

-#: ../../include/security.php:329
+#: ../../include/security.php:354

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


@@ -8397,256 +9040,300 @@ msgstr ""
 msgid "stopped following"
 msgstr ""
 
 msgid "stopped following"
 msgstr ""
 

-#: ../../include/Contact.php:220 ../../include/conversation.php:1013
+#: ../../include/Contact.php:220 ../../include/conversation.php:790

 msgid "Poke"
 msgstr ""
 
 msgid "Poke"
 msgstr ""
 

-#: ../../include/Contact.php:221 ../../include/conversation.php:1007
+#: ../../include/Contact.php:221 ../../include/conversation.php:784

 msgid "View Status"
 msgstr ""
 
 msgid "View Status"
 msgstr ""
 

-#: ../../include/Contact.php:222 ../../include/conversation.php:1008
+#: ../../include/Contact.php:222 ../../include/conversation.php:785

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

-#: ../../include/Contact.php:223 ../../include/conversation.php:1009
+#: ../../include/Contact.php:223 ../../include/conversation.php:786

 msgid "View Photos"
 msgstr ""
 
 #: ../../include/Contact.php:224 ../../include/Contact.php:237
 msgid "View Photos"
 msgstr ""
 
 #: ../../include/Contact.php:224 ../../include/Contact.php:237

-#: ../../include/conversation.php:1010
+#: ../../include/conversation.php:787

 msgid "Network Posts"
 msgstr ""
 
 #: ../../include/Contact.php:225 ../../include/Contact.php:237
 msgid "Network Posts"
 msgstr ""
 
 #: ../../include/Contact.php:225 ../../include/Contact.php:237

-#: ../../include/conversation.php:1011
+#: ../../include/conversation.php:788

 msgid "Edit Contact"
 msgstr ""
 
 #: ../../include/Contact.php:226 ../../include/Contact.php:237
 msgid "Edit Contact"
 msgstr ""
 
 #: ../../include/Contact.php:226 ../../include/Contact.php:237

-#: ../../include/conversation.php:1012
+#: ../../include/conversation.php:789

 msgid "Send PM"
 msgstr ""
 
 msgid "Send PM"
 msgstr ""
 

-#: ../../include/conversation.php:208
+#: ../../include/conversation.php:206

 #, php-format
 msgid "%1$s poked %2$s"
 msgstr ""
 
 #, php-format
 msgid "%1$s poked %2$s"
 msgstr ""
 

-#: ../../include/conversation.php:292
+#: ../../include/conversation.php:290

 msgid "post/item"
 msgstr ""
 
 msgid "post/item"
 msgstr ""
 

-#: ../../include/conversation.php:293
+#: ../../include/conversation.php:291

 #, php-format
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 
 #, php-format
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 

-#: ../../include/conversation.php:913
+#: ../../include/conversation.php:594 ../../object/Item.php:218
+msgid "Categories:"
+msgstr ""
+
+#: ../../include/conversation.php:595 ../../object/Item.php:219
+msgid "Filed under:"
+msgstr ""
+
+#: ../../include/conversation.php:680
+msgid "remove"
+msgstr ""
+
+#: ../../include/conversation.php:684

 msgid "Delete Selected Items"
 msgstr ""
 
 msgid "Delete Selected Items"
 msgstr ""
 

-#: ../../include/conversation.php:1071
+#: ../../include/conversation.php:783
+msgid "Follow Thread"
+msgstr ""
+
+#: ../../include/conversation.php:852

 #, php-format
 msgid "%s likes this."
 msgstr ""
 
 #, php-format
 msgid "%s likes this."
 msgstr ""
 

-#: ../../include/conversation.php:1071
+#: ../../include/conversation.php:852

 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 

-#: ../../include/conversation.php:1075
+#: ../../include/conversation.php:856

 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""
 
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""
 

-#: ../../include/conversation.php:1077
+#: ../../include/conversation.php:858

 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr ""
 
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr ""
 

-#: ../../include/conversation.php:1083
+#: ../../include/conversation.php:864

 msgid "and"
 msgstr ""
 
 msgid "and"
 msgstr ""
 

-#: ../../include/conversation.php:1086
+#: ../../include/conversation.php:867

 #, php-format
 msgid ", and %d other people"
 msgstr ""
 
 #, php-format
 msgid ", and %d other people"
 msgstr ""
 

-#: ../../include/conversation.php:1087
+#: ../../include/conversation.php:868

 #, php-format
 msgid "%s like this."
 msgstr ""
 
 #, php-format
 msgid "%s like this."
 msgstr ""
 

-#: ../../include/conversation.php:1087
+#: ../../include/conversation.php:868

 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 

-#: ../../include/conversation.php:1111 ../../include/conversation.php:1128
+#: ../../include/conversation.php:892 ../../include/conversation.php:909

 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 

-#: ../../include/conversation.php:1113 ../../include/conversation.php:1130
+#: ../../include/conversation.php:894 ../../include/conversation.php:911

 msgid "Please enter a video link/URL:"
 msgstr ""
 
 msgid "Please enter a video link/URL:"
 msgstr ""
 

-#: ../../include/conversation.php:1114 ../../include/conversation.php:1131
+#: ../../include/conversation.php:895 ../../include/conversation.php:912

 msgid "Please enter an audio link/URL:"
 msgstr ""
 
 msgid "Please enter an audio link/URL:"
 msgstr ""
 

-#: ../../include/conversation.php:1115 ../../include/conversation.php:1132
+#: ../../include/conversation.php:896 ../../include/conversation.php:913

 msgid "Tag term:"
 msgstr ""
 
 msgid "Tag term:"
 msgstr ""
 

-#: ../../include/conversation.php:1117 ../../include/conversation.php:1134
+#: ../../include/conversation.php:898 ../../include/conversation.php:915

 msgid "Where are you right now?"
 msgstr ""
 
 msgid "Where are you right now?"
 msgstr ""
 

-#: ../../include/conversation.php:1177
-msgid "upload photo"
-msgstr ""
-
-#: ../../include/conversation.php:1179
-msgid "attach file"
-msgstr ""
-
-#: ../../include/conversation.php:1181
-msgid "web link"
-msgstr ""
-
-#: ../../include/conversation.php:1182
-msgid "Insert video link"
-msgstr ""
-
-#: ../../include/conversation.php:1183
-msgid "video link"
-msgstr ""
-
-#: ../../include/conversation.php:1184
-msgid "Insert audio link"
-msgstr ""
-
-#: ../../include/conversation.php:1185
-msgid "audio link"
-msgstr ""
-
-#: ../../include/conversation.php:1187
-msgid "set location"
-msgstr ""
-
-#: ../../include/conversation.php:1189
-msgid "clear location"
-msgstr ""
-
-#: ../../include/conversation.php:1196
+#: ../../include/conversation.php:977

 msgid "permissions"
 msgstr ""
 
 msgid "permissions"
 msgstr ""
 

-#: ../../include/plugin.php:400 ../../include/plugin.php:402
+#: ../../include/plugin.php:389 ../../include/plugin.php:391

 msgid "Click here to upgrade."
 msgstr ""
 
 msgid "Click here to upgrade."
 msgstr ""
 

-#: ../../include/plugin.php:408
+#: ../../include/plugin.php:397

 msgid "This action exceeds the limits set by your subscription plan."
 msgstr ""
 
 msgid "This action exceeds the limits set by your subscription plan."
 msgstr ""
 

-#: ../../include/plugin.php:413
+#: ../../include/plugin.php:402

 msgid "This action is not available under your subscription plan."
 msgstr ""
 
 msgid "This action is not available under your subscription plan."
 msgstr ""
 

-#: ../../boot.php:573
+#: ../../boot.php:584

 msgid "Delete this item?"
 msgstr ""
 
 msgid "Delete this item?"
 msgstr ""
 

-#: ../../boot.php:576
+#: ../../boot.php:587

 msgid "show fewer"
 msgstr ""
 
 msgid "show fewer"
 msgstr ""
 

-#: ../../boot.php:783
+#: ../../boot.php:794

 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 

-#: ../../boot.php:785
+#: ../../boot.php:796

 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 

-#: ../../boot.php:886
+#: ../../boot.php:897

 msgid "Create a New Account"
 msgstr ""
 
 msgid "Create a New Account"
 msgstr ""
 

-#: ../../boot.php:914
+#: ../../boot.php:925

 msgid "Nickname or Email address: "
 msgstr ""
 
 msgid "Nickname or Email address: "
 msgstr ""
 

-#: ../../boot.php:915
+#: ../../boot.php:926

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

-#: ../../boot.php:918
+#: ../../boot.php:929

 msgid "Or login using OpenID: "
 msgstr ""
 
 msgid "Or login using OpenID: "
 msgstr ""
 

-#: ../../boot.php:924
+#: ../../boot.php:935

 msgid "Forgot your password?"
 msgstr ""
 
 msgid "Forgot your password?"
 msgstr ""
 

-#: ../../boot.php:1091
+#: ../../boot.php:1046
+msgid "Requested account is not available."
+msgstr ""
+
+#: ../../boot.php:1123

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

-#: ../../boot.php:1151
+#: ../../boot.php:1189

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

-#: ../../boot.php:1273 ../../boot.php:1359
+#: ../../boot.php:1311 ../../boot.php:1397

 msgid "g A l F d"
 msgstr ""
 
 msgid "g A l F d"
 msgstr ""
 

-#: ../../boot.php:1274 ../../boot.php:1360
+#: ../../boot.php:1312 ../../boot.php:1398

 msgid "F d"
 msgstr ""
 
 msgid "F d"
 msgstr ""
 

-#: ../../boot.php:1319 ../../boot.php:1400
+#: ../../boot.php:1357 ../../boot.php:1438

 msgid "[today]"
 msgstr ""
 
 msgid "[today]"
 msgstr ""
 

-#: ../../boot.php:1331
+#: ../../boot.php:1369

 msgid "Birthday Reminders"
 msgstr ""
 
 msgid "Birthday Reminders"
 msgstr ""
 

-#: ../../boot.php:1332
+#: ../../boot.php:1370

 msgid "Birthdays this week:"
 msgstr ""
 
 msgid "Birthdays this week:"
 msgstr ""
 

-#: ../../boot.php:1393
+#: ../../boot.php:1431

 msgid "[No description]"
 msgstr ""
 
 msgid "[No description]"
 msgstr ""
 

-#: ../../boot.php:1411
+#: ../../boot.php:1449

 msgid "Event Reminders"
 msgstr ""
 
 msgid "Event Reminders"
 msgstr ""
 

-#: ../../boot.php:1412
+#: ../../boot.php:1450

 msgid "Events this week:"
 msgstr ""
 
 msgid "Events this week:"
 msgstr ""
 

-#: ../../boot.php:1629
+#: ../../boot.php:1680

 msgid "Status Messages and Posts"
 msgstr ""
 
 msgid "Status Messages and Posts"
 msgstr ""
 

-#: ../../boot.php:1636
+#: ../../boot.php:1687

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

-#: ../../boot.php:1653
+#: ../../boot.php:1704

 msgid "Events and Calendar"
 msgstr ""
 
 msgid "Events and Calendar"
 msgstr ""
 

-#: ../../boot.php:1660
+#: ../../boot.php:1711

 msgid "Only You Can See This"
 msgstr ""
 msgid "Only You Can See This"
 msgstr ""

+
+#: ../../index.php:380
+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 ""