]> git.mxchange.org Git - friendica.git/blobdiff - util/messages.po
Merge pull request #422 from annando/master
[friendica.git] / util / messages.po
index cf2f02d4e338a0da725e72a8379ea34c66c3f35f..966d51cc6ce3a83e22f7429bac45bbe04d9a69f2 100644 (file)
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1346\n"
+"Project-Id-Version: 3.0.1422\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-18 10:00-0700\n"
+"POT-Creation-Date: 2012-08-01 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"
@@ -35,27 +35,28 @@ msgid "Contact update failed."
 msgstr ""
 
 #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44
-#: ../../mod/fsuggest.php:78 ../../mod/events.php:138 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:865
-#: ../../mod/editpost.php:10 ../../mod/install.php:171
-#: ../../mod/notifications.php:66 ../../mod/contacts.php:125
-#: ../../mod/settings.php:104 ../../mod/settings.php:535
-#: ../../mod/settings.php:540 ../../mod/manage.php:86 ../../mod/network.php:6
+#: ../../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/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/notes.php:20 ../../mod/wallmessage.php:9
 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
 #: ../../mod/group.php:19 ../../mod/viewcontacts.php:22
-#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:124
-#: ../../mod/item.php:140 ../../mod/profile_photo.php:19
-#: ../../mod/profile_photo.php:139 ../../mod/profile_photo.php:150
-#: ../../mod/profile_photo.php:163 ../../mod/message.php:44
-#: ../../mod/message.php:96 ../../mod/allfriends.php:9
+#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:125
+#: ../../mod/item.php:141 ../../mod/profile_photo.php:19
+#: ../../mod/profile_photo.php:142 ../../mod/profile_photo.php:153
+#: ../../mod/profile_photo.php:166 ../../mod/message.php:38
+#: ../../mod/message.php:168 ../../mod/allfriends.php:9
 #: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53
-#: ../../mod/follow.php:8 ../../mod/display.php:138 ../../mod/profiles.php:7
-#: ../../mod/profiles.php:365 ../../mod/delegate.php:6
+#: ../../mod/follow.php:9 ../../mod/display.php:130 ../../mod/profiles.php:7
+#: ../../mod/profiles.php:408 ../../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:503
-#: ../../include/items.php:3214 ../../index.php:306
+#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510
+#: ../../addon/facebook/facebook.php:516 ../../addon/dav/layout.fnk.php:354
+#: ../../include/items.php:3813 ../../index.php:315
 msgid "Permission denied."
 msgstr ""
 
@@ -84,8 +85,8 @@ msgstr ""
 msgid "Return to contact editor"
 msgstr ""
 
-#: ../../mod/crepair.php:148 ../../mod/settings.php:555
-#: ../../mod/settings.php:581 ../../mod/admin.php:643 ../../mod/admin.php:652
+#: ../../mod/crepair.php:148 ../../mod/settings.php:539
+#: ../../mod/settings.php:565 ../../mod/admin.php:664 ../../mod/admin.php:673
 msgid "Name"
 msgstr ""
 
@@ -122,27 +123,37 @@ msgid "New photo from this URL"
 msgstr ""
 
 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
-#: ../../mod/events.php:428 ../../mod/photos.php:900 ../../mod/photos.php:958
-#: ../../mod/photos.php:1193 ../../mod/photos.php:1233
-#: ../../mod/photos.php:1273 ../../mod/photos.php:1304
-#: ../../mod/install.php:251 ../../mod/install.php:289
-#: ../../mod/localtime.php:45 ../../mod/contacts.php:322
-#: ../../mod/settings.php:553 ../../mod/settings.php:699
-#: ../../mod/settings.php:760 ../../mod/settings.php:964
-#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:404
-#: ../../mod/admin.php:640 ../../mod/admin.php:776 ../../mod/admin.php:975
-#: ../../mod/admin.php:1062 ../../mod/profiles.php:534
-#: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:605
+#: ../../mod/events.php:439 ../../mod/photos.php:971 ../../mod/photos.php:1042
+#: ../../mod/photos.php:1285 ../../mod/photos.php:1325
+#: ../../mod/photos.php:1365 ../../mod/photos.php:1396
+#: ../../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/message.php:294
+#: ../../mod/message.php:478 ../../mod/admin.php:422 ../../mod/admin.php:661
+#: ../../mod/admin.php:797 ../../mod/admin.php:996 ../../mod/admin.php:1083
+#: ../../mod/profiles.php:578 ../../mod/invite.php:119
+#: ../../addon/fromgplus/fromgplus.php:40
+#: ../../addon/facebook/facebook.php:619
+#: ../../addon/snautofollow/snautofollow.php:64 ../../addon/bg/bg.php:90
 #: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93
-#: ../../addon/nsfw/nsfw.php:57 ../../addon/planets/planets.php:158
+#: ../../addon/nsfw/nsfw.php:57 ../../addon/page/page.php:210
+#: ../../addon/planets/planets.php:158
 #: ../../addon/uhremotestorage/uhremotestorage.php:89
 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
-#: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187
-#: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:82
-#: ../../addon/blockem/blockem.php:57 ../../addon/qcomment/qcomment.php:61
+#: ../../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/notimeline/notimeline.php:64 ../../addon/blockem/blockem.php:57
+#: ../../addon/qcomment/qcomment.php:61
 #: ../../addon/openstreetmap/openstreetmap.php:70
+#: ../../addon/group_text/group_text.php:84
+#: ../../addon/libravatar/libravatar.php:99
+#: ../../addon/libertree/libertree.php:90 ../../addon/altpager/altpager.php:87
 #: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84
-#: ../../addon/blackout/blackout.php:98 ../../addon/gravatar/gravatar.php:86
+#: ../../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/statusnet/statusnet.php:278
@@ -150,18 +161,18 @@ msgstr ""
 #: ../../addon/statusnet/statusnet.php:318
 #: ../../addon/statusnet/statusnet.php:325
 #: ../../addon/statusnet/statusnet.php:353
-#: ../../addon/statusnet/statusnet.php:561 ../../addon/tumblr/tumblr.php:90
+#: ../../addon/statusnet/statusnet.php:576 ../../addon/tumblr/tumblr.php:90
 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88
-#: ../../addon/wppost/wppost.php:109 ../../addon/showmore/showmore.php:48
+#: ../../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:381
+#: ../../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
 #: ../../view/theme/cleanzero/config.php:80
-#: ../../view/theme/diabook/theme.php:752
+#: ../../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:558
+#: ../../include/conversation.php:696
 msgid "Submit"
 msgstr ""
 
@@ -169,15 +180,16 @@ msgstr ""
 msgid "Help:"
 msgstr ""
 
-#: ../../mod/help.php:34 ../../include/nav.php:86
+#: ../../mod/help.php:34 ../../addon/dav/layout.fnk.php:225
+#: ../../include/nav.php:86
 msgid "Help"
 msgstr ""
 
-#: ../../mod/help.php:38 ../../index.php:225
+#: ../../mod/help.php:38 ../../index.php:224
 msgid "Not Found"
 msgstr ""
 
-#: ../../mod/help.php:41 ../../index.php:228
+#: ../../mod/help.php:41 ../../index.php:227
 msgid "Page not found."
 msgstr ""
 
@@ -186,7 +198,7 @@ msgstr ""
 msgid "File exceeds size limit of %d"
 msgstr ""
 
-#: ../../mod/wall_attach.php:86 ../../mod/wall_attach.php:97
+#: ../../mod/wall_attach.php:99 ../../mod/wall_attach.php:110
 msgid "File upload failed."
 msgstr ""
 
@@ -203,84 +215,94 @@ msgstr ""
 msgid "Suggest a friend for %s"
 msgstr ""
 
-#: ../../mod/events.php:65
-msgid "Event description and start time are required."
+#: ../../mod/events.php:66
+msgid "Event title and start time are required."
 msgstr ""
 
-#: ../../mod/events.php:258
+#: ../../mod/events.php:263
 msgid "l, F j"
 msgstr ""
 
-#: ../../mod/events.php:280
+#: ../../mod/events.php:285
 msgid "Edit event"
 msgstr ""
 
-#: ../../mod/events.php:300 ../../include/text.php:1054
+#: ../../mod/events.php:307 ../../include/text.php:1110
 msgid "link to source"
 msgstr ""
 
-#: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:126
-#: ../../include/nav.php:52 ../../boot.php:1503
+#: ../../mod/events.php:331 ../../view/theme/diabook/theme.php:131
+#: ../../include/nav.php:52 ../../boot.php:1634
 msgid "Events"
 msgstr ""
 
-#: ../../mod/events.php:325
+#: ../../mod/events.php:332
 msgid "Create New Event"
 msgstr ""
 
-#: ../../mod/events.php:326
+#: ../../mod/events.php:333 ../../addon/dav/layout.fnk.php:263
 msgid "Previous"
 msgstr ""
 
-#: ../../mod/events.php:327 ../../mod/install.php:210
+#: ../../mod/events.php:334 ../../mod/install.php:205
+#: ../../addon/dav/layout.fnk.php:266
 msgid "Next"
 msgstr ""
 
-#: ../../mod/events.php:399
+#: ../../mod/events.php:407
 msgid "hour:minute"
 msgstr ""
 
-#: ../../mod/events.php:408
+#: ../../mod/events.php:417
 msgid "Event details"
 msgstr ""
 
-#: ../../mod/events.php:409
+#: ../../mod/events.php:418
 #, php-format
-msgid "Format is %s %s. Starting date and Description are required."
+msgid "Format is %s %s. Starting date and Title are required."
 msgstr ""
 
-#: ../../mod/events.php:411
+#: ../../mod/events.php:420
 msgid "Event Starts:"
 msgstr ""
 
-#: ../../mod/events.php:414
+#: ../../mod/events.php:420 ../../mod/events.php:434
+msgid "Required"
+msgstr ""
+
+#: ../../mod/events.php:423
 msgid "Finish date/time is not known or not relevant"
 msgstr ""
 
-#: ../../mod/events.php:416
+#: ../../mod/events.php:425
 msgid "Event Finishes:"
 msgstr ""
 
-#: ../../mod/events.php:419
+#: ../../mod/events.php:428
 msgid "Adjust for viewer timezone"
 msgstr ""
 
-#: ../../mod/events.php:421
+#: ../../mod/events.php:430
 msgid "Description:"
 msgstr ""
 
-#: ../../mod/events.php:423 ../../include/event.php:37
-#: ../../include/bb2diaspora.php:260 ../../boot.php:1102
+#: ../../mod/events.php:432 ../../mod/directory.php:132
+#: ../../include/event.php:40 ../../include/bb2diaspora.php:447
+#: ../../boot.php:1186
 msgid "Location:"
 msgstr ""
 
-#: ../../mod/events.php:425
+#: ../../mod/events.php:434
+msgid "Title:"
+msgstr ""
+
+#: ../../mod/events.php:436
 msgid "Share this event"
 msgstr ""
 
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/dfrn_request.php:826 ../../mod/settings.php:554
-#: ../../mod/settings.php:580 ../../addon/js_upload/js_upload.php:45
+#: ../../mod/dfrn_request.php:845 ../../mod/settings.php:538
+#: ../../mod/settings.php:564 ../../addon/js_upload/js_upload.php:45
 msgid "Cancel"
 msgstr ""
 
@@ -297,6 +319,7 @@ msgid "Select a tag to remove: "
 msgstr ""
 
 #: ../../mod/tagrm.php:93 ../../mod/delegate.php:130
+#: ../../addon/dav/common/wdcal_edit.inc.php:468
 msgid "Remove"
 msgstr ""
 
@@ -323,248 +346,276 @@ msgid ""
 "and/or create new posts for you?"
 msgstr ""
 
-#: ../../mod/api.php:105 ../../mod/dfrn_request.php:814
-#: ../../mod/settings.php:875 ../../mod/settings.php:881
-#: ../../mod/settings.php:889 ../../mod/settings.php:893
-#: ../../mod/settings.php:898 ../../mod/settings.php:904
-#: ../../mod/settings.php:910 ../../mod/settings.php:916
-#: ../../mod/settings.php:952 ../../mod/settings.php:953
-#: ../../mod/settings.php:954 ../../mod/settings.php:955
-#: ../../mod/register.php:532 ../../mod/profiles.php:511
+#: ../../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:558
 msgid "Yes"
 msgstr ""
 
-#: ../../mod/api.php:106 ../../mod/dfrn_request.php:815
-#: ../../mod/settings.php:875 ../../mod/settings.php:881
-#: ../../mod/settings.php:889 ../../mod/settings.php:893
-#: ../../mod/settings.php:898 ../../mod/settings.php:904
-#: ../../mod/settings.php:910 ../../mod/settings.php:916
-#: ../../mod/settings.php:952 ../../mod/settings.php:953
-#: ../../mod/settings.php:954 ../../mod/settings.php:955
-#: ../../mod/register.php:533 ../../mod/profiles.php:512
+#: ../../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:559
 msgid "No"
 msgstr ""
 
-#: ../../mod/photos.php:43 ../../boot.php:1497
+#: ../../mod/photos.php:46 ../../boot.php:1627
 msgid "Photo Albums"
 msgstr ""
 
-#: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:879
-#: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1382
-#: ../../mod/photos.php:1394 ../../addon/communityhome/communityhome.php:110
-#: ../../view/theme/diabook/theme.php:593
+#: ../../mod/photos.php:54 ../../mod/photos.php:137 ../../mod/photos.php:952
+#: ../../mod/photos.php:1034 ../../mod/photos.php:1049
+#: ../../mod/photos.php:1474 ../../mod/photos.php:1486
+#: ../../addon/communityhome/communityhome.php:110
+#: ../../view/theme/diabook/theme.php:598
 msgid "Contact Photos"
 msgstr ""
 
-#: ../../mod/photos.php:58 ../../mod/photos.php:975 ../../mod/photos.php:1424
+#: ../../mod/photos.php:61 ../../mod/photos.php:1059 ../../mod/photos.php:1524
 msgid "Upload New Photos"
 msgstr ""
 
-#: ../../mod/photos.php:69 ../../mod/settings.php:20
+#: ../../mod/photos.php:74 ../../mod/settings.php:23
 msgid "everybody"
 msgstr ""
 
-#: ../../mod/photos.php:140
+#: ../../mod/photos.php:126
 msgid "Contact information unavailable"
 msgstr ""
 
-#: ../../mod/photos.php:151 ../../mod/photos.php:597 ../../mod/photos.php:950
-#: ../../mod/photos.php:965 ../../mod/register.php:335
-#: ../../mod/register.php:342 ../../mod/register.php:349
-#: ../../mod/profile_photo.php:60 ../../mod/profile_photo.php:67
-#: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174
-#: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261
+#: ../../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
 #: ../../addon/communityhome/communityhome.php:111
-#: ../../view/theme/diabook/theme.php:594
+#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:304
+#: ../../include/user.php:311 ../../include/user.php:318
 msgid "Profile Photos"
 msgstr ""
 
-#: ../../mod/photos.php:161
+#: ../../mod/photos.php:147
 msgid "Album not found."
 msgstr ""
 
-#: ../../mod/photos.php:179 ../../mod/photos.php:959
+#: ../../mod/photos.php:165 ../../mod/photos.php:1043
 msgid "Delete Album"
 msgstr ""
 
-#: ../../mod/photos.php:242 ../../mod/photos.php:1194
+#: ../../mod/photos.php:228 ../../mod/photos.php:1286
 msgid "Delete Photo"
 msgstr ""
 
-#: ../../mod/photos.php:528
+#: ../../mod/photos.php:572
 msgid "was tagged in a"
 msgstr ""
 
-#: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70
+#: ../../mod/photos.php:572 ../../mod/like.php:145 ../../mod/tagger.php:70
 #: ../../addon/communityhome/communityhome.php:163
-#: ../../view/theme/diabook/theme.php:565 ../../include/text.php:1305
-#: ../../include/diaspora.php:1662 ../../include/conversation.php:53
-#: ../../include/conversation.php:126
+#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1362
+#: ../../include/diaspora.php:1793 ../../include/conversation.php:114
+#: ../../include/conversation.php:230
 msgid "photo"
 msgstr ""
 
-#: ../../mod/photos.php:528
+#: ../../mod/photos.php:572
 msgid "by"
 msgstr ""
 
-#: ../../mod/photos.php:631 ../../addon/js_upload/js_upload.php:315
+#: ../../mod/photos.php:677 ../../addon/js_upload/js_upload.php:315
 msgid "Image exceeds size limit of "
 msgstr ""
 
-#: ../../mod/photos.php:639
+#: ../../mod/photos.php:685
 msgid "Image file is empty."
 msgstr ""
 
-#: ../../mod/photos.php:653 ../../mod/profile_photo.php:124
-#: ../../mod/wall_upload.php:83
+#: ../../mod/photos.php:717 ../../mod/profile_photo.php:126
+#: ../../mod/wall_upload.php:99
 msgid "Unable to process image."
 msgstr ""
 
-#: ../../mod/photos.php:673 ../../mod/profile_photo.php:257
-#: ../../mod/wall_upload.php:102
+#: ../../mod/photos.php:744 ../../mod/profile_photo.php:266
+#: ../../mod/wall_upload.php:125
 msgid "Image upload failed."
 msgstr ""
 
-#: ../../mod/photos.php:759 ../../mod/community.php:16
-#: ../../mod/dfrn_request.php:740 ../../mod/viewcontacts.php:17
+#: ../../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
 msgid "Public access denied."
 msgstr ""
 
-#: ../../mod/photos.php:769
+#: ../../mod/photos.php:840
 msgid "No photos selected"
 msgstr ""
 
-#: ../../mod/photos.php:846
+#: ../../mod/photos.php:919
 msgid "Access to this item is restricted."
 msgstr ""
 
-#: ../../mod/photos.php:907
+#: ../../mod/photos.php:981
+#, php-format
+msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."
+msgstr ""
+
+#: ../../mod/photos.php:984
+#, php-format
+msgid "You have used %1$.2f Mbytes of photo storage."
+msgstr ""
+
+#: ../../mod/photos.php:990
 msgid "Upload Photos"
 msgstr ""
 
-#: ../../mod/photos.php:910 ../../mod/photos.php:954
+#: ../../mod/photos.php:994 ../../mod/photos.php:1038
 msgid "New album name: "
 msgstr ""
 
-#: ../../mod/photos.php:911
+#: ../../mod/photos.php:995
 msgid "or existing album name: "
 msgstr ""
 
-#: ../../mod/photos.php:912
+#: ../../mod/photos.php:996
 msgid "Do not show a status post for this upload"
 msgstr ""
 
-#: ../../mod/photos.php:914 ../../mod/photos.php:1189
+#: ../../mod/photos.php:998 ../../mod/photos.php:1281
 msgid "Permissions"
 msgstr ""
 
-#: ../../mod/photos.php:969
+#: ../../mod/photos.php:1053
 msgid "Edit Album"
 msgstr ""
 
-#: ../../mod/photos.php:984 ../../mod/photos.php:1407
+#: ../../mod/photos.php:1077 ../../mod/photos.php:1507
 msgid "View Photo"
 msgstr ""
 
-#: ../../mod/photos.php:1019
+#: ../../mod/photos.php:1112
 msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: ../../mod/photos.php:1021
+#: ../../mod/photos.php:1114
 msgid "Photo not available"
 msgstr ""
 
-#: ../../mod/photos.php:1071
+#: ../../mod/photos.php:1164
 msgid "View photo"
 msgstr ""
 
-#: ../../mod/photos.php:1071
+#: ../../mod/photos.php:1164
 msgid "Edit photo"
 msgstr ""
 
-#: ../../mod/photos.php:1072
+#: ../../mod/photos.php:1165
 msgid "Use as profile photo"
 msgstr ""
 
-#: ../../mod/photos.php:1078 ../../include/conversation.php:483
+#: ../../mod/photos.php:1171 ../../mod/content.php:601
+#: ../../include/conversation.php:606
 msgid "Private Message"
 msgstr ""
 
-#: ../../mod/photos.php:1100
+#: ../../mod/photos.php:1190
 msgid "View Full Size"
 msgstr ""
 
-#: ../../mod/photos.php:1168
+#: ../../mod/photos.php:1258
 msgid "Tags: "
 msgstr ""
 
-#: ../../mod/photos.php:1171
+#: ../../mod/photos.php:1261
 msgid "[Remove any tag]"
 msgstr ""
 
-#: ../../mod/photos.php:1182
+#: ../../mod/photos.php:1271
+msgid "Rotate CW (right)"
+msgstr ""
+
+#: ../../mod/photos.php:1272
+msgid "Rotate CCW (left)"
+msgstr ""
+
+#: ../../mod/photos.php:1274
 msgid "New album name"
 msgstr ""
 
-#: ../../mod/photos.php:1185
+#: ../../mod/photos.php:1277
 msgid "Caption"
 msgstr ""
 
-#: ../../mod/photos.php:1187
+#: ../../mod/photos.php:1279
 msgid "Add a Tag"
 msgstr ""
 
-#: ../../mod/photos.php:1191
+#: ../../mod/photos.php:1283
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: ../../mod/photos.php:1211 ../../include/conversation.php:532
+#: ../../mod/photos.php:1303 ../../mod/content.php:665
+#: ../../include/conversation.php:670
 msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1212 ../../include/conversation.php:533
+#: ../../mod/photos.php:1304 ../../mod/content.php:666
+#: ../../include/conversation.php:671
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1213 ../../include/conversation.php:967
+#: ../../mod/photos.php:1305 ../../include/conversation.php:1128
 msgid "Share"
 msgstr ""
 
-#: ../../mod/photos.php:1214 ../../mod/editpost.php:104
-#: ../../mod/wallmessage.php:145 ../../mod/message.php:214
-#: ../../mod/message.php:408 ../../include/conversation.php:364
-#: ../../include/conversation.php:709 ../../include/conversation.php:986
+#: ../../mod/photos.php:1306 ../../mod/editpost.php:112
+#: ../../mod/content.php:482 ../../mod/content.php:842
+#: ../../mod/wallmessage.php:152 ../../mod/message.php:293
+#: ../../mod/message.php:479 ../../include/conversation.php:487
+#: ../../include/conversation.php:847 ../../include/conversation.php:1147
 msgid "Please wait"
 msgstr ""
 
-#: ../../mod/photos.php:1230 ../../mod/photos.php:1270
-#: ../../mod/photos.php:1301 ../../include/conversation.php:555
+#: ../../mod/photos.php:1322 ../../mod/photos.php:1362
+#: ../../mod/photos.php:1393 ../../mod/content.php:688
+#: ../../include/conversation.php:693
 msgid "This is you"
 msgstr ""
 
-#: ../../mod/photos.php:1232 ../../mod/photos.php:1272
-#: ../../mod/photos.php:1303 ../../include/conversation.php:557
-#: ../../boot.php:516
+#: ../../mod/photos.php:1324 ../../mod/photos.php:1364
+#: ../../mod/photos.php:1395 ../../mod/content.php:690
+#: ../../include/conversation.php:695 ../../boot.php:569
 msgid "Comment"
 msgstr ""
 
-#: ../../mod/photos.php:1234 ../../mod/editpost.php:125
-#: ../../include/conversation.php:567 ../../include/conversation.php:1004
+#: ../../mod/photos.php:1326 ../../mod/editpost.php:133
+#: ../../mod/content.php:700 ../../include/conversation.php:705
+#: ../../include/conversation.php:1165
 msgid "Preview"
 msgstr ""
 
-#: ../../mod/photos.php:1331 ../../mod/settings.php:616
-#: ../../mod/settings.php:697 ../../mod/group.php:168 ../../mod/admin.php:647
-#: ../../include/conversation.php:321 ../../include/conversation.php:587
+#: ../../mod/photos.php:1423 ../../mod/content.php:439
+#: ../../mod/content.php:720 ../../mod/settings.php:600
+#: ../../mod/settings.php:689 ../../mod/group.php:168 ../../mod/admin.php:668
+#: ../../include/conversation.php:444 ../../include/conversation.php:725
 msgid "Delete"
 msgstr ""
 
-#: ../../mod/photos.php:1413
+#: ../../mod/photos.php:1513
 msgid "View Album"
 msgstr ""
 
-#: ../../mod/photos.php:1422
+#: ../../mod/photos.php:1522
 msgid "Recent Photos"
 msgstr ""
 
@@ -572,12 +623,13 @@ msgstr ""
 msgid "Not available."
 msgstr ""
 
-#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:128
+#: ../../mod/community.php:30 ../../view/theme/diabook/theme.php:133
 #: ../../include/nav.php:101
 msgid "Community"
 msgstr ""
 
-#: ../../mod/community.php:61 ../../mod/search.php:128
+#: ../../mod/community.php:61 ../../mod/community.php:86
+#: ../../mod/search.php:146 ../../mod/search.php:172
 msgid "No results."
 msgstr ""
 
@@ -621,274 +673,277 @@ msgstr ""
 msgid "Edit post"
 msgstr ""
 
-#: ../../mod/editpost.php:80 ../../include/conversation.php:953
+#: ../../mod/editpost.php:88 ../../include/conversation.php:1114
 msgid "Post to Email"
 msgstr ""
 
-#: ../../mod/editpost.php:95 ../../mod/settings.php:615
-#: ../../include/conversation.php:574
+#: ../../mod/editpost.php:103 ../../mod/content.php:707
+#: ../../mod/settings.php:599 ../../include/conversation.php:712
 msgid "Edit"
 msgstr ""
 
-#: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143
-#: ../../mod/message.php:212 ../../mod/message.php:406
-#: ../../include/conversation.php:968
+#: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
+#: ../../mod/message.php:291 ../../mod/message.php:476
+#: ../../include/conversation.php:1129
 msgid "Upload photo"
 msgstr ""
 
-#: ../../mod/editpost.php:97 ../../include/conversation.php:970
+#: ../../mod/editpost.php:105 ../../include/conversation.php:1131
 msgid "Attach file"
 msgstr ""
 
-#: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144
-#: ../../mod/message.php:213 ../../mod/message.php:407
-#: ../../include/conversation.php:972
+#: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151
+#: ../../mod/message.php:292 ../../mod/message.php:477
+#: ../../include/conversation.php:1133
 msgid "Insert web link"
 msgstr ""
 
-#: ../../mod/editpost.php:99
+#: ../../mod/editpost.php:107
 msgid "Insert YouTube video"
 msgstr ""
 
-#: ../../mod/editpost.php:100
+#: ../../mod/editpost.php:108
 msgid "Insert Vorbis [.ogg] video"
 msgstr ""
 
-#: ../../mod/editpost.php:101
+#: ../../mod/editpost.php:109
 msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../mod/editpost.php:102 ../../include/conversation.php:978
+#: ../../mod/editpost.php:110 ../../include/conversation.php:1139
 msgid "Set your location"
 msgstr ""
 
-#: ../../mod/editpost.php:103 ../../include/conversation.php:980
+#: ../../mod/editpost.php:111 ../../include/conversation.php:1141
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:987
+#: ../../mod/editpost.php:113 ../../include/conversation.php:1148
 msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:996
+#: ../../mod/editpost.php:121 ../../include/conversation.php:1157
 msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/editpost.php:114 ../../include/conversation.php:997
+#: ../../mod/editpost.php:122 ../../include/conversation.php:1158
 msgid "Public post"
 msgstr ""
 
-#: ../../mod/editpost.php:117 ../../include/conversation.php:983
+#: ../../mod/editpost.php:125 ../../include/conversation.php:1144
 msgid "Set title"
 msgstr ""
 
-#: ../../mod/editpost.php:119 ../../include/conversation.php:985
+#: ../../mod/editpost.php:127 ../../include/conversation.php:1146
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../mod/editpost.php:120 ../../include/conversation.php:999
+#: ../../mod/editpost.php:128 ../../include/conversation.php:1160
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
+#: ../../mod/editpost.php:135 ../../include/conversation.php:1166
+msgid "Friendica mobile web"
+msgstr ""
+
 #: ../../mod/dfrn_request.php:93
 msgid "This introduction has already been accepted."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:117 ../../mod/dfrn_request.php:495
+#: ../../mod/dfrn_request.php:118 ../../mod/dfrn_request.php:512
 msgid "Profile location is not valid or does not contain profile information."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:122 ../../mod/dfrn_request.php:500
+#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:517
 msgid "Warning: profile location has no identifiable owner name."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:124 ../../mod/dfrn_request.php:502
+#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:519
 msgid "Warning: profile location has no profile photo."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:505
+#: ../../mod/dfrn_request.php:128 ../../mod/dfrn_request.php:522
 #, php-format
 msgid "%d required parameter was not found at the given location"
 msgid_plural "%d required parameters were not found at the given location"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/dfrn_request.php:168
+#: ../../mod/dfrn_request.php:170
 msgid "Introduction complete."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:192
+#: ../../mod/dfrn_request.php:209
 msgid "Unrecoverable protocol error."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:220
+#: ../../mod/dfrn_request.php:237
 msgid "Profile unavailable."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:245
+#: ../../mod/dfrn_request.php:262
 #, php-format
 msgid "%s has received too many connection requests today."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:246
+#: ../../mod/dfrn_request.php:263
 msgid "Spam protection measures have been invoked."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:247
+#: ../../mod/dfrn_request.php:264
 msgid "Friends are advised to please try again in 24 hours."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:309
+#: ../../mod/dfrn_request.php:326
 msgid "Invalid locator"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:318
+#: ../../mod/dfrn_request.php:335
 msgid "Invalid email address."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:344
+#: ../../mod/dfrn_request.php:361
 msgid "This account has not been configured for email. Request failed."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:440
+#: ../../mod/dfrn_request.php:457
 msgid "Unable to resolve your name at the provided location."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:453
+#: ../../mod/dfrn_request.php:470
 msgid "You have already introduced yourself here."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:457
+#: ../../mod/dfrn_request.php:474
 #, php-format
 msgid "Apparently you are already friends with %s."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:478
+#: ../../mod/dfrn_request.php:495
 msgid "Invalid profile URL."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:484 ../../mod/follow.php:23
+#: ../../mod/dfrn_request.php:501 ../../include/follow.php:27
 msgid "Disallowed profile URL."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:553 ../../mod/contacts.php:102
+#: ../../mod/dfrn_request.php:570 ../../mod/contacts.php:116
 msgid "Failed to update contact record."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:574
+#: ../../mod/dfrn_request.php:591
 msgid "Your introduction has been sent."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:627
+#: ../../mod/dfrn_request.php:644
 msgid "Please login to confirm introduction."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:641
+#: ../../mod/dfrn_request.php:658
 msgid ""
 "Incorrect identity currently logged in. Please login to <strong>this</"
 "strong> profile."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:653
+#: ../../mod/dfrn_request.php:669
+msgid "Hide this contact"
+msgstr ""
+
+#: ../../mod/dfrn_request.php:672
 #, php-format
 msgid "Welcome home %s."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:654
+#: ../../mod/dfrn_request.php:673
 #, php-format
 msgid "Please confirm your introduction/connection request to %s."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:655
+#: ../../mod/dfrn_request.php:674
 msgid "Confirm"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:696 ../../include/items.php:2729
+#: ../../mod/dfrn_request.php:715 ../../include/items.php:3204
 msgid "[Name Withheld]"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:789
+#: ../../mod/dfrn_request.php:808
 msgid ""
 "Please enter your 'Identity Address' from one of the following supported "
 "communications networks:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:805
+#: ../../mod/dfrn_request.php:824
 msgid "<strike>Connect as an email follower</strike> (Coming soon)"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:807
+#: ../../mod/dfrn_request.php:826
 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:810
+#: ../../mod/dfrn_request.php:829
 msgid "Friend/Connection Request"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:811
+#: ../../mod/dfrn_request.php:830
 msgid ""
 "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
 "testuser@identi.ca"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:812
+#: ../../mod/dfrn_request.php:831
 msgid "Please answer the following:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:813
+#: ../../mod/dfrn_request.php:832
 #, php-format
 msgid "Does %s know you?"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:816
+#: ../../mod/dfrn_request.php:835
 msgid "Add a personal note:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:818 ../../include/contact_selectors.php:76
+#: ../../mod/dfrn_request.php:837 ../../include/contact_selectors.php:76
 msgid "Friendica"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:819
+#: ../../mod/dfrn_request.php:838
 msgid "StatusNet/Federated Social Web"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:820 ../../mod/settings.php:650
+#: ../../mod/dfrn_request.php:839 ../../mod/settings.php:634
 #: ../../include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:821
+#: ../../mod/dfrn_request.php:840
 #, php-format
 msgid ""
 " - please do not use this form.  Instead, enter %s into your Diaspora search "
 "bar."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:822
+#: ../../mod/dfrn_request.php:841
 msgid "Your Identity Address:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:825
+#: ../../mod/dfrn_request.php:844
 msgid "Submit Request"
 msgstr ""
 
-#: ../../mod/install.php:111
+#: ../../mod/install.php:117
 msgid "Friendica Social Communications Server - Setup"
 msgstr ""
 
-#: ../../mod/install.php:117 ../../mod/install.php:157
-#: ../../mod/install.php:230
-msgid "Database connection"
-msgstr ""
-
-#: ../../mod/install.php:124
+#: ../../mod/install.php:123
 msgid "Could not connect to database."
 msgstr ""
 
-#: ../../mod/install.php:128
+#: ../../mod/install.php:127
 msgid "Could not create table."
 msgstr ""
 
@@ -896,231 +951,245 @@ msgstr ""
 msgid "Your Friendica site database has been installed."
 msgstr ""
 
-#: ../../mod/install.php:134
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
-msgstr ""
-
-#: ../../mod/install.php:135 ../../mod/install.php:151
-#: ../../mod/install.php:209
-msgid "Please see the file \"INSTALL.txt\"."
-msgstr ""
-
-#: ../../mod/install.php:137
-msgid "Proceed to registration"
-msgstr ""
-
-#: ../../mod/install.php:143
-msgid "Proceed with Installation"
-msgstr ""
-
-#: ../../mod/install.php:150
+#: ../../mod/install.php:138
 msgid ""
 "You may need to import the file \"database.sql\" manually using phpmyadmin "
 "or mysql."
 msgstr ""
 
-#: ../../mod/install.php:158
-msgid "Database import failed."
+#: ../../mod/install.php:139 ../../mod/install.php:204
+#: ../../mod/install.php:489
+msgid "Please see the file \"INSTALL.txt\"."
 msgstr ""
 
-#: ../../mod/install.php:206
+#: ../../mod/install.php:201
 msgid "System check"
 msgstr ""
 
-#: ../../mod/install.php:211
+#: ../../mod/install.php:206
 msgid "Check again"
 msgstr ""
 
-#: ../../mod/install.php:231
+#: ../../mod/install.php:225
+msgid "Database connection"
+msgstr ""
+
+#: ../../mod/install.php:226
 msgid ""
 "In order to install Friendica we need to know how to connect to your "
 "database."
 msgstr ""
 
-#: ../../mod/install.php:232
+#: ../../mod/install.php:227
 msgid ""
 "Please contact your hosting provider or site administrator if you have "
 "questions about these settings."
 msgstr ""
 
-#: ../../mod/install.php:233
+#: ../../mod/install.php:228
 msgid ""
 "The database you specify below should already exist. If it does not, please "
 "create it before continuing."
 msgstr ""
 
-#: ../../mod/install.php:237
+#: ../../mod/install.php:232
 msgid "Database Server Name"
 msgstr ""
 
-#: ../../mod/install.php:238
+#: ../../mod/install.php:233
 msgid "Database Login Name"
 msgstr ""
 
-#: ../../mod/install.php:239
+#: ../../mod/install.php:234
 msgid "Database Login Password"
 msgstr ""
 
-#: ../../mod/install.php:240
+#: ../../mod/install.php:235
 msgid "Database Name"
 msgstr ""
 
-#: ../../mod/install.php:241 ../../mod/install.php:280
+#: ../../mod/install.php:236 ../../mod/install.php:275
 msgid "Site administrator email address"
 msgstr ""
 
-#: ../../mod/install.php:241 ../../mod/install.php:280
+#: ../../mod/install.php:236 ../../mod/install.php:275
 msgid ""
 "Your account email address must match this in order to use the web admin "
 "panel."
 msgstr ""
 
-#: ../../mod/install.php:245 ../../mod/install.php:283
+#: ../../mod/install.php:240 ../../mod/install.php:278
 msgid "Please select a default timezone for your website"
 msgstr ""
 
-#: ../../mod/install.php:270
+#: ../../mod/install.php:265
 msgid "Site settings"
 msgstr ""
 
-#: ../../mod/install.php:323
+#: ../../mod/install.php:318
 msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 
-#: ../../mod/install.php:326
+#: ../../mod/install.php:319
+msgid ""
+"If you don't have a command line version of PHP installed on server, you "
+"will not be able to run background polling via cron. See <a href='http://"
+"friendica.com/node/27'>'Activating scheduled tasks'</a>"
+msgstr ""
+
+#: ../../mod/install.php:323
 msgid "PHP executable path"
 msgstr ""
 
-#: ../../mod/install.php:326
-msgid "Enter full path to php executable"
+#: ../../mod/install.php:323
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
 msgstr ""
 
-#: ../../mod/install.php:331
+#: ../../mod/install.php:328
 msgid "Command line PHP"
 msgstr ""
 
-#: ../../mod/install.php:340
+#: ../../mod/install.php:337
 msgid ""
 "The command line version of PHP on your system does not have "
 "\"register_argc_argv\" enabled."
 msgstr ""
 
-#: ../../mod/install.php:341
+#: ../../mod/install.php:338
 msgid "This is required for message delivery to work."
 msgstr ""
 
-#: ../../mod/install.php:343
+#: ../../mod/install.php:340
 msgid "PHP register_argc_argv"
 msgstr ""
 
-#: ../../mod/install.php:364
+#: ../../mod/install.php:361
 msgid ""
 "Error: the \"openssl_pkey_new\" function on this system is not able to "
 "generate encryption keys"
 msgstr ""
 
-#: ../../mod/install.php:365
+#: ../../mod/install.php:362
 msgid ""
 "If running under Windows, please see \"http://www.php.net/manual/en/openssl."
 "installation.php\"."
 msgstr ""
 
-#: ../../mod/install.php:367
+#: ../../mod/install.php:364
 msgid "Generate encryption keys"
 msgstr ""
 
-#: ../../mod/install.php:374
+#: ../../mod/install.php:371
 msgid "libCurl PHP module"
 msgstr ""
 
-#: ../../mod/install.php:375
+#: ../../mod/install.php:372
 msgid "GD graphics PHP module"
 msgstr ""
 
-#: ../../mod/install.php:376
+#: ../../mod/install.php:373
 msgid "OpenSSL PHP module"
 msgstr ""
 
-#: ../../mod/install.php:377
+#: ../../mod/install.php:374
 msgid "mysqli PHP module"
 msgstr ""
 
-#: ../../mod/install.php:378
+#: ../../mod/install.php:375
 msgid "mb_string PHP module"
 msgstr ""
 
-#: ../../mod/install.php:383 ../../mod/install.php:385
+#: ../../mod/install.php:380 ../../mod/install.php:382
 msgid "Apache mod_rewrite module"
 msgstr ""
 
-#: ../../mod/install.php:383
+#: ../../mod/install.php:380
 msgid ""
 "Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: ../../mod/install.php:390
+#: ../../mod/install.php:388
 msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/install.php:394
+#: ../../mod/install.php:392
 msgid ""
 "Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: ../../mod/install.php:398
+#: ../../mod/install.php:396
 msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/install.php:402
+#: ../../mod/install.php:400
 msgid "Error: mysqli PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/install.php:406
+#: ../../mod/install.php:404
 msgid "Error: mb_string PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/install.php:423
+#: ../../mod/install.php:421
 msgid ""
 "The web installer needs to be able to create a file called \".htconfig.php\" "
 "in the top folder of your web server and it is unable to do so."
 msgstr ""
 
-#: ../../mod/install.php:424
+#: ../../mod/install.php:422
 msgid ""
 "This is most often a permission setting, as the web server may not be able "
 "to write files in your folder - even if you can."
 msgstr ""
 
-#: ../../mod/install.php:425
+#: ../../mod/install.php:423
 msgid ""
-"Please check with your site documentation or support people to see if this "
-"situation can be corrected."
+"At the end of this procedure, we will give you a text to save in a file "
+"named .htconfig.php in your Friendica top folder."
 msgstr ""
 
-#: ../../mod/install.php:426
+#: ../../mod/install.php:424
 msgid ""
-"If not, you may be required to perform a manual installation. Please see the "
-"file \"INSTALL.txt\" for instructions."
+"You can alternatively skip this procedure and perform a manual installation. "
+"Please see the file \"INSTALL.txt\" for instructions."
 msgstr ""
 
-#: ../../mod/install.php:429
+#: ../../mod/install.php:427
 msgid ".htconfig.php is writable"
 msgstr ""
 
-#: ../../mod/install.php:436
+#: ../../mod/install.php:439
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server configuration."
+msgstr ""
+
+#: ../../mod/install.php:441
+msgid "Url rewrite is working"
+msgstr ""
+
+#: ../../mod/install.php:451
 msgid ""
 "The database configuration file \".htconfig.php\" could not be written. "
 "Please use the enclosed text to create a configuration file in your web "
 "server root."
 msgstr ""
 
-#: ../../mod/install.php:461
+#: ../../mod/install.php:476
 msgid "Errors encountered creating database tables."
 msgstr ""
 
+#: ../../mod/install.php:487
+msgid "<h1>What next</h1>"
+msgstr ""
+
+#: ../../mod/install.php:488
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
+msgstr ""
+
 #: ../../mod/localtime.php:12 ../../include/event.php:11
-#: ../../include/bb2diaspora.php:238
+#: ../../include/bb2diaspora.php:425
 msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
@@ -1153,6 +1222,26 @@ msgstr ""
 msgid "Please select your timezone:"
 msgstr ""
 
+#: ../../mod/poke.php:192
+msgid "Poke/Prod"
+msgstr ""
+
+#: ../../mod/poke.php:193
+msgid "poke, prod or do other things to somebody"
+msgstr ""
+
+#: ../../mod/poke.php:194
+msgid "Recipient"
+msgstr ""
+
+#: ../../mod/poke.php:195
+msgid "Choose what you wish to do to recipient"
+msgstr ""
+
+#: ../../mod/poke.php:198
+msgid "Make this post private"
+msgstr ""
+
 #: ../../mod/match.php:12
 msgid "Profile Match"
 msgstr ""
@@ -1166,11 +1255,11 @@ msgid "is interested in:"
 msgstr ""
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1046
+#: ../../include/contact_widgets.php:9 ../../boot.php:1130
 msgid "Connect"
 msgstr ""
 
-#: ../../mod/match.php:65 ../../mod/dirfind.php:57
+#: ../../mod/match.php:65 ../../mod/dirfind.php:60
 msgid "No matches"
 msgstr ""
 
@@ -1182,6 +1271,138 @@ msgstr ""
 msgid "Visible to:"
 msgstr ""
 
+#: ../../mod/content.php:119 ../../mod/network.php:436
+msgid "No such group"
+msgstr ""
+
+#: ../../mod/content.php:130 ../../mod/network.php:447
+msgid "Group is empty"
+msgstr ""
+
+#: ../../mod/content.php:134 ../../mod/network.php:451
+msgid "Group: "
+msgstr ""
+
+#: ../../mod/content.php:438 ../../mod/content.php:719
+#: ../../include/conversation.php:443 ../../include/conversation.php:724
+msgid "Select"
+msgstr ""
+
+#: ../../mod/content.php:455 ../../mod/content.php:812
+#: ../../mod/content.php:813 ../../include/conversation.php:460
+#: ../../include/conversation.php:817 ../../include/conversation.php:818
+#, php-format
+msgid "View %s's profile @ %s"
+msgstr ""
+
+#: ../../mod/content.php:465 ../../mod/content.php:824
+#: ../../include/conversation.php:470 ../../include/conversation.php:829
+#, php-format
+msgid "%s from %s"
+msgstr ""
+
+#: ../../mod/content.php:480 ../../include/conversation.php:485
+msgid "View in context"
+msgstr ""
+
+#: ../../mod/content.php:586 ../../include/conversation.php:591
+#, 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:592
+#: ../../boot.php:570
+msgid "show more"
+msgstr ""
+
+#: ../../mod/content.php:665 ../../include/conversation.php:670
+msgid "like"
+msgstr ""
+
+#: ../../mod/content.php:666 ../../include/conversation.php:671
+msgid "dislike"
+msgstr ""
+
+#: ../../mod/content.php:668 ../../include/conversation.php:673
+msgid "Share this"
+msgstr ""
+
+#: ../../mod/content.php:668 ../../include/conversation.php:673
+msgid "share"
+msgstr ""
+
+#: ../../mod/content.php:692 ../../include/conversation.php:697
+msgid "Bold"
+msgstr ""
+
+#: ../../mod/content.php:693 ../../include/conversation.php:698
+msgid "Italic"
+msgstr ""
+
+#: ../../mod/content.php:694 ../../include/conversation.php:699
+msgid "Underline"
+msgstr ""
+
+#: ../../mod/content.php:695 ../../include/conversation.php:700
+msgid "Quote"
+msgstr ""
+
+#: ../../mod/content.php:696 ../../include/conversation.php:701
+msgid "Code"
+msgstr ""
+
+#: ../../mod/content.php:697 ../../include/conversation.php:702
+msgid "Image"
+msgstr ""
+
+#: ../../mod/content.php:698 ../../include/conversation.php:703
+msgid "Link"
+msgstr ""
+
+#: ../../mod/content.php:699 ../../include/conversation.php:704
+msgid "Video"
+msgstr ""
+
+#: ../../mod/content.php:732 ../../include/conversation.php:737
+msgid "add star"
+msgstr ""
+
+#: ../../mod/content.php:733 ../../include/conversation.php:738
+msgid "remove star"
+msgstr ""
+
+#: ../../mod/content.php:734 ../../include/conversation.php:739
+msgid "toggle star status"
+msgstr ""
+
+#: ../../mod/content.php:737 ../../include/conversation.php:742
+msgid "starred"
+msgstr ""
+
+#: ../../mod/content.php:738 ../../include/conversation.php:743
+msgid "add tag"
+msgstr ""
+
+#: ../../mod/content.php:742 ../../include/conversation.php:747
+msgid "save to folder"
+msgstr ""
+
+#: ../../mod/content.php:814 ../../include/conversation.php:819
+msgid "to"
+msgstr ""
+
+#: ../../mod/content.php:815 ../../include/conversation.php:820
+msgid "Wall-to-Wall"
+msgstr ""
+
+#: ../../mod/content.php:816 ../../include/conversation.php:821
+msgid "via Wall-To-Wall:"
+msgstr ""
+
 #: ../../mod/home.php:26 ../../addon/communityhome/communityhome.php:179
 #, php-format
 msgid "Welcome to %s"
@@ -1197,8 +1418,8 @@ msgid "Discard"
 msgstr ""
 
 #: ../../mod/notifications.php:51 ../../mod/notifications.php:160
-#: ../../mod/notifications.php:206 ../../mod/contacts.php:296
-#: ../../mod/contacts.php:348
+#: ../../mod/notifications.php:206 ../../mod/contacts.php:314
+#: ../../mod/contacts.php:368
 msgid "Ignore"
 msgstr ""
 
@@ -1210,11 +1431,11 @@ msgstr ""
 msgid "Network"
 msgstr ""
 
-#: ../../mod/notifications.php:85 ../../mod/network.php:184
+#: ../../mod/notifications.php:85 ../../mod/network.php:300
 msgid "Personal"
 msgstr ""
 
-#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:122
+#: ../../mod/notifications.php:90 ../../view/theme/diabook/theme.php:127
 #: ../../include/nav.php:77 ../../include/nav.php:115
 msgid "Home"
 msgstr ""
@@ -1223,7 +1444,7 @@ msgstr ""
 msgid "Introductions"
 msgstr ""
 
-#: ../../mod/notifications.php:100 ../../mod/message.php:104
+#: ../../mod/notifications.php:100 ../../mod/message.php:176
 #: ../../include/nav.php:128
 msgid "Messages"
 msgstr ""
@@ -1250,7 +1471,7 @@ msgid "suggested by %s"
 msgstr ""
 
 #: ../../mod/notifications.php:153 ../../mod/notifications.php:200
-#: ../../mod/contacts.php:354
+#: ../../mod/contacts.php:374
 msgid "Hide this contact from others"
 msgstr ""
 
@@ -1263,7 +1484,7 @@ msgid "if applicable"
 msgstr ""
 
 #: ../../mod/notifications.php:157 ../../mod/notifications.php:204
-#: ../../mod/admin.php:645
+#: ../../mod/admin.php:666
 msgid "Approve"
 msgstr ""
 
@@ -1372,303 +1593,307 @@ msgstr ""
 msgid "Home Notifications"
 msgstr ""
 
-#: ../../mod/contacts.php:63 ../../mod/contacts.php:143
+#: ../../mod/contacts.php:77 ../../mod/contacts.php:157
 msgid "Could not access contact record."
 msgstr ""
 
-#: ../../mod/contacts.php:77
+#: ../../mod/contacts.php:91
 msgid "Could not locate selected profile."
 msgstr ""
 
-#: ../../mod/contacts.php:100
+#: ../../mod/contacts.php:114
 msgid "Contact updated."
 msgstr ""
 
-#: ../../mod/contacts.php:165
+#: ../../mod/contacts.php:179
 msgid "Contact has been blocked"
 msgstr ""
 
-#: ../../mod/contacts.php:165
+#: ../../mod/contacts.php:179
 msgid "Contact has been unblocked"
 msgstr ""
 
-#: ../../mod/contacts.php:179
+#: ../../mod/contacts.php:193
 msgid "Contact has been ignored"
 msgstr ""
 
-#: ../../mod/contacts.php:179
+#: ../../mod/contacts.php:193
 msgid "Contact has been unignored"
 msgstr ""
 
-#: ../../mod/contacts.php:195
+#: ../../mod/contacts.php:209
 msgid "Contact has been archived"
 msgstr ""
 
-#: ../../mod/contacts.php:195
+#: ../../mod/contacts.php:209
 msgid "Contact has been unarchived"
 msgstr ""
 
-#: ../../mod/contacts.php:208
+#: ../../mod/contacts.php:222
 msgid "Contact has been removed."
 msgstr ""
 
-#: ../../mod/contacts.php:238
+#: ../../mod/contacts.php:256
 #, php-format
 msgid "You are mutual friends with %s"
 msgstr ""
 
-#: ../../mod/contacts.php:242
+#: ../../mod/contacts.php:260
 #, php-format
 msgid "You are sharing with %s"
 msgstr ""
 
-#: ../../mod/contacts.php:247
+#: ../../mod/contacts.php:265
 #, php-format
 msgid "%s is sharing with you"
 msgstr ""
 
-#: ../../mod/contacts.php:264
+#: ../../mod/contacts.php:282
 msgid "Private communications are not available for this contact."
 msgstr ""
 
-#: ../../mod/contacts.php:267
+#: ../../mod/contacts.php:285
 msgid "Never"
 msgstr ""
 
-#: ../../mod/contacts.php:271
+#: ../../mod/contacts.php:289
 msgid "(Update was successful)"
 msgstr ""
 
-#: ../../mod/contacts.php:271
+#: ../../mod/contacts.php:289
 msgid "(Update was not successful)"
 msgstr ""
 
-#: ../../mod/contacts.php:273
+#: ../../mod/contacts.php:291
 msgid "Suggest friends"
 msgstr ""
 
-#: ../../mod/contacts.php:277
+#: ../../mod/contacts.php:295
 #, php-format
 msgid "Network type: %s"
 msgstr ""
 
-#: ../../mod/contacts.php:280 ../../include/contact_widgets.php:183
+#: ../../mod/contacts.php:298 ../../include/contact_widgets.php:183
 #, php-format
 msgid "%d contact in common"
 msgid_plural "%d contacts in common"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/contacts.php:285
+#: ../../mod/contacts.php:303
 msgid "View all contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:290 ../../mod/contacts.php:347
-#: ../../mod/admin.php:649
+#: ../../mod/contacts.php:308 ../../mod/contacts.php:367
+#: ../../mod/admin.php:670
 msgid "Unblock"
 msgstr ""
 
-#: ../../mod/contacts.php:290 ../../mod/contacts.php:347
-#: ../../mod/admin.php:648
+#: ../../mod/contacts.php:308 ../../mod/contacts.php:367
+#: ../../mod/admin.php:669
 msgid "Block"
 msgstr ""
 
-#: ../../mod/contacts.php:293
+#: ../../mod/contacts.php:311
 msgid "Toggle Blocked status"
 msgstr ""
 
-#: ../../mod/contacts.php:296 ../../mod/contacts.php:348
+#: ../../mod/contacts.php:314 ../../mod/contacts.php:368
 msgid "Unignore"
 msgstr ""
 
-#: ../../mod/contacts.php:299
+#: ../../mod/contacts.php:317
 msgid "Toggle Ignored status"
 msgstr ""
 
-#: ../../mod/contacts.php:303
+#: ../../mod/contacts.php:321
 msgid "Unarchive"
 msgstr ""
 
-#: ../../mod/contacts.php:303
+#: ../../mod/contacts.php:321
 msgid "Archive"
 msgstr ""
 
-#: ../../mod/contacts.php:306
+#: ../../mod/contacts.php:324
 msgid "Toggle Archive status"
 msgstr ""
 
-#: ../../mod/contacts.php:309
+#: ../../mod/contacts.php:327
 msgid "Repair"
 msgstr ""
 
-#: ../../mod/contacts.php:312
+#: ../../mod/contacts.php:330
 msgid "Advanced Contact Settings"
 msgstr ""
 
-#: ../../mod/contacts.php:320
+#: ../../mod/contacts.php:336
+msgid "Communications lost with this contact!"
+msgstr ""
+
+#: ../../mod/contacts.php:339
 msgid "Contact Editor"
 msgstr ""
 
-#: ../../mod/contacts.php:323
+#: ../../mod/contacts.php:342
 msgid "Profile Visibility"
 msgstr ""
 
-#: ../../mod/contacts.php:324
+#: ../../mod/contacts.php:343
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr ""
 
-#: ../../mod/contacts.php:325
+#: ../../mod/contacts.php:344
 msgid "Contact Information / Notes"
 msgstr ""
 
-#: ../../mod/contacts.php:326
+#: ../../mod/contacts.php:345
 msgid "Edit contact notes"
 msgstr ""
 
-#: ../../mod/contacts.php:331 ../../mod/contacts.php:522
+#: ../../mod/contacts.php:350 ../../mod/contacts.php:542
 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr ""
 
-#: ../../mod/contacts.php:332
+#: ../../mod/contacts.php:351
 msgid "Block/Unblock contact"
 msgstr ""
 
-#: ../../mod/contacts.php:333
+#: ../../mod/contacts.php:352
 msgid "Ignore contact"
 msgstr ""
 
-#: ../../mod/contacts.php:334
+#: ../../mod/contacts.php:353
 msgid "Repair URL settings"
 msgstr ""
 
-#: ../../mod/contacts.php:335
+#: ../../mod/contacts.php:354
 msgid "View conversations"
 msgstr ""
 
-#: ../../mod/contacts.php:337
+#: ../../mod/contacts.php:356
 msgid "Delete contact"
 msgstr ""
 
-#: ../../mod/contacts.php:341
+#: ../../mod/contacts.php:360
 msgid "Last update:"
 msgstr ""
 
-#: ../../mod/contacts.php:342
+#: ../../mod/contacts.php:362
 msgid "Update public posts"
 msgstr ""
 
-#: ../../mod/contacts.php:344 ../../mod/admin.php:1120
+#: ../../mod/contacts.php:364 ../../mod/admin.php:1141
 msgid "Update now"
 msgstr ""
 
-#: ../../mod/contacts.php:351
+#: ../../mod/contacts.php:371
 msgid "Currently blocked"
 msgstr ""
 
-#: ../../mod/contacts.php:352
+#: ../../mod/contacts.php:372
 msgid "Currently ignored"
 msgstr ""
 
-#: ../../mod/contacts.php:353
+#: ../../mod/contacts.php:373
 msgid "Currently archived"
 msgstr ""
 
-#: ../../mod/contacts.php:354
+#: ../../mod/contacts.php:374
 msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr ""
 
-#: ../../mod/contacts.php:407
+#: ../../mod/contacts.php:427
 msgid "Suggestions"
 msgstr ""
 
-#: ../../mod/contacts.php:410
+#: ../../mod/contacts.php:430
 msgid "Suggest potential friends"
 msgstr ""
 
-#: ../../mod/contacts.php:413 ../../mod/group.php:191
+#: ../../mod/contacts.php:433 ../../mod/group.php:191
 msgid "All Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:416
+#: ../../mod/contacts.php:436
 msgid "Show all contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:419
+#: ../../mod/contacts.php:439
 msgid "Unblocked"
 msgstr ""
 
-#: ../../mod/contacts.php:422
+#: ../../mod/contacts.php:442
 msgid "Only show unblocked contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:426
+#: ../../mod/contacts.php:446
 msgid "Blocked"
 msgstr ""
 
-#: ../../mod/contacts.php:429
+#: ../../mod/contacts.php:449
 msgid "Only show blocked contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:433
+#: ../../mod/contacts.php:453
 msgid "Ignored"
 msgstr ""
 
-#: ../../mod/contacts.php:436
+#: ../../mod/contacts.php:456
 msgid "Only show ignored contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:440
+#: ../../mod/contacts.php:460
 msgid "Archived"
 msgstr ""
 
-#: ../../mod/contacts.php:443
+#: ../../mod/contacts.php:463
 msgid "Only show archived contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:447
+#: ../../mod/contacts.php:467
 msgid "Hidden"
 msgstr ""
 
-#: ../../mod/contacts.php:450
+#: ../../mod/contacts.php:470
 msgid "Only show hidden contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:498
+#: ../../mod/contacts.php:518
 msgid "Mutual Friendship"
 msgstr ""
 
-#: ../../mod/contacts.php:502
+#: ../../mod/contacts.php:522
 msgid "is a fan of yours"
 msgstr ""
 
-#: ../../mod/contacts.php:506
+#: ../../mod/contacts.php:526
 msgid "you are a fan of"
 msgstr ""
 
-#: ../../mod/contacts.php:523 ../../mod/nogroup.php:41
+#: ../../mod/contacts.php:543 ../../mod/nogroup.php:41
 msgid "Edit contact"
 msgstr ""
 
-#: ../../mod/contacts.php:544 ../../view/theme/diabook/theme.php:124
+#: ../../mod/contacts.php:564 ../../view/theme/diabook/theme.php:129
 #: ../../include/nav.php:139
 msgid "Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:548
+#: ../../mod/contacts.php:568
 msgid "Search your contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:549 ../../mod/directory.php:57
+#: ../../mod/contacts.php:569 ../../mod/directory.php:57
 msgid "Finding: "
 msgstr ""
 
-#: ../../mod/contacts.php:550 ../../mod/directory.php:59
+#: ../../mod/contacts.php:570 ../../mod/directory.php:59
 #: ../../include/contact_widgets.php:33
 msgid "Find"
 msgstr ""
@@ -1687,12 +1912,13 @@ msgid "Password reset requested at %s"
 msgstr ""
 
 #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
-#: ../../mod/register.php:388 ../../mod/register.php:442
+#: ../../mod/register.php:90 ../../mod/register.php:144
 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752
-#: ../../addon/facebook/facebook.php:688
-#: ../../addon/facebook/facebook.php:1178
-#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2738
-#: ../../boot.php:696
+#: ../../addon/facebook/facebook.php:702
+#: ../../addon/facebook/facebook.php:1200
+#: ../../addon/public_server/public_server.php:62
+#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3213
+#: ../../boot.php:779
 msgid "Administrator"
 msgstr ""
 
@@ -1702,7 +1928,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:83 ../../boot.php:828
+#: ../../mod/lostpass.php:83 ../../boot.php:912
 msgid "Password Reset"
 msgstr ""
 
@@ -1746,296 +1972,298 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
-#: ../../mod/settings.php:49 ../../include/nav.php:137
+#: ../../mod/settings.php:30 ../../include/nav.php:137
 msgid "Account settings"
 msgstr ""
 
-#: ../../mod/settings.php:54
+#: ../../mod/settings.php:35
 msgid "Display settings"
 msgstr ""
 
-#: ../../mod/settings.php:60
+#: ../../mod/settings.php:41
 msgid "Connector settings"
 msgstr ""
 
-#: ../../mod/settings.php:65
+#: ../../mod/settings.php:46
 msgid "Plugin settings"
 msgstr ""
 
-#: ../../mod/settings.php:70
+#: ../../mod/settings.php:51
 msgid "Connected apps"
 msgstr ""
 
-#: ../../mod/settings.php:75
+#: ../../mod/settings.php:56
 msgid "Export personal data"
 msgstr ""
 
-#: ../../mod/settings.php:80
+#: ../../mod/settings.php:61
 msgid "Remove account"
 msgstr ""
 
-#: ../../mod/settings.php:88 ../../mod/admin.php:735 ../../mod/admin.php:940
-#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:638
-#: ../../view/theme/diabook/theme.php:768 ../../include/nav.php:137
+#: ../../mod/settings.php:69 ../../mod/admin.php:756 ../../mod/admin.php:961
+#: ../../addon/dav/layout.fnk.php:225 ../../addon/mathjax/mathjax.php:36
+#: ../../view/theme/diabook/theme.php:643
+#: ../../view/theme/diabook/theme.php:773 ../../include/nav.php:137
 msgid "Settings"
 msgstr ""
 
-#: ../../mod/settings.php:131
+#: ../../mod/settings.php:113
 msgid "Missing some important data!"
 msgstr ""
 
-#: ../../mod/settings.php:134 ../../mod/settings.php:579
+#: ../../mod/settings.php:116 ../../mod/settings.php:563
 msgid "Update"
 msgstr ""
 
-#: ../../mod/settings.php:239
+#: ../../mod/settings.php:221
 msgid "Failed to connect with email account using the settings provided."
 msgstr ""
 
-#: ../../mod/settings.php:244
+#: ../../mod/settings.php:226
 msgid "Email settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:303
+#: ../../mod/settings.php:285
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:308
+#: ../../mod/settings.php:290
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:319
+#: ../../mod/settings.php:301
 msgid "Password changed."
 msgstr ""
 
-#: ../../mod/settings.php:321
+#: ../../mod/settings.php:303
 msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/settings.php:385
+#: ../../mod/settings.php:368
 msgid " Please use a shorter name."
 msgstr ""
 
-#: ../../mod/settings.php:387
+#: ../../mod/settings.php:370
 msgid " Name too short."
 msgstr ""
 
-#: ../../mod/settings.php:393
+#: ../../mod/settings.php:376
 msgid " Not valid email."
 msgstr ""
 
-#: ../../mod/settings.php:395
+#: ../../mod/settings.php:378
 msgid " Cannot change to that email."
 msgstr ""
 
-#: ../../mod/settings.php:448
+#: ../../mod/settings.php:432
 msgid "Private forum has no privacy permissions. Using default privacy group."
 msgstr ""
 
-#: ../../mod/settings.php:452
+#: ../../mod/settings.php:436
 msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr ""
 
-#: ../../mod/settings.php:482 ../../addon/facebook/facebook.php:488
+#: ../../mod/settings.php:466 ../../addon/facebook/facebook.php:495
 #: ../../addon/impressum/impressum.php:77
 #: ../../addon/openstreetmap/openstreetmap.php:80
 #: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105
-#: ../../addon/twitter/twitter.php:376
+#: ../../addon/twitter/twitter.php:389
 msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:552 ../../mod/settings.php:578
-#: ../../mod/settings.php:614
+#: ../../mod/settings.php:536 ../../mod/settings.php:562
+#: ../../mod/settings.php:598
 msgid "Add application"
 msgstr ""
 
-#: ../../mod/settings.php:556 ../../mod/settings.php:582
-#: ../../addon/statusnet/statusnet.php:555
+#: ../../mod/settings.php:540 ../../mod/settings.php:566
+#: ../../addon/statusnet/statusnet.php:570
 msgid "Consumer Key"
 msgstr ""
 
-#: ../../mod/settings.php:557 ../../mod/settings.php:583
-#: ../../addon/statusnet/statusnet.php:554
+#: ../../mod/settings.php:541 ../../mod/settings.php:567
+#: ../../addon/statusnet/statusnet.php:569
 msgid "Consumer Secret"
 msgstr ""
 
-#: ../../mod/settings.php:558 ../../mod/settings.php:584
+#: ../../mod/settings.php:542 ../../mod/settings.php:568
 msgid "Redirect"
 msgstr ""
 
-#: ../../mod/settings.php:559 ../../mod/settings.php:585
+#: ../../mod/settings.php:543 ../../mod/settings.php:569
 msgid "Icon url"
 msgstr ""
 
-#: ../../mod/settings.php:570
+#: ../../mod/settings.php:554
 msgid "You can't edit this application."
 msgstr ""
 
-#: ../../mod/settings.php:613
+#: ../../mod/settings.php:597
 msgid "Connected Apps"
 msgstr ""
 
-#: ../../mod/settings.php:617
+#: ../../mod/settings.php:601
 msgid "Client key starts with"
 msgstr ""
 
-#: ../../mod/settings.php:618
+#: ../../mod/settings.php:602
 msgid "No name"
 msgstr ""
 
-#: ../../mod/settings.php:619
+#: ../../mod/settings.php:603
 msgid "Remove authorization"
 msgstr ""
 
-#: ../../mod/settings.php:630
+#: ../../mod/settings.php:614
 msgid "No Plugin settings configured"
 msgstr ""
 
-#: ../../mod/settings.php:638 ../../addon/widgets/widgets.php:123
+#: ../../mod/settings.php:622 ../../addon/widgets/widgets.php:123
 msgid "Plugin Settings"
 msgstr ""
 
-#: ../../mod/settings.php:650 ../../mod/settings.php:651
+#: ../../mod/settings.php:634 ../../mod/settings.php:635
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr ""
 
-#: ../../mod/settings.php:650 ../../mod/settings.php:651
+#: ../../mod/settings.php:634 ../../mod/settings.php:635
 msgid "enabled"
 msgstr ""
 
-#: ../../mod/settings.php:650 ../../mod/settings.php:651
+#: ../../mod/settings.php:634 ../../mod/settings.php:635
 msgid "disabled"
 msgstr ""
 
-#: ../../mod/settings.php:651
+#: ../../mod/settings.php:635
 msgid "StatusNet"
 msgstr ""
 
-#: ../../mod/settings.php:681
+#: ../../mod/settings.php:667
+msgid "Email access is disabled on this site."
+msgstr ""
+
+#: ../../mod/settings.php:673
 msgid "Connector Settings"
 msgstr ""
 
-#: ../../mod/settings.php:686
+#: ../../mod/settings.php:678
 msgid "Email/Mailbox Setup"
 msgstr ""
 
-#: ../../mod/settings.php:687
+#: ../../mod/settings.php:679
 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:688
+#: ../../mod/settings.php:680
 msgid "Last successful email check:"
 msgstr ""
 
-#: ../../mod/settings.php:689
-msgid "Email access is disabled on this site."
-msgstr ""
-
-#: ../../mod/settings.php:690
+#: ../../mod/settings.php:682
 msgid "IMAP server name:"
 msgstr ""
 
-#: ../../mod/settings.php:691
+#: ../../mod/settings.php:683
 msgid "IMAP port:"
 msgstr ""
 
-#: ../../mod/settings.php:692
+#: ../../mod/settings.php:684
 msgid "Security:"
 msgstr ""
 
-#: ../../mod/settings.php:692 ../../mod/settings.php:697
+#: ../../mod/settings.php:684 ../../mod/settings.php:689
+#: ../../addon/dav/common/wdcal_edit.inc.php:191
 msgid "None"
 msgstr ""
 
-#: ../../mod/settings.php:693
+#: ../../mod/settings.php:685
 msgid "Email login name:"
 msgstr ""
 
-#: ../../mod/settings.php:694
+#: ../../mod/settings.php:686
 msgid "Email password:"
 msgstr ""
 
-#: ../../mod/settings.php:695
+#: ../../mod/settings.php:687
 msgid "Reply-to address:"
 msgstr ""
 
-#: ../../mod/settings.php:696
+#: ../../mod/settings.php:688
 msgid "Send public posts to all email contacts:"
 msgstr ""
 
-#: ../../mod/settings.php:697
+#: ../../mod/settings.php:689
 msgid "Action after import:"
 msgstr ""
 
-#: ../../mod/settings.php:697
+#: ../../mod/settings.php:689
 msgid "Mark as seen"
 msgstr ""
 
-#: ../../mod/settings.php:697
+#: ../../mod/settings.php:689
 msgid "Move to folder"
 msgstr ""
 
-#: ../../mod/settings.php:698
+#: ../../mod/settings.php:690
 msgid "Move to folder:"
 msgstr ""
 
-#: ../../mod/settings.php:758
+#: ../../mod/settings.php:750
 msgid "Display Settings"
 msgstr ""
 
-#: ../../mod/settings.php:764
+#: ../../mod/settings.php:756 ../../mod/settings.php:766
 msgid "Display Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:765
+#: ../../mod/settings.php:757
 msgid "Update browser every xx seconds"
 msgstr ""
 
-#: ../../mod/settings.php:765
+#: ../../mod/settings.php:757
 msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
-#: ../../mod/settings.php:766
+#: ../../mod/settings.php:758
 msgid "Number of items to display on the network page:"
 msgstr ""
 
-#: ../../mod/settings.php:766
+#: ../../mod/settings.php:758
 msgid "Maximum of 100 items"
 msgstr ""
 
-#: ../../mod/settings.php:767
+#: ../../mod/settings.php:759
 msgid "Don't show emoticons"
 msgstr ""
 
-#: ../../mod/settings.php:835 ../../mod/admin.php:180 ../../mod/admin.php:621
-msgid "Normal Account"
+#: ../../mod/settings.php:835
+msgid "Normal Account Page"
 msgstr ""
 
 #: ../../mod/settings.php:836
 msgid "This account is a normal personal profile"
 msgstr ""
 
-#: ../../mod/settings.php:839 ../../mod/admin.php:181 ../../mod/admin.php:622
-msgid "Soapbox Account"
+#: ../../mod/settings.php:839
+msgid "Soapbox Page"
 msgstr ""
 
 #: ../../mod/settings.php:840
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr ""
 
-#: ../../mod/settings.php:843 ../../mod/admin.php:182 ../../mod/admin.php:623
-msgid "Community/Celebrity Account"
+#: ../../mod/settings.php:843
+msgid "Community Forum/Celebrity Account"
 msgstr ""
 
 #: ../../mod/settings.php:844
 msgid "Automatically approve all connection/friend requests as read-write fans"
 msgstr ""
 
-#: ../../mod/settings.php:847 ../../mod/admin.php:183 ../../mod/admin.php:624
-msgid "Automatic Friend Account"
+#: ../../mod/settings.php:847
+msgid "Automatic Friend Page"
 msgstr ""
 
 #: ../../mod/settings.php:848
@@ -2043,219 +2271,231 @@ msgid "Automatically approve all connection/friend requests as friends"
 msgstr ""
 
 #: ../../mod/settings.php:851
-msgid "Private Forum"
+msgid "Private Forum [Experimental]"
 msgstr ""
 
 #: ../../mod/settings.php:852
-msgid "Private forum - approved members only [Experimental]"
+msgid "Private forum - approved members only"
 msgstr ""
 
-#: ../../mod/settings.php:865
+#: ../../mod/settings.php:864
 msgid "OpenID:"
 msgstr ""
 
-#: ../../mod/settings.php:865
+#: ../../mod/settings.php:864
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: ../../mod/settings.php:875
+#: ../../mod/settings.php:874
 msgid "Publish your default profile in your local site directory?"
 msgstr ""
 
-#: ../../mod/settings.php:881
+#: ../../mod/settings.php:880
 msgid "Publish your default profile in the global social directory?"
 msgstr ""
 
-#: ../../mod/settings.php:889
+#: ../../mod/settings.php:888
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr ""
 
-#: ../../mod/settings.php:893
+#: ../../mod/settings.php:892
 msgid "Hide your profile details from unknown viewers?"
 msgstr ""
 
-#: ../../mod/settings.php:898
+#: ../../mod/settings.php:897
 msgid "Allow friends to post to your profile page?"
 msgstr ""
 
-#: ../../mod/settings.php:904
+#: ../../mod/settings.php:903
 msgid "Allow friends to tag your posts?"
 msgstr ""
 
-#: ../../mod/settings.php:910
+#: ../../mod/settings.php:909
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../mod/settings.php:916
+#: ../../mod/settings.php:915
 msgid "Permit unknown people to send you private mail?"
 msgstr ""
 
-#: ../../mod/settings.php:927
+#: ../../mod/settings.php:923
 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: ../../mod/settings.php:933 ../../mod/profile_photo.php:211
+#: ../../mod/settings.php:926 ../../mod/profile_photo.php:214
 msgid "or"
 msgstr ""
 
-#: ../../mod/settings.php:938
+#: ../../mod/settings.php:931
 msgid "Your Identity Address is"
 msgstr ""
 
-#: ../../mod/settings.php:949
+#: ../../mod/settings.php:942
 msgid "Automatically expire posts after this many days:"
 msgstr ""
 
-#: ../../mod/settings.php:949
+#: ../../mod/settings.php:942
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr ""
 
-#: ../../mod/settings.php:950
+#: ../../mod/settings.php:943
 msgid "Advanced expiration settings"
 msgstr ""
 
-#: ../../mod/settings.php:951
+#: ../../mod/settings.php:944
 msgid "Advanced Expiration"
 msgstr ""
 
-#: ../../mod/settings.php:952
+#: ../../mod/settings.php:945
 msgid "Expire posts:"
 msgstr ""
 
-#: ../../mod/settings.php:953
+#: ../../mod/settings.php:946
 msgid "Expire personal notes:"
 msgstr ""
 
-#: ../../mod/settings.php:954
+#: ../../mod/settings.php:947
 msgid "Expire starred posts:"
 msgstr ""
 
-#: ../../mod/settings.php:955
+#: ../../mod/settings.php:948
 msgid "Expire photos:"
 msgstr ""
 
-#: ../../mod/settings.php:962
+#: ../../mod/settings.php:949
+msgid "Only expire posts by others:"
+msgstr ""
+
+#: ../../mod/settings.php:956
 msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/settings.php:970
+#: ../../mod/settings.php:964
 msgid "Password Settings"
 msgstr ""
 
-#: ../../mod/settings.php:971
+#: ../../mod/settings.php:965
 msgid "New Password:"
 msgstr ""
 
-#: ../../mod/settings.php:972
+#: ../../mod/settings.php:966
 msgid "Confirm:"
 msgstr ""
 
-#: ../../mod/settings.php:972
+#: ../../mod/settings.php:966
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/settings.php:976
+#: ../../mod/settings.php:970
 msgid "Basic Settings"
 msgstr ""
 
-#: ../../mod/settings.php:977 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:971 ../../include/profile_advanced.php:15
 msgid "Full Name:"
 msgstr ""
 
-#: ../../mod/settings.php:978
+#: ../../mod/settings.php:972
 msgid "Email Address:"
 msgstr ""
 
-#: ../../mod/settings.php:979
+#: ../../mod/settings.php:973
 msgid "Your Timezone:"
 msgstr ""
 
-#: ../../mod/settings.php:980
+#: ../../mod/settings.php:974
 msgid "Default Post Location:"
 msgstr ""
 
-#: ../../mod/settings.php:981
+#: ../../mod/settings.php:975
 msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../mod/settings.php:984
+#: ../../mod/settings.php:978
 msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../mod/settings.php:986
+#: ../../mod/settings.php:980
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/settings.php:986 ../../mod/settings.php:1005
+#: ../../mod/settings.php:980 ../../mod/settings.php:999
 msgid "(to prevent spam abuse)"
 msgstr ""
 
-#: ../../mod/settings.php:987
+#: ../../mod/settings.php:981
 msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:988
+#: ../../mod/settings.php:982
 msgid "(click to open/close)"
 msgstr ""
 
-#: ../../mod/settings.php:1005
+#: ../../mod/settings.php:999
 msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: ../../mod/settings.php:1008
+#: ../../mod/settings.php:1002
 msgid "Notification Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1009
+#: ../../mod/settings.php:1003
 msgid "By default post a status message when:"
 msgstr ""
 
-#: ../../mod/settings.php:1010
+#: ../../mod/settings.php:1004
 msgid "accepting a friend request"
 msgstr ""
 
-#: ../../mod/settings.php:1011
+#: ../../mod/settings.php:1005
 msgid "joining a forum/community"
 msgstr ""
 
-#: ../../mod/settings.php:1012
+#: ../../mod/settings.php:1006
 msgid "making an <em>interesting</em> profile change"
 msgstr ""
 
-#: ../../mod/settings.php:1013
+#: ../../mod/settings.php:1007
 msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../mod/settings.php:1014
+#: ../../mod/settings.php:1008
 msgid "You receive an introduction"
 msgstr ""
 
-#: ../../mod/settings.php:1015
+#: ../../mod/settings.php:1009
 msgid "Your introductions are confirmed"
 msgstr ""
 
-#: ../../mod/settings.php:1016
+#: ../../mod/settings.php:1010
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../mod/settings.php:1017
+#: ../../mod/settings.php:1011
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../mod/settings.php:1018
+#: ../../mod/settings.php:1012
 msgid "You receive a private message"
 msgstr ""
 
-#: ../../mod/settings.php:1019
+#: ../../mod/settings.php:1013
 msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../mod/settings.php:1020
+#: ../../mod/settings.php:1014
 msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../mod/settings.php:1023
-msgid "Advanced Page Settings"
+#: ../../mod/settings.php:1015
+msgid "You are poked/prodded/etc. in a post"
+msgstr ""
+
+#: ../../mod/settings.php:1018
+msgid "Advanced Account/Page Type Settings"
+msgstr ""
+
+#: ../../mod/settings.php:1019
+msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
 #: ../../mod/manage.php:90
@@ -2272,67 +2512,67 @@ msgstr ""
 msgid "Select an identity to manage: "
 msgstr ""
 
-#: ../../mod/network.php:43
+#: ../../mod/network.php:97
 msgid "Search Results For:"
 msgstr ""
 
-#: ../../mod/network.php:82 ../../mod/search.php:16
+#: ../../mod/network.php:137 ../../mod/search.php:16
 msgid "Remove term"
 msgstr ""
 
-#: ../../mod/network.php:91 ../../mod/search.php:13
+#: ../../mod/network.php:146 ../../mod/search.php:13
 msgid "Saved Searches"
 msgstr ""
 
-#: ../../mod/network.php:92 ../../include/group.php:244
+#: ../../mod/network.php:147 ../../include/group.php:244
 msgid "add"
 msgstr ""
 
-#: ../../mod/network.php:171
+#: ../../mod/network.php:287
 msgid "Commented Order"
 msgstr ""
 
-#: ../../mod/network.php:174
+#: ../../mod/network.php:290
 msgid "Sort by Comment Date"
 msgstr ""
 
-#: ../../mod/network.php:177
+#: ../../mod/network.php:293
 msgid "Posted Order"
 msgstr ""
 
-#: ../../mod/network.php:180
+#: ../../mod/network.php:296
 msgid "Sort by Post Date"
 msgstr ""
 
-#: ../../mod/network.php:187
+#: ../../mod/network.php:303
 msgid "Posts that mention or involve you"
 msgstr ""
 
-#: ../../mod/network.php:190
+#: ../../mod/network.php:306
 msgid "New"
 msgstr ""
 
-#: ../../mod/network.php:193
+#: ../../mod/network.php:309
 msgid "Activity Stream - by date"
 msgstr ""
 
-#: ../../mod/network.php:196
+#: ../../mod/network.php:312
 msgid "Starred"
 msgstr ""
 
-#: ../../mod/network.php:199
+#: ../../mod/network.php:315
 msgid "Favourite Posts"
 msgstr ""
 
-#: ../../mod/network.php:202
+#: ../../mod/network.php:318
 msgid "Shared Links"
 msgstr ""
 
-#: ../../mod/network.php:205
+#: ../../mod/network.php:321
 msgid "Interesting Links"
 msgstr ""
 
-#: ../../mod/network.php:281
+#: ../../mod/network.php:388
 #, php-format
 msgid "Warning: This group contains %s member from an insecure network."
 msgid_plural ""
@@ -2340,42 +2580,31 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/network.php:284
+#: ../../mod/network.php:391
 msgid "Private messages to this group are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/network.php:329
-msgid "No such group"
-msgstr ""
-
-#: ../../mod/network.php:340
-msgid "Group is empty"
-msgstr ""
-
-#: ../../mod/network.php:344
-msgid "Group: "
-msgstr ""
-
-#: ../../mod/network.php:354
+#: ../../mod/network.php:461
 msgid "Contact: "
 msgstr ""
 
-#: ../../mod/network.php:356
+#: ../../mod/network.php:463
 msgid "Private messages to this person are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/network.php:361
+#: ../../mod/network.php:468
 msgid "Invalid contact."
 msgstr ""
 
-#: ../../mod/notes.php:44 ../../boot.php:1509
+#: ../../mod/notes.php:44 ../../boot.php:1641
 msgid "Personal Notes"
 msgstr ""
 
 #: ../../mod/notes.php:63 ../../mod/filer.php:30
-#: ../../addon/facebook/facebook.php:756
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:147
-#: ../../include/text.php:652
+#: ../../addon/facebook/facebook.php:770
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:236
+#: ../../addon/dav/layout.fnk.php:441 ../../addon/dav/layout.fnk.php:488
+#: ../../include/text.php:677
 msgid "Save"
 msgstr ""
 
@@ -2384,7 +2613,7 @@ msgstr ""
 msgid "Number of daily wall messages for %s exceeded. Message failed."
 msgstr ""
 
-#: ../../mod/wallmessage.php:56 ../../mod/message.php:65
+#: ../../mod/wallmessage.php:56 ../../mod/message.php:59
 msgid "No recipient selected."
 msgstr ""
 
@@ -2392,15 +2621,15 @@ msgstr ""
 msgid "Unable to check your home location."
 msgstr ""
 
-#: ../../mod/wallmessage.php:62 ../../mod/message.php:72
+#: ../../mod/wallmessage.php:62 ../../mod/message.php:66
 msgid "Message could not be sent."
 msgstr ""
 
-#: ../../mod/wallmessage.php:65 ../../mod/message.php:75
+#: ../../mod/wallmessage.php:65 ../../mod/message.php:69
 msgid "Message collection failure."
 msgstr ""
 
-#: ../../mod/wallmessage.php:68 ../../mod/message.php:78
+#: ../../mod/wallmessage.php:68 ../../mod/message.php:72
 msgid "Message sent."
 msgstr ""
 
@@ -2408,34 +2637,35 @@ msgstr ""
 msgid "No recipient."
 msgstr ""
 
-#: ../../mod/wallmessage.php:124 ../../mod/message.php:171
-#: ../../include/conversation.php:921
+#: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
+#: ../../mod/message.php:242 ../../mod/message.php:250
+#: ../../include/conversation.php:1065 ../../include/conversation.php:1082
 msgid "Please enter a link URL:"
 msgstr ""
 
-#: ../../mod/wallmessage.php:131 ../../mod/message.php:199
+#: ../../mod/wallmessage.php:138 ../../mod/message.php:278
 msgid "Send Private Message"
 msgstr ""
 
-#: ../../mod/wallmessage.php:132
+#: ../../mod/wallmessage.php:139
 #, php-format
 msgid ""
 "If you wish for %s to respond, please check that the privacy settings on "
 "your site allow private mail from unknown senders."
 msgstr ""
 
-#: ../../mod/wallmessage.php:133 ../../mod/message.php:200
-#: ../../mod/message.php:397
+#: ../../mod/wallmessage.php:140 ../../mod/message.php:279
+#: ../../mod/message.php:467
 msgid "To:"
 msgstr ""
 
-#: ../../mod/wallmessage.php:134 ../../mod/message.php:205
-#: ../../mod/message.php:399
+#: ../../mod/wallmessage.php:141 ../../mod/message.php:284
+#: ../../mod/message.php:469
 msgid "Subject:"
 msgstr ""
 
-#: ../../mod/wallmessage.php:140 ../../mod/message.php:209
-#: ../../mod/message.php:402 ../../mod/invite.php:113
+#: ../../mod/wallmessage.php:147 ../../mod/message.php:288
+#: ../../mod/message.php:472 ../../mod/invite.php:113
 msgid "Your message:"
 msgstr ""
 
@@ -2577,7 +2807,7 @@ msgstr ""
 msgid "Group name changed."
 msgstr ""
 
-#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:305
+#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:314
 msgid "Permission denied"
 msgstr ""
 
@@ -2617,9 +2847,9 @@ msgstr ""
 msgid "Profile Visibility Editor"
 msgstr ""
 
-#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:123
-#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74
-#: ../../include/nav.php:50 ../../boot.php:1488
+#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:128
+#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84
+#: ../../include/nav.php:50 ../../boot.php:1617
 msgid "Profile"
 msgstr ""
 
@@ -2635,197 +2865,129 @@ msgstr ""
 msgid "No contacts."
 msgstr ""
 
-#: ../../mod/viewcontacts.php:76 ../../include/text.php:589
+#: ../../mod/viewcontacts.php:76 ../../include/text.php:614
 msgid "View Contacts"
 msgstr ""
 
-#: ../../mod/register.php:64
-msgid "An invitation is required."
-msgstr ""
-
-#: ../../mod/register.php:69
-msgid "Invitation could not be verified."
-msgstr ""
-
-#: ../../mod/register.php:77
-msgid "Invalid OpenID url"
-msgstr ""
-
-#: ../../mod/register.php:92
-msgid "Please enter the required information."
-msgstr ""
-
-#: ../../mod/register.php:106
-msgid "Please use a shorter name."
-msgstr ""
-
-#: ../../mod/register.php:108
-msgid "Name too short."
-msgstr ""
-
-#: ../../mod/register.php:123
-msgid "That doesn't appear to be your full (First Last) name."
-msgstr ""
-
-#: ../../mod/register.php:128
-msgid "Your email domain is not among those allowed on this site."
-msgstr ""
-
-#: ../../mod/register.php:131
-msgid "Not a valid email address."
-msgstr ""
-
-#: ../../mod/register.php:141
-msgid "Cannot use that email."
-msgstr ""
-
-#: ../../mod/register.php:147
-msgid ""
-"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
-"must also begin with a letter."
-msgstr ""
-
-#: ../../mod/register.php:153 ../../mod/register.php:264
-msgid "Nickname is already registered. Please choose another."
-msgstr ""
-
-#: ../../mod/register.php:163
-msgid ""
-"Nickname was once registered here and may not be re-used. Please choose "
-"another."
-msgstr ""
-
-#: ../../mod/register.php:182
-msgid "SERIOUS ERROR: Generation of security keys failed."
-msgstr ""
-
-#: ../../mod/register.php:250
-msgid "An error occurred during registration. Please try again."
-msgstr ""
-
-#: ../../mod/register.php:286
-msgid "An error occurred creating your default profile. Please try again."
-msgstr ""
-
-#: ../../mod/register.php:386 ../../mod/regmod.php:52
+#: ../../mod/register.php:88 ../../mod/regmod.php:52
 #, php-format
 msgid "Registration details for %s"
 msgstr ""
 
-#: ../../mod/register.php:394
+#: ../../mod/register.php:96
 msgid ""
 "Registration successful. Please check your email for further instructions."
 msgstr ""
 
-#: ../../mod/register.php:398
+#: ../../mod/register.php:100
 msgid "Failed to send email message. Here is the message that failed."
 msgstr ""
 
-#: ../../mod/register.php:403
+#: ../../mod/register.php:105
 msgid "Your registration can not be processed."
 msgstr ""
 
-#: ../../mod/register.php:440
+#: ../../mod/register.php:142
 #, php-format
 msgid "Registration request at %s"
 msgstr ""
 
-#: ../../mod/register.php:449
+#: ../../mod/register.php:151
 msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: ../../mod/register.php:487
+#: ../../mod/register.php:189
 msgid ""
 "This site has exceeded the number of allowed daily account registrations. "
 "Please try again tomorrow."
 msgstr ""
 
-#: ../../mod/register.php:513
+#: ../../mod/register.php:215
 msgid ""
 "You may (optionally) fill in this form via OpenID by supplying your OpenID "
 "and clicking 'Register'."
 msgstr ""
 
-#: ../../mod/register.php:514
+#: ../../mod/register.php:216
 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:515
+#: ../../mod/register.php:217
 msgid "Your OpenID (optional): "
 msgstr ""
 
-#: ../../mod/register.php:529
+#: ../../mod/register.php:231
 msgid "Include your profile in member directory?"
 msgstr ""
 
-#: ../../mod/register.php:549
+#: ../../mod/register.php:251
 msgid "Membership on this site is by invitation only."
 msgstr ""
 
-#: ../../mod/register.php:550
+#: ../../mod/register.php:252
 msgid "Your invitation ID: "
 msgstr ""
 
-#: ../../mod/register.php:553 ../../mod/admin.php:405
+#: ../../mod/register.php:255 ../../mod/admin.php:423
 msgid "Registration"
 msgstr ""
 
-#: ../../mod/register.php:561
+#: ../../mod/register.php:263
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr ""
 
-#: ../../mod/register.php:562
+#: ../../mod/register.php:264
 msgid "Your Email Address: "
 msgstr ""
 
-#: ../../mod/register.php:563
+#: ../../mod/register.php:265
 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:564
+#: ../../mod/register.php:266
 msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/register.php:567 ../../include/nav.php:81 ../../boot.php:794
+#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:878
 msgid "Register"
 msgstr ""
 
-#: ../../mod/dirfind.php:23
+#: ../../mod/dirfind.php:26
 msgid "People Search"
 msgstr ""
 
-#: ../../mod/like.php:127 ../../mod/tagger.php:70
-#: ../../addon/facebook/facebook.php:1572
+#: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/tagger.php:70
+#: ../../addon/facebook/facebook.php:1594
 #: ../../addon/communityhome/communityhome.php:158
 #: ../../addon/communityhome/communityhome.php:167
-#: ../../view/theme/diabook/theme.php:560
-#: ../../view/theme/diabook/theme.php:569 ../../include/diaspora.php:1662
-#: ../../include/conversation.php:48 ../../include/conversation.php:57
-#: ../../include/conversation.php:121 ../../include/conversation.php:130
+#: ../../view/theme/diabook/theme.php:565
+#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1793
+#: ../../include/conversation.php:109 ../../include/conversation.php:118
+#: ../../include/conversation.php:225 ../../include/conversation.php:234
 msgid "status"
 msgstr ""
 
-#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1576
+#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1598
 #: ../../addon/communityhome/communityhome.php:172
-#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1678
-#: ../../include/conversation.php:65
+#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1809
+#: ../../include/conversation.php:126
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/like.php:146 ../../include/conversation.php:68
+#: ../../mod/like.php:164 ../../include/conversation.php:129
 #, 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:156
-#: ../../mod/admin.php:684 ../../mod/admin.php:883 ../../mod/display.php:37
-#: ../../mod/display.php:142 ../../include/items.php:3096
+#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
+#: ../../mod/admin.php:705 ../../mod/admin.php:904 ../../mod/display.php:29
+#: ../../mod/display.php:134 ../../include/items.php:3692
 msgid "Item not found."
 msgstr ""
 
@@ -2833,12 +2995,12 @@ msgstr ""
 msgid "Access denied."
 msgstr ""
 
-#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:125
-#: ../../include/nav.php:51 ../../boot.php:1494
+#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130
+#: ../../include/nav.php:51 ../../boot.php:1624
 msgid "Photos"
 msgstr ""
 
-#: ../../mod/fbrowser.php:86
+#: ../../mod/fbrowser.php:96
 msgid "Files"
 msgstr ""
 
@@ -2855,42 +3017,42 @@ msgstr ""
 msgid "Please login."
 msgstr ""
 
-#: ../../mod/item.php:89
+#: ../../mod/item.php:90
 msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../mod/item.php:249
+#: ../../mod/item.php:274
 msgid "Empty post discarded."
 msgstr ""
 
-#: ../../mod/item.php:372 ../../mod/wall_upload.php:99
-#: ../../mod/wall_upload.php:108 ../../mod/wall_upload.php:115
+#: ../../mod/item.php:395 ../../mod/wall_upload.php:122
+#: ../../mod/wall_upload.php:131 ../../mod/wall_upload.php:138
 #: ../../include/message.php:144
 msgid "Wall Photos"
 msgstr ""
 
-#: ../../mod/item.php:781
+#: ../../mod/item.php:800
 msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/item.php:806
+#: ../../mod/item.php:825
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social network."
 msgstr ""
 
-#: ../../mod/item.php:808
+#: ../../mod/item.php:827
 #, php-format
 msgid "You may visit them online at %s"
 msgstr ""
 
-#: ../../mod/item.php:809
+#: ../../mod/item.php:828
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr ""
 
-#: ../../mod/item.php:811
+#: ../../mod/item.php:830
 #, php-format
 msgid "%s posted an update."
 msgstr ""
@@ -2900,7 +3062,7 @@ 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:264
+#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:273
 #, php-format
 msgid "Image size reduction [%s] failed."
 msgstr ""
@@ -2915,44 +3077,44 @@ msgstr ""
 msgid "Unable to process image"
 msgstr ""
 
-#: ../../mod/profile_photo.php:115 ../../mod/wall_upload.php:74
+#: ../../mod/profile_photo.php:117 ../../mod/wall_upload.php:77
 #, php-format
 msgid "Image exceeds size limit of %d"
 msgstr ""
 
-#: ../../mod/profile_photo.php:207
+#: ../../mod/profile_photo.php:210
 msgid "Upload File:"
 msgstr ""
 
-#: ../../mod/profile_photo.php:208
+#: ../../mod/profile_photo.php:211
 msgid "Upload Profile Photo"
 msgstr ""
 
-#: ../../mod/profile_photo.php:209
+#: ../../mod/profile_photo.php:212 ../../addon/dav/layout.fnk.php:152
 msgid "Upload"
 msgstr ""
 
-#: ../../mod/profile_photo.php:211
+#: ../../mod/profile_photo.php:214
 msgid "skip this step"
 msgstr ""
 
-#: ../../mod/profile_photo.php:211
+#: ../../mod/profile_photo.php:214
 msgid "select a photo from your photo albums"
 msgstr ""
 
-#: ../../mod/profile_photo.php:224
+#: ../../mod/profile_photo.php:227
 msgid "Crop Image"
 msgstr ""
 
-#: ../../mod/profile_photo.php:225
+#: ../../mod/profile_photo.php:228
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 
-#: ../../mod/profile_photo.php:227
+#: ../../mod/profile_photo.php:230
 msgid "Done Editing"
 msgstr ""
 
-#: ../../mod/profile_photo.php:255
+#: ../../mod/profile_photo.php:264
 msgid "Image uploaded successfully."
 msgstr ""
 
@@ -2978,67 +3140,67 @@ msgstr ""
 msgid "New Message"
 msgstr ""
 
-#: ../../mod/message.php:69
+#: ../../mod/message.php:63
 msgid "Unable to locate contact information."
 msgstr ""
 
-#: ../../mod/message.php:119
+#: ../../mod/message.php:191
 msgid "Message deleted."
 msgstr ""
 
-#: ../../mod/message.php:149
+#: ../../mod/message.php:221
 msgid "Conversation removed."
 msgstr ""
 
-#: ../../mod/message.php:245
+#: ../../mod/message.php:327
 msgid "No messages."
 msgstr ""
 
-#: ../../mod/message.php:252
+#: ../../mod/message.php:334
 #, php-format
 msgid "Unknown sender - %s"
 msgstr ""
 
-#: ../../mod/message.php:255
+#: ../../mod/message.php:337
 #, php-format
 msgid "You and %s"
 msgstr ""
 
-#: ../../mod/message.php:258
+#: ../../mod/message.php:340
 #, php-format
 msgid "%s and You"
 msgstr ""
 
-#: ../../mod/message.php:268 ../../mod/message.php:390
+#: ../../mod/message.php:350 ../../mod/message.php:460
 msgid "Delete conversation"
 msgstr ""
 
-#: ../../mod/message.php:271
+#: ../../mod/message.php:353
 msgid "D, d M Y - g:i A"
 msgstr ""
 
-#: ../../mod/message.php:273
+#: ../../mod/message.php:355
 #, php-format
 msgid "%d message"
 msgid_plural "%d messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/message.php:308
+#: ../../mod/message.php:390
 msgid "Message not available."
 msgstr ""
 
-#: ../../mod/message.php:373
+#: ../../mod/message.php:443
 msgid "Delete message"
 msgstr ""
 
-#: ../../mod/message.php:392
+#: ../../mod/message.php:462
 msgid ""
 "No secure communications available. You <strong>may</strong> be able to "
 "respond from the sender's profile page."
 msgstr ""
 
-#: ../../mod/message.php:396
+#: ../../mod/message.php:466
 msgid "Send Reply"
 msgstr ""
 
@@ -3055,19 +3217,19 @@ msgstr ""
 msgid "Theme settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:96 ../../mod/admin.php:403
+#: ../../mod/admin.php:96 ../../mod/admin.php:421
 msgid "Site"
 msgstr ""
 
-#: ../../mod/admin.php:97 ../../mod/admin.php:639 ../../mod/admin.php:651
+#: ../../mod/admin.php:97 ../../mod/admin.php:660 ../../mod/admin.php:672
 msgid "Users"
 msgstr ""
 
-#: ../../mod/admin.php:98 ../../mod/admin.php:733 ../../mod/admin.php:775
+#: ../../mod/admin.php:98 ../../mod/admin.php:754 ../../mod/admin.php:796
 msgid "Plugins"
 msgstr ""
 
-#: ../../mod/admin.php:99 ../../mod/admin.php:938 ../../mod/admin.php:974
+#: ../../mod/admin.php:99 ../../mod/admin.php:959 ../../mod/admin.php:995
 msgid "Themes"
 msgstr ""
 
@@ -3075,598 +3237,630 @@ msgstr ""
 msgid "DB updates"
 msgstr ""
 
-#: ../../mod/admin.php:101
-msgid "Software Update"
+#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1082
+msgid "Logs"
 msgstr ""
 
-#: ../../mod/admin.php:115 ../../mod/admin.php:1061
-msgid "Logs"
+#: ../../mod/admin.php:120 ../../include/nav.php:146
+msgid "Admin"
+msgstr ""
+
+#: ../../mod/admin.php:121
+msgid "Plugin Features"
 msgstr ""
 
-#: ../../mod/admin.php:120
+#: ../../mod/admin.php:123
 msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: ../../mod/admin.php:195 ../../mod/admin.php:402 ../../mod/admin.php:638
-#: ../../mod/admin.php:732 ../../mod/admin.php:774 ../../mod/admin.php:937
-#: ../../mod/admin.php:973 ../../mod/admin.php:1060
+#: ../../mod/admin.php:183 ../../mod/admin.php:642
+msgid "Normal Account"
+msgstr ""
+
+#: ../../mod/admin.php:184 ../../mod/admin.php:643
+msgid "Soapbox Account"
+msgstr ""
+
+#: ../../mod/admin.php:185 ../../mod/admin.php:644
+msgid "Community/Celebrity Account"
+msgstr ""
+
+#: ../../mod/admin.php:186 ../../mod/admin.php:645
+msgid "Automatic Friend Account"
+msgstr ""
+
+#: ../../mod/admin.php:187
+msgid "Blog Account"
+msgstr ""
+
+#: ../../mod/admin.php:188
+msgid "Private Forum"
+msgstr ""
+
+#: ../../mod/admin.php:207
+msgid "Message queues"
+msgstr ""
+
+#: ../../mod/admin.php:212 ../../mod/admin.php:420 ../../mod/admin.php:659
+#: ../../mod/admin.php:753 ../../mod/admin.php:795 ../../mod/admin.php:958
+#: ../../mod/admin.php:994 ../../mod/admin.php:1081
 msgid "Administration"
 msgstr ""
 
-#: ../../mod/admin.php:196
+#: ../../mod/admin.php:213
 msgid "Summary"
 msgstr ""
 
-#: ../../mod/admin.php:197
+#: ../../mod/admin.php:215
 msgid "Registered users"
 msgstr ""
 
-#: ../../mod/admin.php:199
+#: ../../mod/admin.php:217
 msgid "Pending registrations"
 msgstr ""
 
-#: ../../mod/admin.php:200
+#: ../../mod/admin.php:218
 msgid "Version"
 msgstr ""
 
-#: ../../mod/admin.php:202
+#: ../../mod/admin.php:220
 msgid "Active plugins"
 msgstr ""
 
-#: ../../mod/admin.php:341
+#: ../../mod/admin.php:359
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:389
+#: ../../mod/admin.php:407
 msgid "Closed"
 msgstr ""
 
-#: ../../mod/admin.php:390
+#: ../../mod/admin.php:408
 msgid "Requires approval"
 msgstr ""
 
-#: ../../mod/admin.php:391
+#: ../../mod/admin.php:409
 msgid "Open"
 msgstr ""
 
-#: ../../mod/admin.php:395
+#: ../../mod/admin.php:413
 msgid "No SSL policy, links will track page SSL state"
 msgstr ""
 
-#: ../../mod/admin.php:396
+#: ../../mod/admin.php:414
 msgid "Force all links to use SSL"
 msgstr ""
 
-#: ../../mod/admin.php:397
+#: ../../mod/admin.php:415
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr ""
 
-#: ../../mod/admin.php:406
+#: ../../mod/admin.php:424
 msgid "File upload"
 msgstr ""
 
-#: ../../mod/admin.php:407
+#: ../../mod/admin.php:425
 msgid "Policies"
 msgstr ""
 
-#: ../../mod/admin.php:408
+#: ../../mod/admin.php:426
 msgid "Advanced"
 msgstr ""
 
-#: ../../mod/admin.php:412 ../../addon/statusnet/statusnet.php:552
+#: ../../mod/admin.php:430 ../../addon/statusnet/statusnet.php:567
 msgid "Site name"
 msgstr ""
 
-#: ../../mod/admin.php:413
+#: ../../mod/admin.php:431
 msgid "Banner/Logo"
 msgstr ""
 
-#: ../../mod/admin.php:414
+#: ../../mod/admin.php:432
 msgid "System language"
 msgstr ""
 
-#: ../../mod/admin.php:415
+#: ../../mod/admin.php:433
 msgid "System theme"
 msgstr ""
 
-#: ../../mod/admin.php:415
+#: ../../mod/admin.php:433
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr ""
 
-#: ../../mod/admin.php:416
+#: ../../mod/admin.php:434
 msgid "SSL link policy"
 msgstr ""
 
-#: ../../mod/admin.php:416
+#: ../../mod/admin.php:434
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr ""
 
-#: ../../mod/admin.php:417
+#: ../../mod/admin.php:435
 msgid "Maximum image size"
 msgstr ""
 
-#: ../../mod/admin.php:417
+#: ../../mod/admin.php:435
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
-#: ../../mod/admin.php:419
+#: ../../mod/admin.php:437
 msgid "Register policy"
 msgstr ""
 
-#: ../../mod/admin.php:420
+#: ../../mod/admin.php:438
 msgid "Register text"
 msgstr ""
 
-#: ../../mod/admin.php:420
+#: ../../mod/admin.php:438
 msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: ../../mod/admin.php:421
+#: ../../mod/admin.php:439
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: ../../mod/admin.php:421
+#: ../../mod/admin.php:439
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: ../../mod/admin.php:422
+#: ../../mod/admin.php:440
 msgid "Allowed friend domains"
 msgstr ""
 
-#: ../../mod/admin.php:422
+#: ../../mod/admin.php:440
 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:423
+#: ../../mod/admin.php:441
 msgid "Allowed email domains"
 msgstr ""
 
-#: ../../mod/admin.php:423
+#: ../../mod/admin.php:441
 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:424
+#: ../../mod/admin.php:442
 msgid "Block public"
 msgstr ""
 
-#: ../../mod/admin.php:424
+#: ../../mod/admin.php:442
 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:425
+#: ../../mod/admin.php:443
 msgid "Force publish"
 msgstr ""
 
-#: ../../mod/admin.php:425
+#: ../../mod/admin.php:443
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: ../../mod/admin.php:426
+#: ../../mod/admin.php:444
 msgid "Global directory update URL"
 msgstr ""
 
-#: ../../mod/admin.php:426
+#: ../../mod/admin.php:444
 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:428
+#: ../../mod/admin.php:446
 msgid "Block multiple registrations"
 msgstr ""
 
-#: ../../mod/admin.php:428
+#: ../../mod/admin.php:446
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr ""
 
-#: ../../mod/admin.php:429
+#: ../../mod/admin.php:447
 msgid "OpenID support"
 msgstr ""
 
-#: ../../mod/admin.php:429
+#: ../../mod/admin.php:447
 msgid "OpenID support for registration and logins."
 msgstr ""
 
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:448
 msgid "Fullname check"
 msgstr ""
 
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:448
 msgid ""
 "Force users to register with a space between firstname and lastname in Full "
 "name, as an antispam measure"
 msgstr ""
 
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:449
 msgid "UTF-8 Regular expressions"
 msgstr ""
 
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:449
 msgid "Use PHP UTF8 regular expressions"
 msgstr ""
 
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:450
 msgid "Show Community Page"
 msgstr ""
 
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:450
 msgid ""
 "Display a Community page showing all recent public postings on this site."
 msgstr ""
 
-#: ../../mod/admin.php:433
+#: ../../mod/admin.php:451
 msgid "Enable OStatus support"
 msgstr ""
 
-#: ../../mod/admin.php:433
+#: ../../mod/admin.php:451
 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:434
+#: ../../mod/admin.php:452
 msgid "Enable Diaspora support"
 msgstr ""
 
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:452
 msgid "Provide built-in Diaspora network compatibility."
 msgstr ""
 
-#: ../../mod/admin.php:435
+#: ../../mod/admin.php:453
 msgid "Only allow Friendica contacts"
 msgstr ""
 
-#: ../../mod/admin.php:435
+#: ../../mod/admin.php:453
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr ""
 
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:454
 msgid "Verify SSL"
 msgstr ""
 
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:454
 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:437
+#: ../../mod/admin.php:455
 msgid "Proxy user"
 msgstr ""
 
-#: ../../mod/admin.php:438
+#: ../../mod/admin.php:456
 msgid "Proxy URL"
 msgstr ""
 
-#: ../../mod/admin.php:439
+#: ../../mod/admin.php:457
 msgid "Network timeout"
 msgstr ""
 
-#: ../../mod/admin.php:439
+#: ../../mod/admin.php:457
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: ../../mod/admin.php:440
+#: ../../mod/admin.php:458
 msgid "Delivery interval"
 msgstr ""
 
-#: ../../mod/admin.php:440
+#: ../../mod/admin.php:458
 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:441
+#: ../../mod/admin.php:459
 msgid "Poll interval"
 msgstr ""
 
-#: ../../mod/admin.php:441
+#: ../../mod/admin.php:459
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr ""
 
-#: ../../mod/admin.php:442
+#: ../../mod/admin.php:460
 msgid "Maximum Load Average"
 msgstr ""
 
-#: ../../mod/admin.php:442
+#: ../../mod/admin.php:460
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr ""
 
-#: ../../mod/admin.php:456
+#: ../../mod/admin.php:477
 msgid "Update has been marked successful"
 msgstr ""
 
-#: ../../mod/admin.php:466
+#: ../../mod/admin.php:487
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr ""
 
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:490
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr ""
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:494
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: ../../mod/admin.php:476
+#: ../../mod/admin.php:497
 #, php-format
 msgid "Update function %s could not be found."
 msgstr ""
 
-#: ../../mod/admin.php:491
+#: ../../mod/admin.php:512
 msgid "No failed updates."
 msgstr ""
 
-#: ../../mod/admin.php:495
+#: ../../mod/admin.php:516
 msgid "Failed Updates"
 msgstr ""
 
-#: ../../mod/admin.php:496
+#: ../../mod/admin.php:517
 msgid ""
 "This does not include updates prior to 1139, which did not return a status."
 msgstr ""
 
-#: ../../mod/admin.php:497
+#: ../../mod/admin.php:518
 msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: ../../mod/admin.php:498
+#: ../../mod/admin.php:519
 msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: ../../mod/admin.php:523
+#: ../../mod/admin.php:544
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:530
+#: ../../mod/admin.php:551
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:569
+#: ../../mod/admin.php:590
 #, php-format
 msgid "User '%s' deleted"
 msgstr ""
 
-#: ../../mod/admin.php:577
+#: ../../mod/admin.php:598
 #, php-format
 msgid "User '%s' unblocked"
 msgstr ""
 
-#: ../../mod/admin.php:577
+#: ../../mod/admin.php:598
 #, php-format
 msgid "User '%s' blocked"
 msgstr ""
 
-#: ../../mod/admin.php:641
+#: ../../mod/admin.php:662
 msgid "select all"
 msgstr ""
 
-#: ../../mod/admin.php:642
+#: ../../mod/admin.php:663
 msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../mod/admin.php:643
+#: ../../mod/admin.php:664
 msgid "Request date"
 msgstr ""
 
-#: ../../mod/admin.php:643 ../../mod/admin.php:652
+#: ../../mod/admin.php:664 ../../mod/admin.php:673
 #: ../../include/contact_selectors.php:79
 msgid "Email"
 msgstr ""
 
-#: ../../mod/admin.php:644
+#: ../../mod/admin.php:665
 msgid "No registrations."
 msgstr ""
 
-#: ../../mod/admin.php:646
+#: ../../mod/admin.php:667
 msgid "Deny"
 msgstr ""
 
-#: ../../mod/admin.php:652
+#: ../../mod/admin.php:673
 msgid "Register date"
 msgstr ""
 
-#: ../../mod/admin.php:652
+#: ../../mod/admin.php:673
 msgid "Last login"
 msgstr ""
 
-#: ../../mod/admin.php:652
+#: ../../mod/admin.php:673
 msgid "Last item"
 msgstr ""
 
-#: ../../mod/admin.php:652
+#: ../../mod/admin.php:673
 msgid "Account"
 msgstr ""
 
-#: ../../mod/admin.php:654
+#: ../../mod/admin.php:675
 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:655
+#: ../../mod/admin.php:676
 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:696
+#: ../../mod/admin.php:717
 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../mod/admin.php:700
+#: ../../mod/admin.php:721
 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../mod/admin.php:710 ../../mod/admin.php:908
+#: ../../mod/admin.php:731 ../../mod/admin.php:929
 msgid "Disable"
 msgstr ""
 
-#: ../../mod/admin.php:712 ../../mod/admin.php:910
+#: ../../mod/admin.php:733 ../../mod/admin.php:931
 msgid "Enable"
 msgstr ""
 
-#: ../../mod/admin.php:734 ../../mod/admin.php:939
+#: ../../mod/admin.php:755 ../../mod/admin.php:960
 msgid "Toggle"
 msgstr ""
 
-#: ../../mod/admin.php:742 ../../mod/admin.php:949
+#: ../../mod/admin.php:763 ../../mod/admin.php:970
 msgid "Author: "
 msgstr ""
 
-#: ../../mod/admin.php:743 ../../mod/admin.php:950
+#: ../../mod/admin.php:764 ../../mod/admin.php:971
 msgid "Maintainer: "
 msgstr ""
 
-#: ../../mod/admin.php:872
+#: ../../mod/admin.php:893
 msgid "No themes found."
 msgstr ""
 
-#: ../../mod/admin.php:931
+#: ../../mod/admin.php:952
 msgid "Screenshot"
 msgstr ""
 
-#: ../../mod/admin.php:979
+#: ../../mod/admin.php:1000
 msgid "[Experimental]"
 msgstr ""
 
-#: ../../mod/admin.php:980
+#: ../../mod/admin.php:1001
 msgid "[Unsupported]"
 msgstr ""
 
-#: ../../mod/admin.php:1007
+#: ../../mod/admin.php:1028
 msgid "Log settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:1063
+#: ../../mod/admin.php:1084
 msgid "Clear"
 msgstr ""
 
-#: ../../mod/admin.php:1069
+#: ../../mod/admin.php:1090
 msgid "Debugging"
 msgstr ""
 
-#: ../../mod/admin.php:1070
+#: ../../mod/admin.php:1091
 msgid "Log file"
 msgstr ""
 
-#: ../../mod/admin.php:1070
+#: ../../mod/admin.php:1091
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr ""
 
-#: ../../mod/admin.php:1071
+#: ../../mod/admin.php:1092
 msgid "Log level"
 msgstr ""
 
-#: ../../mod/admin.php:1121
+#: ../../mod/admin.php:1142
 msgid "Close"
 msgstr ""
 
-#: ../../mod/admin.php:1127
+#: ../../mod/admin.php:1148
 msgid "FTP Host"
 msgstr ""
 
-#: ../../mod/admin.php:1128
+#: ../../mod/admin.php:1149
 msgid "FTP Path"
 msgstr ""
 
-#: ../../mod/admin.php:1129
+#: ../../mod/admin.php:1150
 msgid "FTP User"
 msgstr ""
 
-#: ../../mod/admin.php:1130
+#: ../../mod/admin.php:1151
 msgid "FTP Password"
 msgstr ""
 
-#: ../../mod/profile.php:21 ../../boot.php:959
+#: ../../mod/profile.php:21 ../../boot.php:1043
 msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../mod/profile.php:126 ../../mod/display.php:75
+#: ../../mod/profile.php:141 ../../mod/display.php:67
 msgid "Access to this profile has been restricted."
 msgstr ""
 
-#: ../../mod/profile.php:151
+#: ../../mod/profile.php:166
 msgid "Tips for New Members"
 msgstr ""
 
-#: ../../mod/ping.php:177
+#: ../../mod/ping.php:185
 msgid "{0} wants to be your friend"
 msgstr ""
 
-#: ../../mod/ping.php:182
+#: ../../mod/ping.php:190
 msgid "{0} sent you a message"
 msgstr ""
 
-#: ../../mod/ping.php:187
+#: ../../mod/ping.php:195
 msgid "{0} requested registration"
 msgstr ""
 
-#: ../../mod/ping.php:193
+#: ../../mod/ping.php:201
 #, php-format
 msgid "{0} commented %s's post"
 msgstr ""
 
-#: ../../mod/ping.php:198
+#: ../../mod/ping.php:206
 #, php-format
 msgid "{0} liked %s's post"
 msgstr ""
 
-#: ../../mod/ping.php:203
+#: ../../mod/ping.php:211
 #, php-format
 msgid "{0} disliked %s's post"
 msgstr ""
 
-#: ../../mod/ping.php:208
+#: ../../mod/ping.php:216
 #, php-format
 msgid "{0} is now friends with %s"
 msgstr ""
 
-#: ../../mod/ping.php:213
+#: ../../mod/ping.php:221
 msgid "{0} posted"
 msgstr ""
 
-#: ../../mod/ping.php:218
+#: ../../mod/ping.php:226
 #, php-format
 msgid "{0} tagged %s's post with #%s"
 msgstr ""
 
-#: ../../mod/ping.php:224
+#: ../../mod/ping.php:232
 msgid "{0} mentioned you in a post"
 msgstr ""
 
@@ -3683,64 +3877,13 @@ msgid ""
 "Account not found and OpenID registration is not permitted on this site."
 msgstr ""
 
-#: ../../mod/openid.php:93 ../../include/auth.php:90
-#: ../../include/auth.php:153
+#: ../../mod/openid.php:93 ../../include/auth.php:99
+#: ../../include/auth.php:162
 msgid "Login failed."
 msgstr ""
 
-#: ../../mod/follow.php:30
-msgid "Connect URL missing."
-msgstr ""
-
-#: ../../mod/follow.php:56
-msgid ""
-"This site is not configured to allow communications with other networks."
-msgstr ""
-
-#: ../../mod/follow.php:57 ../../mod/follow.php:72
-msgid "No compatible communication protocols or feeds were discovered."
-msgstr ""
-
-#: ../../mod/follow.php:70
-msgid "The profile address specified does not provide adequate information."
-msgstr ""
-
-#: ../../mod/follow.php:74
-msgid "An author or name was not found."
-msgstr ""
-
-#: ../../mod/follow.php:76
-msgid "No browser URL could be matched to this address."
-msgstr ""
-
-#: ../../mod/follow.php:78
-msgid ""
-"Unable to match @-style Identity Address with a known protocol or email "
-"contact."
-msgstr ""
-
-#: ../../mod/follow.php:79
-msgid "Use mailto: in front of address to force email check."
-msgstr ""
-
-#: ../../mod/follow.php:85
-msgid ""
-"The profile address specified belongs to a network which has been disabled "
-"on this site."
-msgstr ""
-
-#: ../../mod/follow.php:90
-msgid ""
-"Limited profile. This person will be unable to receive direct/personal "
-"notifications from you."
-msgstr ""
-
-#: ../../mod/follow.php:161
-msgid "Unable to retrieve contact information."
-msgstr ""
-
-#: ../../mod/follow.php:216
-msgid "following"
+#: ../../mod/follow.php:27
+msgid "Contact added"
 msgstr ""
 
 #: ../../mod/common.php:42
@@ -3751,7 +3894,11 @@ msgstr ""
 msgid "No contacts in common."
 msgstr ""
 
-#: ../../mod/display.php:135
+#: ../../mod/share.php:28
+msgid "link"
+msgstr ""
+
+#: ../../mod/display.php:127
 msgid "Item has been removed."
 msgstr ""
 
@@ -3763,12 +3910,13 @@ msgstr ""
 msgid "No installed applications."
 msgstr ""
 
-#: ../../mod/search.php:83
-msgid "Search This Site"
+#: ../../mod/search.php:83 ../../include/text.php:674
+#: ../../include/text.php:675 ../../include/nav.php:91
+msgid "Search"
 msgstr ""
 
-#: ../../mod/profiles.php:21 ../../mod/profiles.php:375
-#: ../../mod/profiles.php:489 ../../mod/dfrn_confirm.php:62
+#: ../../mod/profiles.php:21 ../../mod/profiles.php:418
+#: ../../mod/profiles.php:532 ../../mod/dfrn_confirm.php:62
 msgid "Profile not found."
 msgstr ""
 
@@ -3776,272 +3924,306 @@ msgstr ""
 msgid "Profile Name is required."
 msgstr ""
 
-#: ../../mod/profiles.php:145
+#: ../../mod/profiles.php:155
 msgid "Marital Status"
 msgstr ""
 
-#: ../../mod/profiles.php:149
+#: ../../mod/profiles.php:159
 msgid "Romantic Partner"
 msgstr ""
 
-#: ../../mod/profiles.php:153
+#: ../../mod/profiles.php:163
+msgid "Likes"
+msgstr ""
+
+#: ../../mod/profiles.php:167
+msgid "Dislikes"
+msgstr ""
+
+#: ../../mod/profiles.php:171
 msgid "Work/Employment"
 msgstr ""
 
-#: ../../mod/profiles.php:156
+#: ../../mod/profiles.php:174
 msgid "Religion"
 msgstr ""
 
-#: ../../mod/profiles.php:160
+#: ../../mod/profiles.php:178
 msgid "Political Views"
 msgstr ""
 
-#: ../../mod/profiles.php:164
+#: ../../mod/profiles.php:182
 msgid "Gender"
 msgstr ""
 
-#: ../../mod/profiles.php:168
+#: ../../mod/profiles.php:186
 msgid "Sexual Preference"
 msgstr ""
 
-#: ../../mod/profiles.php:172
+#: ../../mod/profiles.php:190
 msgid "Homepage"
 msgstr ""
 
-#: ../../mod/profiles.php:176
+#: ../../mod/profiles.php:194
 msgid "Interests"
 msgstr ""
 
-#: ../../mod/profiles.php:181
+#: ../../mod/profiles.php:198
+msgid "Address"
+msgstr ""
+
+#: ../../mod/profiles.php:205 ../../addon/dav/common/wdcal_edit.inc.php:183
 msgid "Location"
 msgstr ""
 
-#: ../../mod/profiles.php:253
+#: ../../mod/profiles.php:288
 msgid "Profile updated."
 msgstr ""
 
-#: ../../mod/profiles.php:320
+#: ../../mod/profiles.php:355
 msgid " and "
 msgstr ""
 
-#: ../../mod/profiles.php:328
+#: ../../mod/profiles.php:363
 msgid "public profile"
 msgstr ""
 
-#: ../../mod/profiles.php:331
+#: ../../mod/profiles.php:366
 #, php-format
 msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
 msgstr ""
 
-#: ../../mod/profiles.php:335
+#: ../../mod/profiles.php:367
+#, php-format
+msgid " - Visit %1$s's %2$s"
+msgstr ""
+
+#: ../../mod/profiles.php:370
 #, php-format
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: ../../mod/profiles.php:394
+#: ../../mod/profiles.php:437
 msgid "Profile deleted."
 msgstr ""
 
-#: ../../mod/profiles.php:412 ../../mod/profiles.php:446
+#: ../../mod/profiles.php:455 ../../mod/profiles.php:489
 msgid "Profile-"
 msgstr ""
 
-#: ../../mod/profiles.php:431 ../../mod/profiles.php:473
+#: ../../mod/profiles.php:474 ../../mod/profiles.php:516
 msgid "New profile created."
 msgstr ""
 
-#: ../../mod/profiles.php:452
+#: ../../mod/profiles.php:495
 msgid "Profile unavailable to clone."
 msgstr ""
 
-#: ../../mod/profiles.php:510
+#: ../../mod/profiles.php:557
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr ""
 
-#: ../../mod/profiles.php:533
+#: ../../mod/profiles.php:577
 msgid "Edit Profile Details"
 msgstr ""
 
-#: ../../mod/profiles.php:535
+#: ../../mod/profiles.php:579
 msgid "View this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:536
+#: ../../mod/profiles.php:580
 msgid "Create a new profile using these settings"
 msgstr ""
 
-#: ../../mod/profiles.php:537
+#: ../../mod/profiles.php:581
 msgid "Clone this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:538
+#: ../../mod/profiles.php:582
 msgid "Delete this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:539
+#: ../../mod/profiles.php:583
 msgid "Profile Name:"
 msgstr ""
 
-#: ../../mod/profiles.php:540
+#: ../../mod/profiles.php:584
 msgid "Your Full Name:"
 msgstr ""
 
-#: ../../mod/profiles.php:541
+#: ../../mod/profiles.php:585
 msgid "Title/Description:"
 msgstr ""
 
-#: ../../mod/profiles.php:542
+#: ../../mod/profiles.php:586
 msgid "Your Gender:"
 msgstr ""
 
-#: ../../mod/profiles.php:543
+#: ../../mod/profiles.php:587
 #, php-format
 msgid "Birthday (%s):"
 msgstr ""
 
-#: ../../mod/profiles.php:544
+#: ../../mod/profiles.php:588
 msgid "Street Address:"
 msgstr ""
 
-#: ../../mod/profiles.php:545
+#: ../../mod/profiles.php:589
 msgid "Locality/City:"
 msgstr ""
 
-#: ../../mod/profiles.php:546
+#: ../../mod/profiles.php:590
 msgid "Postal/Zip Code:"
 msgstr ""
 
-#: ../../mod/profiles.php:547
+#: ../../mod/profiles.php:591
 msgid "Country:"
 msgstr ""
 
-#: ../../mod/profiles.php:548
+#: ../../mod/profiles.php:592
 msgid "Region/State:"
 msgstr ""
 
-#: ../../mod/profiles.php:549
+#: ../../mod/profiles.php:593
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr ""
 
-#: ../../mod/profiles.php:550
+#: ../../mod/profiles.php:594
 msgid "Who: (if applicable)"
 msgstr ""
 
-#: ../../mod/profiles.php:551
+#: ../../mod/profiles.php:595
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: ../../mod/profiles.php:552 ../../include/profile_advanced.php:43
+#: ../../mod/profiles.php:596
+msgid "Since [date]:"
+msgstr ""
+
+#: ../../mod/profiles.php:597 ../../include/profile_advanced.php:46
 msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../mod/profiles.php:553
+#: ../../mod/profiles.php:598
 msgid "Homepage URL:"
 msgstr ""
 
-#: ../../mod/profiles.php:554 ../../include/profile_advanced.php:49
+#: ../../mod/profiles.php:599 ../../include/profile_advanced.php:50
+msgid "Hometown:"
+msgstr ""
+
+#: ../../mod/profiles.php:600 ../../include/profile_advanced.php:54
 msgid "Political Views:"
 msgstr ""
 
-#: ../../mod/profiles.php:555
+#: ../../mod/profiles.php:601
 msgid "Religious Views:"
 msgstr ""
 
-#: ../../mod/profiles.php:556
+#: ../../mod/profiles.php:602
 msgid "Public Keywords:"
 msgstr ""
 
-#: ../../mod/profiles.php:557
+#: ../../mod/profiles.php:603
 msgid "Private Keywords:"
 msgstr ""
 
-#: ../../mod/profiles.php:558
+#: ../../mod/profiles.php:604 ../../include/profile_advanced.php:62
+msgid "Likes:"
+msgstr ""
+
+#: ../../mod/profiles.php:605 ../../include/profile_advanced.php:64
+msgid "Dislikes:"
+msgstr ""
+
+#: ../../mod/profiles.php:606
 msgid "Example: fishing photography software"
 msgstr ""
 
-#: ../../mod/profiles.php:559
+#: ../../mod/profiles.php:607
 msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr ""
 
-#: ../../mod/profiles.php:560
+#: ../../mod/profiles.php:608
 msgid "(Used for searching profiles, never shown to others)"
 msgstr ""
 
-#: ../../mod/profiles.php:561
+#: ../../mod/profiles.php:609
 msgid "Tell us about yourself..."
 msgstr ""
 
-#: ../../mod/profiles.php:562
+#: ../../mod/profiles.php:610
 msgid "Hobbies/Interests"
 msgstr ""
 
-#: ../../mod/profiles.php:563
+#: ../../mod/profiles.php:611
 msgid "Contact information and Social Networks"
 msgstr ""
 
-#: ../../mod/profiles.php:564
+#: ../../mod/profiles.php:612
 msgid "Musical interests"
 msgstr ""
 
-#: ../../mod/profiles.php:565
+#: ../../mod/profiles.php:613
 msgid "Books, literature"
 msgstr ""
 
-#: ../../mod/profiles.php:566
+#: ../../mod/profiles.php:614
 msgid "Television"
 msgstr ""
 
-#: ../../mod/profiles.php:567
+#: ../../mod/profiles.php:615
 msgid "Film/dance/culture/entertainment"
 msgstr ""
 
-#: ../../mod/profiles.php:568
+#: ../../mod/profiles.php:616
 msgid "Love/romance"
 msgstr ""
 
-#: ../../mod/profiles.php:569
+#: ../../mod/profiles.php:617
 msgid "Work/employment"
 msgstr ""
 
-#: ../../mod/profiles.php:570
+#: ../../mod/profiles.php:618
 msgid "School/education"
 msgstr ""
 
-#: ../../mod/profiles.php:575
+#: ../../mod/profiles.php:623
 msgid ""
 "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
 "be visible to anybody using the internet."
 msgstr ""
 
-#: ../../mod/profiles.php:585 ../../mod/directory.php:111
+#: ../../mod/profiles.php:633 ../../mod/directory.php:109
 msgid "Age: "
 msgstr ""
 
-#: ../../mod/profiles.php:620
+#: ../../mod/profiles.php:672
 msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/profiles.php:621 ../../boot.php:1068
+#: ../../mod/profiles.php:673 ../../boot.php:1152
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/profiles.php:622 ../../boot.php:1069
+#: ../../mod/profiles.php:674 ../../boot.php:1153
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/profiles.php:633 ../../boot.php:1079
+#: ../../mod/profiles.php:685 ../../boot.php:1163
 msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/profiles.php:635 ../../boot.php:1082
+#: ../../mod/profiles.php:687 ../../boot.php:1166
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../mod/profiles.php:636 ../../boot.php:1083
+#: ../../mod/profiles.php:688 ../../boot.php:1167
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../mod/filer.php:29 ../../include/conversation.php:925
+#: ../../mod/filer.php:29 ../../include/conversation.php:1069
+#: ../../include/conversation.php:1086
 msgid "Save to Folder:"
 msgstr ""
 
@@ -4049,7 +4231,7 @@ msgstr ""
 msgid "- select -"
 msgstr ""
 
-#: ../../mod/tagger.php:103 ../../include/conversation.php:138
+#: ../../mod/tagger.php:103 ../../include/conversation.php:242
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
@@ -4089,22 +4271,66 @@ msgstr ""
 msgid "No entries."
 msgstr ""
 
-#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:621
-#: ../../include/contact_widgets.php:34
-msgid "Friend Suggestions"
+#: ../../mod/babel.php:17
+msgid "Source (bbcode) text:"
 msgstr ""
 
-#: ../../mod/suggest.php:44
-msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
+#: ../../mod/babel.php:23
+msgid "Source (Diaspora) text to convert to BBcode:"
 msgstr ""
 
-#: ../../mod/suggest.php:61
+#: ../../mod/babel.php:31
+msgid "Source input: "
+msgstr ""
+
+#: ../../mod/babel.php:35
+msgid "bb2html: "
+msgstr ""
+
+#: ../../mod/babel.php:39
+msgid "bb2html2bb: "
+msgstr ""
+
+#: ../../mod/babel.php:43
+msgid "bb2md: "
+msgstr ""
+
+#: ../../mod/babel.php:47
+msgid "bb2md2html: "
+msgstr ""
+
+#: ../../mod/babel.php:51
+msgid "bb2dia2bb: "
+msgstr ""
+
+#: ../../mod/babel.php:55
+msgid "bb2md2html2bb: "
+msgstr ""
+
+#: ../../mod/babel.php:65
+msgid "Source input (Diaspora format): "
+msgstr ""
+
+#: ../../mod/babel.php:70
+msgid "diaspora2bb: "
+msgstr ""
+
+#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:626
+#: ../../include/contact_widgets.php:34
+msgid "Friend Suggestions"
+msgstr ""
+
+#: ../../mod/suggest.php:44
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
+msgstr ""
+
+#: ../../mod/suggest.php:61
 msgid "Ignore/Hide"
 msgstr ""
 
-#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:619
+#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:624
 msgid "Global Directory"
 msgstr ""
 
@@ -4116,11 +4342,30 @@ msgstr ""
 msgid "Site Directory"
 msgstr ""
 
-#: ../../mod/directory.php:114
+#: ../../mod/directory.php:112
 msgid "Gender: "
 msgstr ""
 
-#: ../../mod/directory.php:140
+#: ../../mod/directory.php:134 ../../include/profile_advanced.php:17
+#: ../../boot.php:1188
+msgid "Gender:"
+msgstr ""
+
+#: ../../mod/directory.php:136 ../../include/profile_advanced.php:37
+#: ../../boot.php:1191
+msgid "Status:"
+msgstr ""
+
+#: ../../mod/directory.php:138 ../../include/profile_advanced.php:48
+#: ../../boot.php:1193
+msgid "Homepage:"
+msgstr ""
+
+#: ../../mod/directory.php:140 ../../include/profile_advanced.php:58
+msgid "About:"
+msgstr ""
+
+#: ../../mod/directory.php:178
 msgid "No entries (some entries may be hidden)."
 msgstr ""
 
@@ -4214,70 +4459,70 @@ msgid ""
 "has already been approved."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:242
+#: ../../mod/dfrn_confirm.php:237
 msgid "Response from remote site was not understood."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:251
+#: ../../mod/dfrn_confirm.php:246
 msgid "Unexpected response from remote site: "
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:259
+#: ../../mod/dfrn_confirm.php:254
 msgid "Confirmation completed successfully."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:261 ../../mod/dfrn_confirm.php:275
-#: ../../mod/dfrn_confirm.php:282
+#: ../../mod/dfrn_confirm.php:256 ../../mod/dfrn_confirm.php:270
+#: ../../mod/dfrn_confirm.php:277
 msgid "Remote site reported: "
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:273
+#: ../../mod/dfrn_confirm.php:268
 msgid "Temporary failure. Please wait and try again."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:280
+#: ../../mod/dfrn_confirm.php:275
 msgid "Introduction failed or was revoked."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:425
+#: ../../mod/dfrn_confirm.php:420
 msgid "Unable to set contact photo."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:482 ../../include/diaspora.php:507
-#: ../../include/conversation.php:101
+#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:577
+#: ../../include/conversation.php:162
 #, php-format
 msgid "%1$s is now friends with %2$s"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:564
+#: ../../mod/dfrn_confirm.php:562
 #, php-format
 msgid "No user record found for '%s' "
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:574
+#: ../../mod/dfrn_confirm.php:572
 msgid "Our site encryption key is apparently messed up."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:585
+#: ../../mod/dfrn_confirm.php:583
 msgid "Empty site URL was provided or URL could not be decrypted by us."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:606
+#: ../../mod/dfrn_confirm.php:604
 msgid "Contact record was not found for you on our site."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:620
+#: ../../mod/dfrn_confirm.php:618
 #, php-format
 msgid "Site public key not available in contact record for URL %s."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:640
+#: ../../mod/dfrn_confirm.php:638
 msgid ""
 "The ID provided by your system is a duplicate on our system. It should work "
 "if you try again."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:651
+#: ../../mod/dfrn_confirm.php:649
 msgid "Unable to set your contact credentials on our system."
 msgstr ""
 
@@ -4295,83 +4540,99 @@ msgstr ""
 msgid "%1$s has joined %2$s"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:509
+#: ../../addon/fromgplus/fromgplus.php:29
+msgid "Google+ Import Settings"
+msgstr ""
+
+#: ../../addon/fromgplus/fromgplus.php:32
+msgid "Enable Google+ Import"
+msgstr ""
+
+#: ../../addon/fromgplus/fromgplus.php:35
+msgid "Google Account ID"
+msgstr ""
+
+#: ../../addon/fromgplus/fromgplus.php:55
+msgid "Google+ Import Settings saved."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:523
 msgid "Facebook disabled"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:514
+#: ../../addon/facebook/facebook.php:528
 msgid "Updating contacts"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:537
+#: ../../addon/facebook/facebook.php:551
 msgid "Facebook API key is missing."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:544
+#: ../../addon/facebook/facebook.php:558
 msgid "Facebook Connect"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:550
+#: ../../addon/facebook/facebook.php:564
 msgid "Install Facebook connector for this account."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:557
+#: ../../addon/facebook/facebook.php:571
 msgid "Remove Facebook connector"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:562
+#: ../../addon/facebook/facebook.php:576
 msgid ""
 "Re-authenticate [This is necessary whenever your Facebook password is "
 "changed.]"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:569
+#: ../../addon/facebook/facebook.php:583
 msgid "Post to Facebook by default"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:575
+#: ../../addon/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:579
+#: ../../addon/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:582
+#: ../../addon/facebook/facebook.php:596
 msgid "Link all your Facebook friends and conversations on this website"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:584
+#: ../../addon/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:585
+#: ../../addon/facebook/facebook.php:599
 msgid "On this website, your Facebook friend stream is only visible to you."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:586
+#: ../../addon/facebook/facebook.php:600
 msgid ""
 "The following settings determine the privacy of your Facebook profile wall "
 "on this website."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:590
+#: ../../addon/facebook/facebook.php:604
 msgid ""
 "On this website your Facebook profile wall conversations will only be "
 "visible to you"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:595
+#: ../../addon/facebook/facebook.php:609
 msgid "Do not import your Facebook profile wall conversations"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:597
+#: ../../addon/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 "
@@ -4379,319 +4640,1037 @@ msgid ""
 "who may see the conversations."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:602
+#: ../../addon/facebook/facebook.php:616
 msgid "Comma separated applications to ignore"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:686
+#: ../../addon/facebook/facebook.php:700
 msgid "Problems with Facebook Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:714
+#: ../../addon/facebook/facebook.php:728
 #: ../../include/contact_selectors.php:81
 msgid "Facebook"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:715
+#: ../../addon/facebook/facebook.php:729
 msgid "Facebook Connector Settings"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:730
+#: ../../addon/facebook/facebook.php:744
 msgid "Facebook API Key"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:740
+#: ../../addon/facebook/facebook.php:754
 msgid ""
 "Error: it appears that you have specified the App-ID and -Secret in your ."
 "htconfig.php file. As long as they are specified there, they cannot be set "
 "using this form.<br><br>"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:745
+#: ../../addon/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:747
+#: ../../addon/facebook/facebook.php:761
 msgid "The given API Key seems to work correctly."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:749
+#: ../../addon/facebook/facebook.php:763
 msgid ""
-"The correctness of the API Key could not be detected. Somthing strange's "
+"The correctness of the API Key could not be detected. Something strange's "
 "going on."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:752
+#: ../../addon/facebook/facebook.php:766
 msgid "App-ID / API-Key"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:753
+#: ../../addon/facebook/facebook.php:767
 msgid "Application secret"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:754
+#: ../../addon/facebook/facebook.php:768
 #, php-format
 msgid "Polling Interval in minutes (minimum %1$s minutes)"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:755
+#: ../../addon/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:759
+#: ../../addon/facebook/facebook.php:773
 msgid "Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:763
+#: ../../addon/facebook/facebook.php:777
 msgid "Real-Time Updates are activated."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:764
+#: ../../addon/facebook/facebook.php:778
 msgid "Deactivate Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:766
+#: ../../addon/facebook/facebook.php:780
 msgid "Real-Time Updates not activated."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:766
+#: ../../addon/facebook/facebook.php:780
 msgid "Activate Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:785
+#: ../../addon/facebook/facebook.php:799 ../../addon/dav/layout.fnk.php:361
 msgid "The new values have been saved."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:809
+#: ../../addon/facebook/facebook.php:823
 msgid "Post to Facebook"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:907
+#: ../../addon/facebook/facebook.php:921
 msgid ""
 "Post to Facebook cancelled because of multi-network access permission "
 "conflict."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1127
-msgid "View on Friendica"
+#: ../../addon/facebook/facebook.php:1149
+msgid "View on Friendica"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:1182
+msgid "Facebook post failed. Queued for retry."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:1222
+msgid "Your Facebook connection became invalid. Please Re-authenticate."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:1223
+msgid "Facebook connection became invalid"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:1224
+#, php-format
+msgid ""
+"Hi %1$s,\n"
+"\n"
+"The connection between your accounts on %2$s and Facebook became invalid. "
+"This usually happens after you change your Facebook-password. To enable the "
+"connection again, you have to %3$sre-authenticate the Facebook-connector%4$s."
+msgstr ""
+
+#: ../../addon/snautofollow/snautofollow.php:32
+msgid "StatusNet AutoFollow settings updated."
+msgstr ""
+
+#: ../../addon/snautofollow/snautofollow.php:56
+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"
+msgstr ""
+
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:233
+msgid "Lifetime of the cache (in hours)"
+msgstr ""
+
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:238
+msgid "Cache Statistics"
+msgstr ""
+
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:241
+msgid "Number of items"
+msgstr ""
+
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:243
+msgid "Size of the cache"
+msgstr ""
+
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:245
+msgid "Delete the whole cache"
+msgstr ""
+
+#: ../../addon/widgets/widget_like.php:58
+#, php-format
+msgid "%d person likes this"
+msgid_plural "%d people like this"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../addon/widgets/widget_like.php:61
+#, php-format
+msgid "%d person doesn't like this"
+msgid_plural "%d people don't like this"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../addon/widgets/widget_friendheader.php:40
+msgid "Get added to this list!"
+msgstr ""
+
+#: ../../addon/widgets/widgets.php:56
+msgid "Generate new key"
+msgstr ""
+
+#: ../../addon/widgets/widgets.php:59
+msgid "Widgets key"
+msgstr ""
+
+#: ../../addon/widgets/widgets.php:61
+msgid "Widgets available"
+msgstr ""
+
+#: ../../addon/widgets/widget_friends.php:40
+msgid "Connect on Friendica!"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:19
+msgid "bitchslap"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:19
+msgid "bitchslapped"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:20
+msgid "shag"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:20
+msgid "shagged"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:21
+msgid "do something obscenely biological to"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:21
+msgid "did something obscenely biological to"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:22
+msgid "point out the new poke feature to"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:22
+msgid "pointed out the new poke feature to"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:23
+msgid "declare undying love for"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:23
+msgid "declared undying love for"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:24
+msgid "set fire to"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:25
+msgid "patent"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:25
+msgid "patented"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:26
+msgid "stroke beard"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:26
+msgid "stroked their beard at"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:27
+msgid ""
+"bemoan the declining standards of modern secondary and tertiary education to"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:27
+msgid ""
+"bemoans the declining standards of modern secondary and tertiary education to"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:28
+msgid "hug"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:28
+msgid "hugged"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:29
+msgid "kiss"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:29
+msgid "kissed"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:30
+msgid "raise eyebrows at"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:30
+msgid "raised their eyebrows at"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:31
+msgid "insult"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:31
+msgid "insulted"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:32
+msgid "praise"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:32
+msgid "praised"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:33
+msgid "be dubious of"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:33
+msgid "was dubious of"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:34
+msgid "eat"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:34
+msgid "ate"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:35
+msgid "giggle and fawn at"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:35
+msgid "giggled and fawned at"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:36
+msgid "doubt"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:36
+msgid "doubted"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:37
+msgid "glare"
+msgstr ""
+
+#: ../../addon/morepokes/morepokes.php:37
+msgid "glared at"
+msgstr ""
+
+#: ../../addon/yourls/yourls.php:55
+msgid "YourLS Settings"
+msgstr ""
+
+#: ../../addon/yourls/yourls.php:57
+msgid "URL: http://"
+msgstr ""
+
+#: ../../addon/yourls/yourls.php:62
+msgid "Username:"
+msgstr ""
+
+#: ../../addon/yourls/yourls.php:67
+msgid "Password:"
+msgstr ""
+
+#: ../../addon/yourls/yourls.php:72
+msgid "Use SSL "
+msgstr ""
+
+#: ../../addon/yourls/yourls.php:92
+msgid "yourls Settings saved."
+msgstr ""
+
+#: ../../addon/ljpost/ljpost.php:39
+msgid "Post to LiveJournal"
+msgstr ""
+
+#: ../../addon/ljpost/ljpost.php:70
+msgid "LiveJournal Post Settings"
+msgstr ""
+
+#: ../../addon/ljpost/ljpost.php:72
+msgid "Enable LiveJournal Post Plugin"
+msgstr ""
+
+#: ../../addon/ljpost/ljpost.php:77
+msgid "LiveJournal username"
+msgstr ""
+
+#: ../../addon/ljpost/ljpost.php:82
+msgid "LiveJournal password"
+msgstr ""
+
+#: ../../addon/ljpost/ljpost.php:87
+msgid "Post to LiveJournal by default"
+msgstr ""
+
+#: ../../addon/nsfw/nsfw.php:47
+msgid "Not Safe For Work (General Purpose Content Filter) settings"
+msgstr ""
+
+#: ../../addon/nsfw/nsfw.php:49
+msgid ""
+"This plugin looks in posts for the words/text you specify below, and "
+"collapses any content containing those keywords so it is not displayed at "
+"inappropriate times, such as sexual innuendo that may be improper in a work "
+"setting. It is polite and recommended to tag any content containing nudity "
+"with #NSFW.  This filter can also match any other word/text you specify, and "
+"can thereby be used as a general purpose content filter."
+msgstr ""
+
+#: ../../addon/nsfw/nsfw.php:50
+msgid "Enable Content filter"
+msgstr ""
+
+#: ../../addon/nsfw/nsfw.php:53
+msgid "Comma separated list of keywords to hide"
+msgstr ""
+
+#: ../../addon/nsfw/nsfw.php:58
+msgid "Use /expression/ to provide regular expressions"
+msgstr ""
+
+#: ../../addon/nsfw/nsfw.php:74
+msgid "NSFW Settings saved."
+msgstr ""
+
+#: ../../addon/nsfw/nsfw.php:121
+#, php-format
+msgid "%s - Click to open/close"
+msgstr ""
+
+#: ../../addon/page/page.php:61 ../../addon/page/page.php:91
+#: ../../addon/forumlist/forumlist.php:54
+msgid "Forums"
+msgstr ""
+
+#: ../../addon/page/page.php:129 ../../addon/forumlist/forumlist.php:88
+msgid "Forums:"
+msgstr ""
+
+#: ../../addon/page/page.php:165
+msgid "Page settings updated."
+msgstr ""
+
+#: ../../addon/page/page.php:194
+msgid "Page Settings"
+msgstr ""
+
+#: ../../addon/page/page.php:196 ../../addon/forumlist/forumlist.php:155
+msgid "How many forums to display on sidebar without paging"
+msgstr ""
+
+#: ../../addon/page/page.php:199
+msgid "Randomise Page/Forum list"
+msgstr ""
+
+#: ../../addon/page/page.php:202
+msgid "Show pages/forums on profile page"
+msgstr ""
+
+#: ../../addon/planets/planets.php:150
+msgid "Planets Settings"
+msgstr ""
+
+#: ../../addon/planets/planets.php:152
+msgid "Enable Planets Plugin"
+msgstr ""
+
+#: ../../addon/communityhome/communityhome.php:28
+#: ../../addon/communityhome/communityhome.php:34
+#: ../../addon/communityhome/twillingham/communityhome.php:28
+#: ../../addon/communityhome/twillingham/communityhome.php:34
+#: ../../include/nav.php:64 ../../boot.php:899
+msgid "Login"
+msgstr ""
+
+#: ../../addon/communityhome/communityhome.php:29
+#: ../../addon/communityhome/twillingham/communityhome.php:29
+msgid "OpenID"
+msgstr ""
+
+#: ../../addon/communityhome/communityhome.php:38
+#: ../../addon/communityhome/twillingham/communityhome.php:38
+msgid "Latest users"
+msgstr ""
+
+#: ../../addon/communityhome/communityhome.php:81
+#: ../../addon/communityhome/twillingham/communityhome.php:81
+msgid "Most active users"
+msgstr ""
+
+#: ../../addon/communityhome/communityhome.php:98
+msgid "Latest photos"
+msgstr ""
+
+#: ../../addon/communityhome/communityhome.php:133
+msgid "Latest likes"
+msgstr ""
+
+#: ../../addon/communityhome/communityhome.php:155
+#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1360
+#: ../../include/conversation.php:106 ../../include/conversation.php:222
+msgid "event"
+msgstr ""
+
+#: ../../addon/dav/dav_caldav_backend_virtual_friendica.inc.php:36
+msgid "Friendicy-Native events"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_backend.inc.php:92
+#: ../../addon/dav/common/wdcal_backend.inc.php:166
+#: ../../addon/dav/common/wdcal_backend.inc.php:178
+#: ../../addon/dav/common/wdcal_backend.inc.php:206
+#: ../../addon/dav/common/wdcal_backend.inc.php:214
+#: ../../addon/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 "Could not open component for editing"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:140
+#: ../../addon/dav/layout.fnk.php:143 ../../addon/dav/layout.fnk.php:422
+msgid "Go back to the calendar"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:144
+msgid "Event data"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:146 ../../addon/dav/main.php:206
+msgid "Calendar"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:163
+msgid "Special color"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:169
+msgid "Subject"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:173
+msgid "Starts"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:178
+msgid "Ends"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:185
+msgid "Description"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:188
+msgid "Recurrence"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:190
+msgid "Frequency"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:194
+#: ../../include/contact_selectors.php:59
+msgid "Daily"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:197
+#: ../../include/contact_selectors.php:60
+msgid "Weekly"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:200
+#: ../../include/contact_selectors.php:61
+msgid "Monthly"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:203
+msgid "Yearly"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:214
+#: ../../include/datetime.php:288
+msgid "days"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:215
+#: ../../include/datetime.php:287
+msgid "weeks"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:216
+#: ../../include/datetime.php:286
+msgid "months"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:217
+#: ../../include/datetime.php:285
+msgid "years"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:218
+msgid "Interval"
+msgstr ""
+
+#: ../../addon/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 "Days"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:231
+#: ../../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:880
+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:880
+msgid "Monday"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:238
+#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:880
+msgid "Tuesday"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:241
+#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:880
+msgid "Wednesday"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:244
+#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:880
+msgid "Thursday"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:247
+#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:880
+msgid "Friday"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:250
+#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:880
+msgid "Saturday"
+msgstr ""
+
+#: ../../addon/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 "Day of month"
+msgstr ""
+
+#: ../../addon/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-last of each month"
+msgstr ""
+
+#: ../../addon/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-last #wkday# of each month"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:372
+#: ../../addon/dav/layout.fnk.php:255
+msgid "Month"
+msgstr ""
+
+#: ../../addon/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-last of the given month"
+msgstr ""
+
+#: ../../addon/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-last #wkday# of the given month"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:413
+msgid "Repeat until"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:417
+msgid "Infinite"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:420
+msgid "Until the following date"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:423
+msgid "Number of times"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:429
+msgid "Exceptions"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:432
+msgid "none"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:449
+msgid "Notification"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:466
+msgid "Notify by"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:469
+msgid "E-Mail"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:470
+msgid "On Friendica / Display"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:474
+msgid "Time"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:478
+msgid "Hours"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:479
+msgid "Minutes"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:480
+msgid "Seconds"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:482
+msgid "Weeks"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:485
+msgid "before the"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:486
+msgid "start of the event"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:487
+msgid "end of the event"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:492
+msgid "Add a notification"
+msgstr ""
+
+#: ../../addon/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 "#name# is about to begin."
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_edit.inc.php:769
+msgid "Saved"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_configuration.php:148
+msgid "U.S. Time Format (mm/dd/YYYY)"
+msgstr ""
+
+#: ../../addon/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 "Private Events"
+msgstr ""
+
+#: ../../addon/dav/dav_carddav_backend_virtual_friendica.inc.php:53
+msgid "Friendica-Contacts"
+msgstr ""
+
+#: ../../addon/dav/dav_carddav_backend_virtual_friendica.inc.php:54
+msgid "Your Friendica-Contacts"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:99 ../../addon/dav/layout.fnk.php:136
+msgid ""
+"Something went wrong when trying to import the file. Sorry. Maybe some "
+"events were imported anyway."
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:131
+msgid "Something went wrong when trying to import the file. Sorry."
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:134
+msgid "The ICS-File has been imported."
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:138
+msgid "No file was uploaded."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1160
-msgid "Facebook post failed. Queued for retry."
+#: ../../addon/dav/layout.fnk.php:147
+msgid "Import a ICS-file"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1200
-msgid "Your Facebook connection became invalid. Please Re-authenticate."
+#: ../../addon/dav/layout.fnk.php:150
+msgid "ICS-File"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1201
-msgid "Facebook connection became invalid"
+#: ../../addon/dav/layout.fnk.php:151
+msgid "Overwrite all #num# existing events"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:1202
-#, php-format
-msgid ""
-"Hi %1$s,\n"
-"\n"
-"The connection between your accounts on %2$s and Facebook became invalid. "
-"This usually happens after you change your Facebook-password. To enable the "
-"connection again, you have to %3$sre-authenticate the Facebook-connector%4$s."
+#: ../../addon/dav/layout.fnk.php:228
+msgid "New event"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:144
-msgid "Lifetime of the cache (in hours)"
+#: ../../addon/dav/layout.fnk.php:232
+msgid "Today"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:149
-msgid "Cache Statistics"
+#: ../../addon/dav/layout.fnk.php:241
+msgid "Day"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:152
-msgid "Number of items"
+#: ../../addon/dav/layout.fnk.php:248
+msgid "Week"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:154
-msgid "Size of the cache"
+#: ../../addon/dav/layout.fnk.php:260
+msgid "Reload"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:156
-msgid "Delete the whole cache"
+#: ../../addon/dav/layout.fnk.php:271
+msgid "Date"
 msgstr ""
 
-#: ../../addon/widgets/widget_like.php:58
-#, php-format
-msgid "%d person likes this"
-msgid_plural "%d people like this"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../addon/dav/layout.fnk.php:313
+msgid "Error"
+msgstr ""
 
-#: ../../addon/widgets/widget_like.php:61
-#, php-format
-msgid "%d person doesn't like this"
-msgid_plural "%d people don't like this"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../addon/dav/layout.fnk.php:380
+msgid "The calendar has been updated."
+msgstr ""
 
-#: ../../addon/widgets/widget_friendheader.php:40
-msgid "Get added to this list!"
+#: ../../addon/dav/layout.fnk.php:393
+msgid "The new calendar has been created."
 msgstr ""
 
-#: ../../addon/widgets/widgets.php:56
-msgid "Generate new key"
+#: ../../addon/dav/layout.fnk.php:417
+msgid "The calendar has been deleted."
 msgstr ""
 
-#: ../../addon/widgets/widgets.php:59
-msgid "Widgets key"
+#: ../../addon/dav/layout.fnk.php:424
+msgid "Calendar Settings"
 msgstr ""
 
-#: ../../addon/widgets/widgets.php:61
-msgid "Widgets available"
+#: ../../addon/dav/layout.fnk.php:430
+msgid "Date format"
 msgstr ""
 
-#: ../../addon/widgets/widget_friends.php:40
-msgid "Connect on Friendica!"
+#: ../../addon/dav/layout.fnk.php:439
+msgid "Time zone"
 msgstr ""
 
-#: ../../addon/yourls/yourls.php:55
-msgid "YourLS Settings"
+#: ../../addon/dav/layout.fnk.php:445
+msgid "Calendars"
 msgstr ""
 
-#: ../../addon/yourls/yourls.php:57
-msgid "URL: http://"
+#: ../../addon/dav/layout.fnk.php:487
+msgid "Create a new calendar"
 msgstr ""
 
-#: ../../addon/yourls/yourls.php:62
-msgid "Username:"
+#: ../../addon/dav/layout.fnk.php:496
+msgid "Limitations"
 msgstr ""
 
-#: ../../addon/yourls/yourls.php:67
-msgid "Password:"
+#: ../../addon/dav/layout.fnk.php:500 ../../addon/libravatar/libravatar.php:82
+msgid "Warning"
 msgstr ""
 
-#: ../../addon/yourls/yourls.php:72
-msgid "Use SSL "
+#: ../../addon/dav/layout.fnk.php:504
+msgid "Synchronization (iPhone, Thunderbird Lightning, Android, ...)"
 msgstr ""
 
-#: ../../addon/yourls/yourls.php:92
-msgid "yourls Settings saved."
+#: ../../addon/dav/layout.fnk.php:511
+msgid "Synchronizing this calendar with the iPhone"
 msgstr ""
 
-#: ../../addon/ljpost/ljpost.php:39
-msgid "Post to LiveJournal"
+#: ../../addon/dav/layout.fnk.php:522
+msgid "Synchronizing your Friendica-Contacts with the iPhone"
 msgstr ""
 
-#: ../../addon/ljpost/ljpost.php:70
-msgid "LiveJournal Post Settings"
+#: ../../addon/dav/main.php:169
+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 "
+"this."
 msgstr ""
 
-#: ../../addon/ljpost/ljpost.php:72
-msgid "Enable LiveJournal Post Plugin"
+#: ../../addon/dav/main.php:209
+msgid "Extended calendar with CalDAV-support"
 msgstr ""
 
-#: ../../addon/ljpost/ljpost.php:77
-msgid "LiveJournal username"
+#: ../../addon/dav/main.php:246 ../../addon/dav/main.php:247
+#: ../../include/delivery.php:463 ../../include/enotify.php:26
+#: ../../include/notifier.php:685
+msgid "noreply"
 msgstr ""
 
-#: ../../addon/ljpost/ljpost.php:82
-msgid "LiveJournal password"
+#: ../../addon/dav/main.php:249
+msgid "Notification: "
 msgstr ""
 
-#: ../../addon/ljpost/ljpost.php:87
-msgid "Post to LiveJournal by default"
+#: ../../addon/dav/main.php:276
+msgid "The database tables have been installed."
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:47
-msgid "Not Safe For Work (General Purpose Content Filter) settings"
+#: ../../addon/dav/main.php:277
+msgid "An error occurred during the installation."
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:49
-msgid ""
-"This plugin looks in posts for the words/text you specify below, and "
-"collapses any content containing those keywords so it is not displayed at "
-"inappropriate times, such as sexual innuendo that may be improper in a work "
-"setting. It is polite and recommended to tag any content containing nudity "
-"with #NSFW.  This filter can also match any other word/text you specify, and "
-"can thereby be used as a general purpose content filter."
+#: ../../addon/dav/main.php:283
+msgid "The database tables have been updated."
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:50
-msgid "Enable Content filter"
+#: ../../addon/dav/main.php:285
+msgid "An error occurred during the update."
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:53
-msgid "Comma separated list of keywords to hide"
+#: ../../addon/dav/main.php:301
+msgid "No system-wide settings yet."
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:58
-msgid "Use /expression/ to provide regular expressions"
+#: ../../addon/dav/main.php:304
+msgid "Database status"
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:74
-msgid "NSFW Settings saved."
+#: ../../addon/dav/main.php:307
+msgid "Installed"
 msgstr ""
 
-#: ../../addon/nsfw/nsfw.php:121
-#, php-format
-msgid "%s - Click to open/close"
+#: ../../addon/dav/main.php:310
+msgid "Upgrade needed"
 msgstr ""
 
-#: ../../addon/page/page.php:48
-msgid "Forums"
+#: ../../addon/dav/main.php:310
+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 "
+"database structure, it's always safe to have a backup. Below, you can have a "
+"look at the database-queries that will be made when pressing the 'update'-"
+"button."
 msgstr ""
 
-#: ../../addon/page/page.php:63 ../../addon/showmore/showmore.php:87
-#: ../../include/contact_widgets.php:188 ../../include/conversation.php:469
-#: ../../boot.php:517
-msgid "show more"
+#: ../../addon/dav/main.php:310
+msgid "Upgrade"
 msgstr ""
 
-#: ../../addon/planets/planets.php:150
-msgid "Planets Settings"
+#: ../../addon/dav/main.php:313
+msgid "Not installed"
 msgstr ""
 
-#: ../../addon/planets/planets.php:152
-msgid "Enable Planets Plugin"
+#: ../../addon/dav/main.php:313
+msgid "Install"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:28
-#: ../../addon/communityhome/communityhome.php:34
-#: ../../addon/communityhome/twillingham/communityhome.php:28
-#: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:815
-msgid "Login"
+#: ../../addon/dav/main.php:317
+msgid "Unknown"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:29
-#: ../../addon/communityhome/twillingham/communityhome.php:29
-msgid "OpenID"
+#: ../../addon/dav/main.php:317
+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 "
+"tables beginning with 'dav_' manually. Afterwards, this installation routine "
+"should be able to reinitialize the tables automatically."
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:38
-#: ../../addon/communityhome/twillingham/communityhome.php:38
-msgid "Latest users"
+#: ../../addon/dav/main.php:322
+msgid "Troubleshooting"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:81
-#: ../../addon/communityhome/twillingham/communityhome.php:81
-msgid "Most active users"
+#: ../../addon/dav/main.php:323
+msgid "Manual creation of the database tables:"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:98
-msgid "Latest photos"
+#: ../../addon/dav/main.php:324
+msgid "Show SQL-statements"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:133
-msgid "Latest likes"
+#: ../../addon/dav/calendar.friendica.fnk.php:193
+msgid "Private Calendar"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:155
-#: ../../view/theme/diabook/theme.php:557 ../../include/text.php:1303
-#: ../../include/conversation.php:45 ../../include/conversation.php:118
-msgid "event"
+#: ../../addon/dav/calendar.friendica.fnk.php:194
+msgid "Friendica Events: Mine"
+msgstr ""
+
+#: ../../addon/dav/calendar.friendica.fnk.php:195
+msgid "Friendica Events: Contacts"
 msgstr ""
 
 #: ../../addon/uhremotestorage/uhremotestorage.php:84
@@ -4840,11 +5819,23 @@ msgstr ""
 msgid "Post to Drupal by default"
 msgstr ""
 
-#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:198
-#: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:192
+#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:201
+#: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:189
 msgid "Post from Friendica"
 msgstr ""
 
+#: ../../addon/startpage/startpage.php:83
+msgid "Startpage Settings"
+msgstr ""
+
+#: ../../addon/startpage/startpage.php:85
+msgid "Home page to load after login  - leave blank for profile wall"
+msgstr ""
+
+#: ../../addon/startpage/startpage.php:88
+msgid "Examples: &quot;network&quot; or &quot;notifications/system&quot;"
+msgstr ""
+
 #: ../../addon/geonames/geonames.php:143
 msgid "Geonames settings updated."
 msgstr ""
@@ -4857,6 +5848,25 @@ msgstr ""
 msgid "Enable Geonames Plugin"
 msgstr ""
 
+#: ../../addon/public_server/public_server.php:126
+#: ../../addon/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
+msgid "Your Friendica account is about to expire."
+msgstr ""
+
+#: ../../addon/public_server/public_server.php:128
+#, php-format
+msgid ""
+"Hi %1$s,\n"
+"\n"
+"Your account on %2$s will expire in less than five days. You may keep your "
+"account by logging in at least once every 30 days"
+msgstr ""
+
 #: ../../addon/js_upload/js_upload.php:43
 msgid "Upload a file"
 msgstr ""
@@ -4897,6 +5907,30 @@ msgstr ""
 msgid "URL to embed:"
 msgstr ""
 
+#: ../../addon/forumlist/forumlist.php:57
+msgid "show/hide"
+msgstr ""
+
+#: ../../addon/forumlist/forumlist.php:72
+msgid "No forum subscriptions"
+msgstr ""
+
+#: ../../addon/forumlist/forumlist.php:124
+msgid "Forumlist settings updated."
+msgstr ""
+
+#: ../../addon/forumlist/forumlist.php:153
+msgid "Forumlist Settings"
+msgstr ""
+
+#: ../../addon/forumlist/forumlist.php:158
+msgid "Randomise Forumlist/Forum list"
+msgstr ""
+
+#: ../../addon/forumlist/forumlist.php:161
+msgid "Show forumlists/forums on profile forumlist"
+msgstr ""
+
 #: ../../addon/impressum/impressum.php:36
 msgid "Impressum"
 msgstr ""
@@ -4966,6 +6000,18 @@ msgstr ""
 msgid "Report Bug"
 msgstr ""
 
+#: ../../addon/notimeline/notimeline.php:32
+msgid "No Timeline settings updated."
+msgstr ""
+
+#: ../../addon/notimeline/notimeline.php:56
+msgid "No Timeline Settings"
+msgstr ""
+
+#: ../../addon/notimeline/notimeline.php:58
+msgid "Disable Archive selector on profile wall"
+msgstr ""
+
 #: ../../addon/blockem/blockem.php:51
 msgid "\"Blockem\" Settings"
 msgstr ""
@@ -5043,89 +6089,175 @@ msgstr ""
 msgid "The default zoom level. (1:world, 18:highest)"
 msgstr ""
 
-#: ../../addon/mathjax/mathjax.php:37
-msgid ""
-"The MathJax addon renders mathematical formulae written using the LaTeX "
-"syntax surrounded by the usual $$ or an eqnarray block in the postings of "
-"your wall,network tab and private mail."
-msgstr ""
-
-#: ../../addon/mathjax/mathjax.php:38
-msgid "Use the MathJax renderer"
-msgstr ""
-
-#: ../../addon/mathjax/mathjax.php:74
-msgid "MathJax Base URL"
-msgstr ""
-
-#: ../../addon/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/group_text/group_text.php:46
 #: ../../addon/editplain/editplain.php:46
 msgid "Editplain settings updated."
 msgstr ""
 
-#: ../../addon/editplain/editplain.php:76
-msgid "Editplain Settings"
+#: ../../addon/group_text/group_text.php:76
+msgid "Group Text"
 msgstr ""
 
-#: ../../addon/editplain/editplain.php:78
-msgid "Disable richtext status editor"
+#: ../../addon/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 "Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"
 msgstr ""
 
+#: ../../addon/libravatar/libravatar.php:73
 #: ../../addon/gravatar/gravatar.php:71
 msgid "generic profile image"
 msgstr ""
 
+#: ../../addon/libravatar/libravatar.php:74
 #: ../../addon/gravatar/gravatar.php:72
 msgid "random geometric pattern"
 msgstr ""
 
+#: ../../addon/libravatar/libravatar.php:75
 #: ../../addon/gravatar/gravatar.php:73
 msgid "monster face"
 msgstr ""
 
+#: ../../addon/libravatar/libravatar.php:76
 #: ../../addon/gravatar/gravatar.php:74
 msgid "computer generated face"
 msgstr ""
 
+#: ../../addon/libravatar/libravatar.php:77
 #: ../../addon/gravatar/gravatar.php:75
 msgid "retro arcade style face"
 msgstr ""
 
-#: ../../addon/gravatar/gravatar.php:87
+#: ../../addon/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
+msgid "This addon is not functional on your server."
+msgstr ""
+
+#: ../../addon/libravatar/libravatar.php:93
+#: ../../addon/gravatar/gravatar.php:89
+msgid "Information"
+msgstr ""
+
+#: ../../addon/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 "
+"Libravatar."
+msgstr ""
+
+#: ../../addon/libravatar/libravatar.php:100
+#: ../../addon/gravatar/gravatar.php:96
 msgid "Default avatar image"
 msgstr ""
 
-#: ../../addon/gravatar/gravatar.php:87
+#: ../../addon/libravatar/libravatar.php:100
+msgid "Select default avatar image if none was found. See README"
+msgstr ""
+
+#: ../../addon/libravatar/libravatar.php:112
+msgid "Libravatar settings updated."
+msgstr ""
+
+#: ../../addon/libertree/libertree.php:36
+msgid "Post to libertree"
+msgstr ""
+
+#: ../../addon/libertree/libertree.php:67
+msgid "libertree Post Settings"
+msgstr ""
+
+#: ../../addon/libertree/libertree.php:69
+msgid "Enable Libertree Post Plugin"
+msgstr ""
+
+#: ../../addon/libertree/libertree.php:74
+msgid "Libertree API token"
+msgstr ""
+
+#: ../../addon/libertree/libertree.php:79
+msgid "Libertree site URL"
+msgstr ""
+
+#: ../../addon/libertree/libertree.php:84
+msgid "Post to Libertree by default"
+msgstr ""
+
+#: ../../addon/altpager/altpager.php:46
+msgid "Altpager settings updated."
+msgstr ""
+
+#: ../../addon/altpager/altpager.php:79
+msgid "Alternate Pagination Setting"
+msgstr ""
+
+#: ../../addon/altpager/altpager.php:81
+msgid "Use links to \"newer\" and \"older\" pages in place of page numbers?"
+msgstr ""
+
+#: ../../addon/mathjax/mathjax.php:37
+msgid ""
+"The MathJax addon renders mathematical formulae written using the LaTeX "
+"syntax surrounded by the usual $$ or an eqnarray block in the postings of "
+"your wall,network tab and private mail."
+msgstr ""
+
+#: ../../addon/mathjax/mathjax.php:38
+msgid "Use the MathJax renderer"
+msgstr ""
+
+#: ../../addon/mathjax/mathjax.php:74
+msgid "MathJax Base URL"
+msgstr ""
+
+#: ../../addon/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 "Editplain Settings"
+msgstr ""
+
+#: ../../addon/editplain/editplain.php:78
+msgid "Disable richtext status editor"
+msgstr ""
+
+#: ../../addon/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 "
+"nothing was found at Libravatar."
+msgstr ""
+
+#: ../../addon/gravatar/gravatar.php:96
 msgid "Select default avatar image if none was found at Gravatar. See README"
 msgstr ""
 
-#: ../../addon/gravatar/gravatar.php:88
+#: ../../addon/gravatar/gravatar.php:97
 msgid "Rating of images"
 msgstr ""
 
-#: ../../addon/gravatar/gravatar.php:88
+#: ../../addon/gravatar/gravatar.php:97
 msgid "Select the appropriate avatar rating for your site. See README"
 msgstr ""
 
-#: ../../addon/gravatar/gravatar.php:102
+#: ../../addon/gravatar/gravatar.php:111
 msgid "Gravatar settings updated."
 msgstr ""
 
-#: ../../addon/testdrive/testdrive.php:85
-#, php-format
-msgid "Your account on %s will expire in a few days."
-msgstr ""
-
-#: ../../addon/testdrive/testdrive.php:86
+#: ../../addon/testdrive/testdrive.php:95
 msgid "Your Friendica test account is about to expire."
 msgstr ""
 
-#: ../../addon/testdrive/testdrive.php:87
+#: ../../addon/testdrive/testdrive.php:96
 #, php-format
 msgid ""
 "Hi %1$s,\n"
@@ -5295,10 +6427,14 @@ msgstr ""
 msgid "Clear OAuth configuration"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:553
+#: ../../addon/statusnet/statusnet.php:568
 msgid "API URL"
 msgstr ""
 
+#: ../../addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php:19
+msgid "Infinite Improbability Drive"
+msgstr ""
+
 #: ../../addon/tumblr/tumblr.php:36
 msgid "Post to Tumblr"
 msgstr ""
@@ -5327,12 +6463,8 @@ msgstr ""
 msgid "Numfriends settings updated."
 msgstr ""
 
-#: ../../addon/numfriends/numfriends.php:77
-msgid "Numfriends Settings"
-msgstr ""
-
-#: ../../addon/numfriends/numfriends.php:79
-msgid "How many contacts to display on profile sidebar"
+#: ../../addon/numfriends/numfriends.php:77
+msgid "Numfriends Settings"
 msgstr ""
 
 #: ../../addon/gnot/gnot.php:48
@@ -5386,11 +6518,11 @@ msgstr ""
 msgid "Post to WordPress by default"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:102
+#: ../../addon/wppost/wppost.php:103
 msgid "Provide a backlink to the Friendica post"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:204
+#: ../../addon/wppost/wppost.php:207
 msgid "Read the original post and comment stream on Friendica"
 msgstr ""
 
@@ -5508,11 +6640,11 @@ msgstr ""
 msgid "Send linked #-tags and @-names to Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:383
+#: ../../addon/twitter/twitter.php:396
 msgid "Consumer key"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:384
+#: ../../addon/twitter/twitter.php:397
 msgid "Consumer secret"
 msgstr ""
 
@@ -5625,153 +6757,153 @@ msgstr ""
 msgid "Color scheme"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:122 ../../include/nav.php:49
+#: ../../view/theme/diabook/theme.php:127 ../../include/nav.php:49
 #: ../../include/nav.php:115
 msgid "Your posts and conversations"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:123 ../../include/nav.php:50
+#: ../../view/theme/diabook/theme.php:128 ../../include/nav.php:50
 msgid "Your profile page"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:124
+#: ../../view/theme/diabook/theme.php:129
 msgid "Your contacts"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:125 ../../include/nav.php:51
+#: ../../view/theme/diabook/theme.php:130 ../../include/nav.php:51
 msgid "Your photos"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:126 ../../include/nav.php:52
+#: ../../view/theme/diabook/theme.php:131 ../../include/nav.php:52
 msgid "Your events"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:127 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:132 ../../include/nav.php:53
 msgid "Personal notes"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:127 ../../include/nav.php:53
+#: ../../view/theme/diabook/theme.php:132 ../../include/nav.php:53
 msgid "Your personal photos"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:129
-#: ../../view/theme/diabook/theme.php:638
-#: ../../view/theme/diabook/theme.php:742
+#: ../../view/theme/diabook/theme.php:134
+#: ../../view/theme/diabook/theme.php:643
+#: ../../view/theme/diabook/theme.php:747
 #: ../../view/theme/diabook/config.php:201
 msgid "Community Pages"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:485
-#: ../../view/theme/diabook/theme.php:744
+#: ../../view/theme/diabook/theme.php:490
+#: ../../view/theme/diabook/theme.php:749
 #: ../../view/theme/diabook/config.php:203
 msgid "Community Profiles"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:506
-#: ../../view/theme/diabook/theme.php:749
+#: ../../view/theme/diabook/theme.php:511
+#: ../../view/theme/diabook/theme.php:754
 #: ../../view/theme/diabook/config.php:208
 msgid "Last users"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:535
-#: ../../view/theme/diabook/theme.php:751
+#: ../../view/theme/diabook/theme.php:540
+#: ../../view/theme/diabook/theme.php:756
 #: ../../view/theme/diabook/config.php:210
 msgid "Last likes"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:580
-#: ../../view/theme/diabook/theme.php:750
+#: ../../view/theme/diabook/theme.php:585
+#: ../../view/theme/diabook/theme.php:755
 #: ../../view/theme/diabook/config.php:209
 msgid "Last photos"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:617
-#: ../../view/theme/diabook/theme.php:747
+#: ../../view/theme/diabook/theme.php:622
+#: ../../view/theme/diabook/theme.php:752
 #: ../../view/theme/diabook/config.php:206
 msgid "Find Friends"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:618
+#: ../../view/theme/diabook/theme.php:623
 msgid "Local Directory"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:620 ../../include/contact_widgets.php:35
+#: ../../view/theme/diabook/theme.php:625 ../../include/contact_widgets.php:35
 msgid "Similar Interests"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:622 ../../include/contact_widgets.php:37
+#: ../../view/theme/diabook/theme.php:627 ../../include/contact_widgets.php:37
 msgid "Invite Friends"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:673
-#: ../../view/theme/diabook/theme.php:743
+#: ../../view/theme/diabook/theme.php:678
+#: ../../view/theme/diabook/theme.php:748
 #: ../../view/theme/diabook/config.php:202
 msgid "Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:678
+#: ../../view/theme/diabook/theme.php:683
 msgid "Set zoomfactor for Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:679
+#: ../../view/theme/diabook/theme.php:684
 #: ../../view/theme/diabook/config.php:199
 msgid "Set longitude (X) for Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:680
+#: ../../view/theme/diabook/theme.php:685
 #: ../../view/theme/diabook/config.php:200
 msgid "Set latitude (Y) for Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:693
-#: ../../view/theme/diabook/theme.php:745
+#: ../../view/theme/diabook/theme.php:698
+#: ../../view/theme/diabook/theme.php:750
 #: ../../view/theme/diabook/config.php:204
 msgid "Help or @NewHere ?"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:700
-#: ../../view/theme/diabook/theme.php:746
+#: ../../view/theme/diabook/theme.php:705
+#: ../../view/theme/diabook/theme.php:751
 #: ../../view/theme/diabook/config.php:205
 msgid "Connect Services"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:707
-#: ../../view/theme/diabook/theme.php:748
+#: ../../view/theme/diabook/theme.php:712
+#: ../../view/theme/diabook/theme.php:753
 msgid "Last Tweets"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:710
+#: ../../view/theme/diabook/theme.php:715
 #: ../../view/theme/diabook/config.php:197
 msgid "Set twitter search term"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:730
-#: ../../view/theme/diabook/theme.php:731
-#: ../../view/theme/diabook/theme.php:732
-#: ../../view/theme/diabook/theme.php:733
-#: ../../view/theme/diabook/theme.php:734
 #: ../../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 ../../include/acl_selectors.php:288
+#: ../../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
 msgid "don't show"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:730
-#: ../../view/theme/diabook/theme.php:731
-#: ../../view/theme/diabook/theme.php:732
-#: ../../view/theme/diabook/theme.php:733
-#: ../../view/theme/diabook/theme.php:734
 #: ../../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 ../../include/acl_selectors.php:287
+#: ../../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
 msgid "show"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:740
+#: ../../view/theme/diabook/theme.php:745
 msgid "Show/hide boxes at right-hand column:"
 msgstr ""
 
@@ -5812,10 +6944,6 @@ msgstr ""
 msgid "Set colour scheme"
 msgstr ""
 
-#: ../../include/profile_advanced.php:17 ../../boot.php:1104
-msgid "Gender:"
-msgstr ""
-
 #: ../../include/profile_advanced.php:22
 msgid "j F, Y"
 msgstr ""
@@ -5824,8 +6952,7 @@ msgstr ""
 msgid "j F"
 msgstr ""
 
-#: ../../include/profile_advanced.php:30 ../../include/datetime.php:448
-#: ../../include/items.php:1419
+#: ../../include/profile_advanced.php:30
 msgid "Birthday:"
 msgstr ""
 
@@ -5833,59 +6960,52 @@ msgstr ""
 msgid "Age:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:37 ../../boot.php:1107
-msgid "Status:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:45 ../../boot.php:1109
-msgid "Homepage:"
+#: ../../include/profile_advanced.php:43
+#, php-format
+msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/profile_advanced.php:47
+#: ../../include/profile_advanced.php:52
 msgid "Tags:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:51
+#: ../../include/profile_advanced.php:56
 msgid "Religion:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:53
-msgid "About:"
-msgstr ""
-
-#: ../../include/profile_advanced.php:55
+#: ../../include/profile_advanced.php:60
 msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:57
+#: ../../include/profile_advanced.php:67
 msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:59
+#: ../../include/profile_advanced.php:69
 msgid "Musical interests:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:61
+#: ../../include/profile_advanced.php:71
 msgid "Books, literature:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:63
+#: ../../include/profile_advanced.php:73
 msgid "Television:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:65
+#: ../../include/profile_advanced.php:75
 msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:67
+#: ../../include/profile_advanced.php:77
 msgid "Love/Romance:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:69
+#: ../../include/profile_advanced.php:79
 msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:71
+#: ../../include/profile_advanced.php:81
 msgid "School/education:"
 msgstr ""
 
@@ -5925,18 +7045,6 @@ msgstr ""
 msgid "Twice daily"
 msgstr ""
 
-#: ../../include/contact_selectors.php:59
-msgid "Daily"
-msgstr ""
-
-#: ../../include/contact_selectors.php:60
-msgid "Weekly"
-msgstr ""
-
-#: ../../include/contact_selectors.php:61
-msgid "Monthly"
-msgstr ""
-
 #: ../../include/contact_selectors.php:77
 msgid "OStatus"
 msgstr ""
@@ -6017,197 +7125,196 @@ msgstr ""
 msgid "Undecided"
 msgstr ""
 
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
 msgid "Males"
 msgstr ""
 
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
 msgid "Females"
 msgstr ""
 
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
 msgid "Gay"
 msgstr ""
 
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
 msgid "Lesbian"
 msgstr ""
 
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
 msgid "No Preference"
 msgstr ""
 
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
 msgid "Bisexual"
 msgstr ""
 
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
 msgid "Autosexual"
 msgstr ""
 
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
 msgid "Abstinent"
 msgstr ""
 
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
 msgid "Virgin"
 msgstr ""
 
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
 msgid "Deviant"
 msgstr ""
 
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
 msgid "Fetish"
 msgstr ""
 
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
 msgid "Oodles"
 msgstr ""
 
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
 msgid "Nonsexual"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Single"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Lonely"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Available"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Unavailable"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Has crush"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Infatuated"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Dating"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Unfaithful"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Sex Addict"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42 ../../include/user.php:278
 msgid "Friends"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Friends/Benefits"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Casual"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Engaged"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Married"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Imaginarily married"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Partners"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Cohabiting"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Common law"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Happy"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Not looking"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Swinger"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Betrayed"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Separated"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Unstable"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Divorced"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Imaginarily divorced"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Widowed"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Uncertain"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "It's complicated"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Don't care"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Ask me"
 msgstr ""
 
-#: ../../include/event.php:17 ../../include/bb2diaspora.php:244
+#: ../../include/event.php:20 ../../include/bb2diaspora.php:431
 msgid "Starts:"
 msgstr ""
 
-#: ../../include/event.php:27 ../../include/bb2diaspora.php:252
+#: ../../include/event.php:30 ../../include/bb2diaspora.php:439
 msgid "Finishes:"
 msgstr ""
 
-#: ../../include/delivery.php:452 ../../include/notifier.php:652
+#: ../../include/delivery.php:456 ../../include/notifier.php:678
 msgid "(no subject)"
 msgstr ""
 
-#: ../../include/delivery.php:459 ../../include/enotify.php:23
-#: ../../include/notifier.php:659
-msgid "noreply"
+#: ../../include/Scrape.php:572
+msgid " on Last.fm"
 msgstr ""
 
 #: ../../include/text.php:243
@@ -6226,167 +7333,186 @@ msgstr ""
 msgid "next"
 msgstr ""
 
-#: ../../include/text.php:568
+#: ../../include/text.php:295
+msgid "newer"
+msgstr ""
+
+#: ../../include/text.php:299
+msgid "older"
+msgstr ""
+
+#: ../../include/text.php:593
 msgid "No contacts"
 msgstr ""
 
-#: ../../include/text.php:577
+#: ../../include/text.php:602
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/text.php:650 ../../include/nav.php:91
-msgid "Search"
+#: ../../include/text.php:715
+msgid "poke"
 msgstr ""
 
-#: ../../include/text.php:831
-msgid "Monday"
+#: ../../include/text.php:715 ../../include/conversation.php:201
+msgid "poked"
 msgstr ""
 
-#: ../../include/text.php:831
-msgid "Tuesday"
+#: ../../include/text.php:716
+msgid "ping"
 msgstr ""
 
-#: ../../include/text.php:831
-msgid "Wednesday"
+#: ../../include/text.php:716
+msgid "pinged"
 msgstr ""
 
-#: ../../include/text.php:831
-msgid "Thursday"
+#: ../../include/text.php:717
+msgid "prod"
 msgstr ""
 
-#: ../../include/text.php:831
-msgid "Friday"
+#: ../../include/text.php:717
+msgid "prodded"
 msgstr ""
 
-#: ../../include/text.php:831
-msgid "Saturday"
+#: ../../include/text.php:718
+msgid "slap"
 msgstr ""
 
-#: ../../include/text.php:831
-msgid "Sunday"
+#: ../../include/text.php:718
+msgid "slapped"
+msgstr ""
+
+#: ../../include/text.php:719
+msgid "finger"
 msgstr ""
 
-#: ../../include/text.php:835
+#: ../../include/text.php:719
+msgid "fingered"
+msgstr ""
+
+#: ../../include/text.php:720
+msgid "rebuff"
+msgstr ""
+
+#: ../../include/text.php:720
+msgid "rebuffed"
+msgstr ""
+
+#: ../../include/text.php:884
 msgid "January"
 msgstr ""
 
-#: ../../include/text.php:835
+#: ../../include/text.php:884
 msgid "February"
 msgstr ""
 
-#: ../../include/text.php:835
+#: ../../include/text.php:884
 msgid "March"
 msgstr ""
 
-#: ../../include/text.php:835
+#: ../../include/text.php:884
 msgid "April"
 msgstr ""
 
-#: ../../include/text.php:835
+#: ../../include/text.php:884
 msgid "May"
 msgstr ""
 
-#: ../../include/text.php:835
+#: ../../include/text.php:884
 msgid "June"
 msgstr ""
 
-#: ../../include/text.php:835
+#: ../../include/text.php:884
 msgid "July"
 msgstr ""
 
-#: ../../include/text.php:835
+#: ../../include/text.php:884
 msgid "August"
 msgstr ""
 
-#: ../../include/text.php:835
+#: ../../include/text.php:884
 msgid "September"
 msgstr ""
 
-#: ../../include/text.php:835
+#: ../../include/text.php:884
 msgid "October"
 msgstr ""
 
-#: ../../include/text.php:835
+#: ../../include/text.php:884
 msgid "November"
 msgstr ""
 
-#: ../../include/text.php:835
+#: ../../include/text.php:884
 msgid "December"
 msgstr ""
 
-#: ../../include/text.php:919
+#: ../../include/text.php:970
 msgid "bytes"
 msgstr ""
 
-#: ../../include/text.php:934 ../../include/text.php:949
+#: ../../include/text.php:990 ../../include/text.php:1005
 msgid "remove"
 msgstr ""
 
-#: ../../include/text.php:934 ../../include/text.php:949
+#: ../../include/text.php:990 ../../include/text.php:1005
 msgid "[remove]"
 msgstr ""
 
-#: ../../include/text.php:937
+#: ../../include/text.php:993
 msgid "Categories:"
 msgstr ""
 
-#: ../../include/text.php:952
+#: ../../include/text.php:1008
 msgid "Filed under:"
 msgstr ""
 
-#: ../../include/text.php:968 ../../include/text.php:980
+#: ../../include/text.php:1024 ../../include/text.php:1036
 msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/text.php:1085
+#: ../../include/text.php:1142 ../../include/user.php:236
 msgid "default"
 msgstr ""
 
-#: ../../include/text.php:1097
+#: ../../include/text.php:1154
 msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/text.php:1307
+#: ../../include/text.php:1364
 msgid "activity"
 msgstr ""
 
-#: ../../include/text.php:1309
+#: ../../include/text.php:1366
 msgid "comment"
 msgstr ""
 
-#: ../../include/text.php:1310
+#: ../../include/text.php:1367
 msgid "post"
 msgstr ""
 
-#: ../../include/text.php:1465
+#: ../../include/text.php:1522
 msgid "Item filed"
 msgstr ""
 
-#: ../../include/diaspora.php:590
+#: ../../include/diaspora.php:660
 msgid "Sharing notification from Diaspora network"
 msgstr ""
 
-#: ../../include/diaspora.php:1977
+#: ../../include/diaspora.php:2177
 msgid "Attachments:"
 msgstr ""
 
-#: ../../include/diaspora.php:2160
-#, php-format
-msgid "[Relayed] Comment authored by %s from network %s"
-msgstr ""
-
-#: ../../include/network.php:824
+#: ../../include/network.php:843
 msgid "view full size"
 msgstr ""
 
-#: ../../include/oembed.php:132
+#: ../../include/oembed.php:135
 msgid "Embedded content"
 msgstr ""
 
-#: ../../include/oembed.php:141
+#: ../../include/oembed.php:144
 msgid "Embedding disabled"
 msgstr ""
 
@@ -6425,7 +7551,7 @@ msgstr ""
 msgid "Contacts not in any group"
 msgstr ""
 
-#: ../../include/nav.php:46 ../../boot.php:814
+#: ../../include/nav.php:46 ../../boot.php:898
 msgid "Logout"
 msgstr ""
 
@@ -6433,7 +7559,7 @@ msgstr ""
 msgid "End this session"
 msgstr ""
 
-#: ../../include/nav.php:49 ../../boot.php:1482
+#: ../../include/nav.php:49 ../../boot.php:1610
 msgid "Status"
 msgstr ""
 
@@ -6513,11 +7639,11 @@ msgstr ""
 msgid "Manage other pages"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../boot.php:1062
+#: ../../include/nav.php:138 ../../boot.php:1146
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../boot.php:1062
+#: ../../include/nav.php:138 ../../boot.php:1146
 msgid "Manage/edit profiles"
 msgstr ""
 
@@ -6525,15 +7651,11 @@ msgstr ""
 msgid "Manage/edit friends and contacts"
 msgstr ""
 
-#: ../../include/nav.php:146
-msgid "Admin"
-msgstr ""
-
 #: ../../include/nav.php:146
 msgid "Site setup and configuration"
 msgstr ""
 
-#: ../../include/nav.php:169
+#: ../../include/nav.php:170
 msgid "Nothing new here"
 msgstr ""
 
@@ -6596,17 +7718,17 @@ msgstr ""
 msgid "Categories"
 msgstr ""
 
-#: ../../include/auth.php:29
+#: ../../include/auth.php:36
 msgid "Logged out."
 msgstr ""
 
-#: ../../include/auth.php:106
+#: ../../include/auth.php:115
 msgid ""
 "We encountered a problem while logging in with the OpenID you provided. "
 "Please check the correct spelling of the ID."
 msgstr ""
 
-#: ../../include/auth.php:106
+#: ../../include/auth.php:115
 msgid "The error message was:"
 msgstr ""
 
@@ -6614,87 +7736,81 @@ msgstr ""
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../../include/datetime.php:131 ../../include/datetime.php:263
+#: ../../include/datetime.php:153 ../../include/datetime.php:285
 msgid "year"
 msgstr ""
 
-#: ../../include/datetime.php:136 ../../include/datetime.php:264
+#: ../../include/datetime.php:158 ../../include/datetime.php:286
 msgid "month"
 msgstr ""
 
-#: ../../include/datetime.php:141 ../../include/datetime.php:266
+#: ../../include/datetime.php:163 ../../include/datetime.php:288
 msgid "day"
 msgstr ""
 
-#: ../../include/datetime.php:254
+#: ../../include/datetime.php:276
 msgid "never"
 msgstr ""
 
-#: ../../include/datetime.php:260
+#: ../../include/datetime.php:282
 msgid "less than a second ago"
 msgstr ""
 
-#: ../../include/datetime.php:263
-msgid "years"
-msgstr ""
-
-#: ../../include/datetime.php:264
-msgid "months"
-msgstr ""
-
-#: ../../include/datetime.php:265
+#: ../../include/datetime.php:287
 msgid "week"
 msgstr ""
 
-#: ../../include/datetime.php:265
-msgid "weeks"
-msgstr ""
-
-#: ../../include/datetime.php:266
-msgid "days"
-msgstr ""
-
-#: ../../include/datetime.php:267
+#: ../../include/datetime.php:289
 msgid "hour"
 msgstr ""
 
-#: ../../include/datetime.php:267
+#: ../../include/datetime.php:289
 msgid "hours"
 msgstr ""
 
-#: ../../include/datetime.php:268
+#: ../../include/datetime.php:290
 msgid "minute"
 msgstr ""
 
-#: ../../include/datetime.php:268
+#: ../../include/datetime.php:290
 msgid "minutes"
 msgstr ""
 
-#: ../../include/datetime.php:269
+#: ../../include/datetime.php:291
 msgid "second"
 msgstr ""
 
-#: ../../include/datetime.php:269
+#: ../../include/datetime.php:291
 msgid "seconds"
 msgstr ""
 
-#: ../../include/datetime.php:277
+#: ../../include/datetime.php:300
 #, php-format
 msgid "%1$d %2$s ago"
 msgstr ""
 
-#: ../../include/onepoll.php:406
-msgid "From: "
+#: ../../include/datetime.php:472 ../../include/items.php:1620
+#, php-format
+msgid "%s's birthday"
 msgstr ""
 
-#: ../../include/bbcode.php:203 ../../include/bbcode.php:223
-msgid "$1 wrote:"
+#: ../../include/datetime.php:473 ../../include/items.php:1621
+#, php-format
+msgid "Happy Birthday %s"
+msgstr ""
+
+#: ../../include/onepoll.php:399
+msgid "From: "
 msgstr ""
 
-#: ../../include/bbcode.php:238 ../../include/bbcode.php:307
+#: ../../include/bbcode.php:102 ../../include/bbcode.php:317
 msgid "Image/photo"
 msgstr ""
 
+#: ../../include/bbcode.php:282 ../../include/bbcode.php:302
+msgid "$1 wrote:"
+msgstr ""
+
 #: ../../include/dba.php:41
 #, php-format
 msgid "Cannot locate DNS info for database server '%s'"
@@ -6721,559 +7837,585 @@ msgstr ""
 msgid "%s Administrator"
 msgstr ""
 
-#: ../../include/enotify.php:35
+#: ../../include/enotify.php:38
 #, php-format
 msgid "%s <!item_type!>"
 msgstr ""
 
-#: ../../include/enotify.php:39
+#: ../../include/enotify.php:42
 #, php-format
 msgid "[Friendica:Notify] New mail received at %s"
 msgstr ""
 
-#: ../../include/enotify.php:41
+#: ../../include/enotify.php:44
 #, php-format
-msgid "%s sent you a new private message at %s."
+msgid "%1$s sent you a new private message at %2$s."
 msgstr ""
 
-#: ../../include/enotify.php:42
+#: ../../include/enotify.php:45
 #, php-format
-msgid "%s sent you %s."
+msgid "%1$s sent you %2$s."
 msgstr ""
 
-#: ../../include/enotify.php:42
+#: ../../include/enotify.php:45
 msgid "a private message"
 msgstr ""
 
-#: ../../include/enotify.php:43
+#: ../../include/enotify.php:46
 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr ""
 
-#: ../../include/enotify.php:73
+#: ../../include/enotify.php:87
 #, php-format
-msgid "%s's"
+msgid "%1$s commented on [url=%2$s]a %3$s[/url]"
 msgstr ""
 
-#: ../../include/enotify.php:77
-msgid "your"
+#: ../../include/enotify.php:94
+#, php-format
+msgid "%1$s commented on [url=%2$s]%3$s's %4$s[/url]"
 msgstr ""
 
-#: ../../include/enotify.php:84
+#: ../../include/enotify.php:102
 #, php-format
-msgid "[Friendica:Notify] Comment to conversation #%d by %s"
+msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
 msgstr ""
 
-#: ../../include/enotify.php:85
+#: ../../include/enotify.php:112
 #, php-format
-msgid "%s commented on an item/conversation you have been following."
+msgid "[Friendica:Notify] Comment to conversation #%1$d by %2$s"
 msgstr ""
 
-#: ../../include/enotify.php:86
+#: ../../include/enotify.php:113
 #, php-format
-msgid "%s commented on %s."
+msgid "%s commented on an item/conversation you have been following."
 msgstr ""
 
-#: ../../include/enotify.php:88 ../../include/enotify.php:101
-#: ../../include/enotify.php:112 ../../include/enotify.php:123
+#: ../../include/enotify.php:116 ../../include/enotify.php:131
+#: ../../include/enotify.php:144 ../../include/enotify.php:162
+#: ../../include/enotify.php:175
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
 msgstr ""
 
-#: ../../include/enotify.php:95
+#: ../../include/enotify.php:123
 #, php-format
 msgid "[Friendica:Notify] %s posted to your profile wall"
 msgstr ""
 
-#: ../../include/enotify.php:97
+#: ../../include/enotify.php:125
 #, php-format
-msgid "%s posted to your profile wall at %s"
+msgid "%1$s posted to your profile wall at %2$s"
 msgstr ""
 
-#: ../../include/enotify.php:99
+#: ../../include/enotify.php:127
 #, php-format
-msgid "%s posted to %s"
+msgid "%1$s posted to [url=%2$s]your wall[/url]"
 msgstr ""
 
-#: ../../include/enotify.php:99
-msgid "your profile wall."
+#: ../../include/enotify.php:138
+#, php-format
+msgid "[Friendica:Notify] %s tagged you"
 msgstr ""
 
-#: ../../include/enotify.php:108
+#: ../../include/enotify.php:139
 #, php-format
-msgid "[Friendica:Notify] %s tagged you"
+msgid "%1$s tagged you at %2$s"
 msgstr ""
 
-#: ../../include/enotify.php:109
+#: ../../include/enotify.php:140
 #, php-format
-msgid "%s tagged you at %s"
+msgid "%1$s [url=%2$s]tagged you[/url]."
 msgstr ""
 
-#: ../../include/enotify.php:110
+#: ../../include/enotify.php:152
 #, php-format
-msgid "%s %s."
+msgid "[Friendica:Notify] %1$s poked you"
 msgstr ""
 
-#: ../../include/enotify.php:110
-msgid "tagged you"
+#: ../../include/enotify.php:153
+#, php-format
+msgid "%1$s poked you at %2$s"
 msgstr ""
 
-#: ../../include/enotify.php:119
+#: ../../include/enotify.php:154
 #, php-format
-msgid "[Friendica:Notify] %s tagged your post"
+msgid "%1$s [url=%2$s]poked you[/url]."
 msgstr ""
 
-#: ../../include/enotify.php:120
+#: ../../include/enotify.php:169
 #, php-format
-msgid "%s tagged your post at %s"
+msgid "[Friendica:Notify] %s tagged your post"
 msgstr ""
 
-#: ../../include/enotify.php:121
+#: ../../include/enotify.php:170
 #, php-format
-msgid "%s tagged %s"
+msgid "%1$s tagged your post at %2$s"
 msgstr ""
 
-#: ../../include/enotify.php:121
-msgid "your post"
+#: ../../include/enotify.php:171
+#, php-format
+msgid "%1$s tagged [url=%2$s]your post[/url]"
 msgstr ""
 
-#: ../../include/enotify.php:130
+#: ../../include/enotify.php:182
 msgid "[Friendica:Notify] Introduction received"
 msgstr ""
 
-#: ../../include/enotify.php:131
+#: ../../include/enotify.php:183
 #, php-format
-msgid "You've received an introduction from '%s' at %s"
+msgid "You've received an introduction from '%1$s' at %2$s"
 msgstr ""
 
-#: ../../include/enotify.php:132
+#: ../../include/enotify.php:184
 #, php-format
-msgid "You've received %s from %s."
-msgstr ""
-
-#: ../../include/enotify.php:132
-msgid "an introduction"
+msgid "You've received [url=%1$s]an introduction[/url] from %2$s."
 msgstr ""
 
-#: ../../include/enotify.php:133 ../../include/enotify.php:150
+#: ../../include/enotify.php:187 ../../include/enotify.php:205
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr ""
 
-#: ../../include/enotify.php:135
+#: ../../include/enotify.php:189
 #, php-format
 msgid "Please visit %s to approve or reject the introduction."
 msgstr ""
 
-#: ../../include/enotify.php:142
+#: ../../include/enotify.php:196
 msgid "[Friendica:Notify] Friend suggestion received"
 msgstr ""
 
-#: ../../include/enotify.php:143
+#: ../../include/enotify.php:197
 #, php-format
-msgid "You've received a friend suggestion from '%s' at %s"
+msgid "You've received a friend suggestion from '%1$s' at %2$s"
 msgstr ""
 
-#: ../../include/enotify.php:144
+#: ../../include/enotify.php:198
 #, php-format
-msgid "You've received %s for %s from %s."
-msgstr ""
-
-#: ../../include/enotify.php:145
-msgid "a friend suggestion"
+msgid "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s."
 msgstr ""
 
-#: ../../include/enotify.php:148
+#: ../../include/enotify.php:203
 msgid "Name:"
 msgstr ""
 
-#: ../../include/enotify.php:149
+#: ../../include/enotify.php:204
 msgid "Photo:"
 msgstr ""
 
-#: ../../include/enotify.php:152
+#: ../../include/enotify.php:207
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: ../../include/items.php:2736
-msgid "A new person is sharing with you at "
+#: ../../include/follow.php:32
+msgid "Connect URL missing."
 msgstr ""
 
-#: ../../include/items.php:2736
-msgid "You have a new follower at "
+#: ../../include/follow.php:59
+msgid ""
+"This site is not configured to allow communications with other networks."
 msgstr ""
 
-#: ../../include/bb2diaspora.php:102 ../../include/bb2diaspora.php:112
-#: ../../include/bb2diaspora.php:113
-msgid "image/photo"
+#: ../../include/follow.php:60 ../../include/follow.php:80
+msgid "No compatible communication protocols or feeds were discovered."
 msgstr ""
 
-#: ../../include/bb2diaspora.php:102
-msgid "link"
+#: ../../include/follow.php:78
+msgid "The profile address specified does not provide adequate information."
 msgstr ""
 
-#: ../../include/security.php:21
-msgid "Welcome "
+#: ../../include/follow.php:82
+msgid "An author or name was not found."
 msgstr ""
 
-#: ../../include/security.php:22
-msgid "Please upload a profile photo."
+#: ../../include/follow.php:84
+msgid "No browser URL could be matched to this address."
 msgstr ""
 
-#: ../../include/security.php:25
-msgid "Welcome back "
+#: ../../include/follow.php:86
+msgid ""
+"Unable to match @-style Identity Address with a known protocol or email "
+"contact."
 msgstr ""
 
-#: ../../include/security.php:329
+#: ../../include/follow.php:87
+msgid "Use mailto: in front of address to force email check."
+msgstr ""
+
+#: ../../include/follow.php:93
 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."
+"The profile address specified belongs to a network which has been disabled "
+"on this site."
 msgstr ""
 
-#: ../../include/Contact.php:111
-msgid "stopped following"
+#: ../../include/follow.php:103
+msgid ""
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
 msgstr ""
 
-#: ../../include/Contact.php:203 ../../include/conversation.php:820
-msgid "View Status"
+#: ../../include/follow.php:205
+msgid "Unable to retrieve contact information."
 msgstr ""
 
-#: ../../include/Contact.php:204 ../../include/conversation.php:821
-msgid "View Profile"
+#: ../../include/follow.php:259
+msgid "following"
 msgstr ""
 
-#: ../../include/Contact.php:205 ../../include/conversation.php:822
-msgid "View Photos"
+#: ../../include/items.php:3211
+msgid "A new person is sharing with you at "
 msgstr ""
 
-#: ../../include/Contact.php:206 ../../include/Contact.php:219
-#: ../../include/conversation.php:823
-msgid "Network Posts"
+#: ../../include/items.php:3211
+msgid "You have a new follower at "
 msgstr ""
 
-#: ../../include/Contact.php:207 ../../include/Contact.php:219
-#: ../../include/conversation.php:824
-msgid "Edit Contact"
+#: ../../include/items.php:3880
+msgid "Archives"
 msgstr ""
 
-#: ../../include/Contact.php:208 ../../include/Contact.php:219
-#: ../../include/conversation.php:825
-msgid "Send PM"
+#: ../../include/user.php:38
+msgid "An invitation is required."
 msgstr ""
 
-#: ../../include/conversation.php:163
-msgid "post/item"
+#: ../../include/user.php:43
+msgid "Invitation could not be verified."
 msgstr ""
 
-#: ../../include/conversation.php:164
-#, php-format
-msgid "%1$s marked %2$s's %3$s as favorite"
+#: ../../include/user.php:51
+msgid "Invalid OpenID url"
 msgstr ""
 
-#: ../../include/conversation.php:320 ../../include/conversation.php:586
-msgid "Select"
+#: ../../include/user.php:66
+msgid "Please enter the required information."
 msgstr ""
 
-#: ../../include/conversation.php:337 ../../include/conversation.php:679
-#: ../../include/conversation.php:680
-#, php-format
-msgid "View %s's profile @ %s"
+#: ../../include/user.php:80
+msgid "Please use a shorter name."
 msgstr ""
 
-#: ../../include/conversation.php:347 ../../include/conversation.php:691
-#, php-format
-msgid "%s from %s"
+#: ../../include/user.php:82
+msgid "Name too short."
 msgstr ""
 
-#: ../../include/conversation.php:362
-msgid "View in context"
+#: ../../include/user.php:97
+msgid "That doesn't appear to be your full (First Last) name."
 msgstr ""
 
-#: ../../include/conversation.php:468
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/user.php:102
+msgid "Your email domain is not among those allowed on this site."
+msgstr ""
 
-#: ../../include/conversation.php:532
-msgid "like"
+#: ../../include/user.php:105
+msgid "Not a valid email address."
 msgstr ""
 
-#: ../../include/conversation.php:533
-msgid "dislike"
+#: ../../include/user.php:115
+msgid "Cannot use that email."
 msgstr ""
 
-#: ../../include/conversation.php:535
-msgid "Share this"
+#: ../../include/user.php:121
+msgid ""
+"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
+"must also begin with a letter."
 msgstr ""
 
-#: ../../include/conversation.php:535
-msgid "share"
+#: ../../include/user.php:127 ../../include/user.php:225
+msgid "Nickname is already registered. Please choose another."
 msgstr ""
 
-#: ../../include/conversation.php:559
-msgid "Bold"
+#: ../../include/user.php:137
+msgid ""
+"Nickname was once registered here and may not be re-used. Please choose "
+"another."
 msgstr ""
 
-#: ../../include/conversation.php:560
-msgid "Italic"
+#: ../../include/user.php:153
+msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr ""
 
-#: ../../include/conversation.php:561
-msgid "Underline"
+#: ../../include/user.php:211
+msgid "An error occurred during registration. Please try again."
 msgstr ""
 
-#: ../../include/conversation.php:562
-msgid "Quote"
+#: ../../include/user.php:246
+msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
 
-#: ../../include/conversation.php:563
-msgid "Code"
+#: ../../include/security.php:21
+msgid "Welcome "
 msgstr ""
 
-#: ../../include/conversation.php:564
-msgid "Image"
+#: ../../include/security.php:22
+msgid "Please upload a profile photo."
 msgstr ""
 
-#: ../../include/conversation.php:565
-msgid "Link"
+#: ../../include/security.php:25
+msgid "Welcome back "
 msgstr ""
 
-#: ../../include/conversation.php:566
-msgid "Video"
+#: ../../include/security.php:329
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
 msgstr ""
 
-#: ../../include/conversation.php:599
-msgid "add star"
+#: ../../include/Contact.php:111
+msgid "stopped following"
 msgstr ""
 
-#: ../../include/conversation.php:600
-msgid "remove star"
+#: ../../include/Contact.php:220 ../../include/conversation.php:966
+msgid "Poke"
 msgstr ""
 
-#: ../../include/conversation.php:601
-msgid "toggle star status"
+#: ../../include/Contact.php:221 ../../include/conversation.php:960
+msgid "View Status"
 msgstr ""
 
-#: ../../include/conversation.php:604
-msgid "starred"
+#: ../../include/Contact.php:222 ../../include/conversation.php:961
+msgid "View Profile"
 msgstr ""
 
-#: ../../include/conversation.php:605
-msgid "add tag"
+#: ../../include/Contact.php:223 ../../include/conversation.php:962
+msgid "View Photos"
 msgstr ""
 
-#: ../../include/conversation.php:609
-msgid "save to folder"
+#: ../../include/Contact.php:224 ../../include/Contact.php:237
+#: ../../include/conversation.php:963
+msgid "Network Posts"
 msgstr ""
 
-#: ../../include/conversation.php:681
-msgid "to"
+#: ../../include/Contact.php:225 ../../include/Contact.php:237
+#: ../../include/conversation.php:964
+msgid "Edit Contact"
 msgstr ""
 
-#: ../../include/conversation.php:682
-msgid "Wall-to-Wall"
+#: ../../include/Contact.php:226 ../../include/Contact.php:237
+#: ../../include/conversation.php:965
+msgid "Send PM"
 msgstr ""
 
-#: ../../include/conversation.php:683
-msgid "via Wall-To-Wall:"
+#: ../../include/conversation.php:197
+#, php-format
+msgid "%1$s poked %2$s"
+msgstr ""
+
+#: ../../include/conversation.php:267
+msgid "post/item"
+msgstr ""
+
+#: ../../include/conversation.php:268
+#, php-format
+msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 
-#: ../../include/conversation.php:728
+#: ../../include/conversation.php:866
 msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/conversation.php:879
+#: ../../include/conversation.php:1024
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: ../../include/conversation.php:879
+#: ../../include/conversation.php:1024
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/conversation.php:883
+#: ../../include/conversation.php:1028
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""
 
-#: ../../include/conversation.php:885
+#: ../../include/conversation.php:1030
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:891
+#: ../../include/conversation.php:1036
 msgid "and"
 msgstr ""
 
-#: ../../include/conversation.php:894
+#: ../../include/conversation.php:1039
 #, php-format
 msgid ", and %d other people"
 msgstr ""
 
-#: ../../include/conversation.php:895
+#: ../../include/conversation.php:1040
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../include/conversation.php:895
+#: ../../include/conversation.php:1040
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:920
+#: ../../include/conversation.php:1064 ../../include/conversation.php:1081
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: ../../include/conversation.php:922
+#: ../../include/conversation.php:1066 ../../include/conversation.php:1083
 msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:923
+#: ../../include/conversation.php:1067 ../../include/conversation.php:1084
 msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:924
+#: ../../include/conversation.php:1068 ../../include/conversation.php:1085
 msgid "Tag term:"
 msgstr ""
 
-#: ../../include/conversation.php:926
+#: ../../include/conversation.php:1070 ../../include/conversation.php:1087
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/conversation.php:969
+#: ../../include/conversation.php:1130
 msgid "upload photo"
 msgstr ""
 
-#: ../../include/conversation.php:971
+#: ../../include/conversation.php:1132
 msgid "attach file"
 msgstr ""
 
-#: ../../include/conversation.php:973
+#: ../../include/conversation.php:1134
 msgid "web link"
 msgstr ""
 
-#: ../../include/conversation.php:974
+#: ../../include/conversation.php:1135
 msgid "Insert video link"
 msgstr ""
 
-#: ../../include/conversation.php:975
+#: ../../include/conversation.php:1136
 msgid "video link"
 msgstr ""
 
-#: ../../include/conversation.php:976
+#: ../../include/conversation.php:1137
 msgid "Insert audio link"
 msgstr ""
 
-#: ../../include/conversation.php:977
+#: ../../include/conversation.php:1138
 msgid "audio link"
 msgstr ""
 
-#: ../../include/conversation.php:979
+#: ../../include/conversation.php:1140
 msgid "set location"
 msgstr ""
 
-#: ../../include/conversation.php:981
+#: ../../include/conversation.php:1142
 msgid "clear location"
 msgstr ""
 
-#: ../../include/conversation.php:988
+#: ../../include/conversation.php:1149
 msgid "permissions"
 msgstr ""
 
-#: ../../boot.php:515
+#: ../../include/plugin.php:390 ../../include/plugin.php:392
+msgid "Click here to upgrade."
+msgstr ""
+
+#: ../../include/plugin.php:398
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr ""
+
+#: ../../include/plugin.php:403
+msgid "This action is not available under your subscription plan."
+msgstr ""
+
+#: ../../boot.php:568
 msgid "Delete this item?"
 msgstr ""
 
-#: ../../boot.php:518
+#: ../../boot.php:571
 msgid "show fewer"
 msgstr ""
 
-#: ../../boot.php:691
+#: ../../boot.php:774
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:693
+#: ../../boot.php:776
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:793
+#: ../../boot.php:877
 msgid "Create a New Account"
 msgstr ""
 
-#: ../../boot.php:817
+#: ../../boot.php:901
 msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../boot.php:818
+#: ../../boot.php:902
 msgid "Password: "
 msgstr ""
 
-#: ../../boot.php:821
+#: ../../boot.php:905
 msgid "Or login using OpenID: "
 msgstr ""
 
-#: ../../boot.php:827
+#: ../../boot.php:911
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:994
+#: ../../boot.php:1078
 msgid "Edit profile"
 msgstr ""
 
-#: ../../boot.php:1054
+#: ../../boot.php:1138
 msgid "Message"
 msgstr ""
 
-#: ../../boot.php:1170 ../../boot.php:1246
+#: ../../boot.php:1260 ../../boot.php:1346
 msgid "g A l F d"
 msgstr ""
 
-#: ../../boot.php:1171 ../../boot.php:1247
+#: ../../boot.php:1261 ../../boot.php:1347
 msgid "F d"
 msgstr ""
 
-#: ../../boot.php:1216 ../../boot.php:1287
+#: ../../boot.php:1306 ../../boot.php:1387
 msgid "[today]"
 msgstr ""
 
-#: ../../boot.php:1228
+#: ../../boot.php:1318
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../boot.php:1229
+#: ../../boot.php:1319
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../boot.php:1280
+#: ../../boot.php:1380
 msgid "[No description]"
 msgstr ""
 
-#: ../../boot.php:1298
+#: ../../boot.php:1398
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../boot.php:1299
+#: ../../boot.php:1399
 msgid "Events this week:"
 msgstr ""
 
-#: ../../boot.php:1485
+#: ../../boot.php:1613
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../boot.php:1491
+#: ../../boot.php:1620
 msgid "Profile Details"
 msgstr ""
 
-#: ../../boot.php:1506
+#: ../../boot.php:1637
 msgid "Events and Calendar"
 msgstr ""
 
-#: ../../boot.php:1512
+#: ../../boot.php:1644
 msgid "Only You Can See This"
 msgstr ""