]> git.mxchange.org Git - friendica.git/blobdiff - util/messages.po
Merge remote branch 'upstream/master'
[friendica.git] / util / messages.po
index 6e1652b393e14c1739f0d62c43725a398777d3d6..7f88e228841af5a3371fc47aa37e8732901ba781 100755 (executable)
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.3.1250\n"
+"Project-Id-Version: 2.3.1273\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-12 17:14-0800\n"
+"POT-Creation-Date: 2012-03-06 15:09-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 #"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../../mod/oexchange.php:27
+#: ../../mod/oexchange.php:25
 msgid "Post successful."
 msgstr ""
 
@@ -35,24 +35,24 @@ msgid "Contact update failed."
 msgstr ""
 
 #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:43
-#: ../../mod/fsuggest.php:78 ../../mod/events.php:109 ../../mod/api.php:26
+#: ../../mod/fsuggest.php:78 ../../mod/events.php:110 ../../mod/api.php:26
 #: ../../mod/api.php:31 ../../mod/photos.php:129 ../../mod/photos.php:865
 #: ../../mod/editpost.php:10 ../../mod/install.php:171
 #: ../../mod/notifications.php:62 ../../mod/contacts.php:125
-#: ../../mod/settings.php:49 ../../mod/settings.php:404
-#: ../../mod/settings.php:409 ../../mod/manage.php:86 ../../mod/network.php:6
+#: ../../mod/settings.php:49 ../../mod/settings.php:411
+#: ../../mod/settings.php:416 ../../mod/manage.php:86 ../../mod/network.php:6
 #: ../../mod/notes.php:20 ../../mod/attach.php:33 ../../mod/group.php:19
-#: ../../mod/viewcontacts.php:21 ../../mod/register.php:36
-#: ../../mod/regmod.php:111 ../../mod/item.php:123 ../../mod/item.php:139
+#: ../../mod/viewcontacts.php:22 ../../mod/register.php:36
+#: ../../mod/regmod.php:111 ../../mod/item.php:124 ../../mod/item.php:140
 #: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:137
 #: ../../mod/profile_photo.php:148 ../../mod/profile_photo.php:159
 #: ../../mod/message.php:9 ../../mod/message.php:46 ../../mod/allfriends.php:9
 #: ../../mod/wall_upload.php:42 ../../mod/follow.php:8 ../../mod/common.php:9
-#: ../../mod/display.php:112 ../../mod/profiles.php:7
+#: ../../mod/display.php:133 ../../mod/profiles.php:7
 #: ../../mod/profiles.php:229 ../../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:331
-#: ../../include/items.php:2907 ../../index.php:288
+#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:332
+#: ../../include/items.php:3030 ../../index.php:288
 msgid "Permission denied."
 msgstr ""
 
@@ -81,8 +81,8 @@ msgstr ""
 msgid "Return to contact editor"
 msgstr ""
 
-#: ../../mod/crepair.php:148 ../../mod/settings.php:455
-#: ../../mod/settings.php:481 ../../mod/admin.php:464 ../../mod/admin.php:473
+#: ../../mod/crepair.php:148 ../../mod/settings.php:462
+#: ../../mod/settings.php:488 ../../mod/admin.php:484 ../../mod/admin.php:493
 msgid "Name"
 msgstr ""
 
@@ -119,33 +119,38 @@ msgid "New photo from this URL"
 msgstr ""
 
 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
-#: ../../mod/events.php:333 ../../mod/photos.php:900 ../../mod/photos.php:958
+#: ../../mod/events.php:400 ../../mod/photos.php:900 ../../mod/photos.php:958
 #: ../../mod/photos.php:1182 ../../mod/photos.php:1222
 #: ../../mod/photos.php:1262 ../../mod/photos.php:1293
 #: ../../mod/install.php:251 ../../mod/install.php:289
 #: ../../mod/localtime.php:45 ../../mod/contacts.php:319
-#: ../../mod/settings.php:453 ../../mod/settings.php:592
-#: ../../mod/settings.php:773 ../../mod/manage.php:109 ../../mod/group.php:84
-#: ../../mod/group.php:167 ../../mod/admin.php:296 ../../mod/admin.php:461
-#: ../../mod/admin.php:587 ../../mod/admin.php:652 ../../mod/profiles.php:375
-#: ../../mod/invite.php:106 ../../addon/facebook/facebook.php:410
-#: ../../addon/yourls/yourls.php:76 ../../addon/nsfw/nsfw.php:57
+#: ../../mod/settings.php:460 ../../mod/settings.php:603
+#: ../../mod/settings.php:797 ../../mod/manage.php:109 ../../mod/group.php:80
+#: ../../mod/admin.php:313 ../../mod/admin.php:481 ../../mod/admin.php:609
+#: ../../mod/admin.php:776 ../../mod/admin.php:856 ../../mod/profiles.php:375
+#: ../../mod/invite.php:106 ../../addon/facebook/facebook.php:411
+#: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:92
+#: ../../addon/nsfw/nsfw.php:57
 #: ../../addon/uhremotestorage/uhremotestorage.php:89
-#: ../../addon/randplace/randplace.php:179 ../../addon/drpost/drpost.php:110
-#: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41
-#: ../../addon/impressum/impressum.php:69 ../../addon/blockem/blockem.php:57
+#: ../../addon/randplace/randplace.php:179 ../../addon/dwpost/dwpost.php:92
+#: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187
+#: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:69
+#: ../../addon/blockem/blockem.php:57 ../../addon/qcomment/qcomment.php:61
+#: ../../addon/openstreetmap/openstreetmap.php:70
 #: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:94
 #: ../../addon/pageheader/pageheader.php:52
-#: ../../addon/statusnet/statusnet.php:280
-#: ../../addon/statusnet/statusnet.php:294
+#: ../../addon/statusnet/statusnet.php:273
+#: ../../addon/statusnet/statusnet.php:287
+#: ../../addon/statusnet/statusnet.php:313
 #: ../../addon/statusnet/statusnet.php:320
-#: ../../addon/statusnet/statusnet.php:327
-#: ../../addon/statusnet/statusnet.php:349
-#: ../../addon/statusnet/statusnet.php:495 ../../addon/tumblr/tumblr.php:90
-#: ../../addon/numfriends/numfriends.php:85 ../../addon/wppost/wppost.php:102
-#: ../../addon/piwik/piwik.php:81 ../../addon/twitter/twitter.php:180
-#: ../../addon/twitter/twitter.php:203 ../../addon/twitter/twitter.php:315
-#: ../../addon/posterous/posterous.php:90 ../../include/conversation.php:515
+#: ../../addon/statusnet/statusnet.php:345
+#: ../../addon/statusnet/statusnet.php:532 ../../addon/tumblr/tumblr.php:90
+#: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88
+#: ../../addon/wppost/wppost.php:102 ../../addon/showmore/showmore.php:48
+#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:175
+#: ../../addon/twitter/twitter.php:201 ../../addon/twitter/twitter.php:355
+#: ../../addon/posterous/posterous.php:90
+#: ../../view/theme/quattro/theme.php:15 ../../include/conversation.php:552
 msgid "Submit"
 msgstr ""
 
@@ -187,83 +192,83 @@ msgstr ""
 msgid "Suggest a friend for %s"
 msgstr ""
 
-#: ../../mod/events.php:61
+#: ../../mod/events.php:62
 msgid "Event description and start time are required."
 msgstr ""
 
-#: ../../mod/events.php:117 ../../include/nav.php:50 ../../boot.php:1345
-msgid "Events"
+#: ../../mod/events.php:230
+msgid "l, F j"
 msgstr ""
 
-#: ../../mod/events.php:207
-msgid "Create New Event"
+#: ../../mod/events.php:252
+msgid "Edit event"
 msgstr ""
 
-#: ../../mod/events.php:210
-msgid "Previous"
+#: ../../mod/events.php:272 ../../include/text.php:982
+msgid "link to source"
 msgstr ""
 
-#: ../../mod/events.php:213 ../../mod/install.php:210
-msgid "Next"
+#: ../../mod/events.php:296 ../../include/nav.php:50 ../../boot.php:1349
+msgid "Events"
 msgstr ""
 
-#: ../../mod/events.php:220
-msgid "l, F j"
+#: ../../mod/events.php:297
+msgid "Create New Event"
 msgstr ""
 
-#: ../../mod/events.php:235
-msgid "Edit event"
+#: ../../mod/events.php:298
+msgid "Previous"
 msgstr ""
 
-#: ../../mod/events.php:237 ../../include/text.php:883
-msgid "link to source"
+#: ../../mod/events.php:299 ../../mod/install.php:210
+msgid "Next"
 msgstr ""
 
-#: ../../mod/events.php:305
+#: ../../mod/events.php:371
 msgid "hour:minute"
 msgstr ""
 
-#: ../../mod/events.php:314
+#: ../../mod/events.php:380
 msgid "Event details"
 msgstr ""
 
-#: ../../mod/events.php:315
+#: ../../mod/events.php:381
 #, php-format
 msgid "Format is %s %s. Starting date and Description are required."
 msgstr ""
 
-#: ../../mod/events.php:316
+#: ../../mod/events.php:383
 msgid "Event Starts:"
 msgstr ""
 
-#: ../../mod/events.php:319
+#: ../../mod/events.php:386
 msgid "Finish date/time is not known or not relevant"
 msgstr ""
 
-#: ../../mod/events.php:321
+#: ../../mod/events.php:388
 msgid "Event Finishes:"
 msgstr ""
 
-#: ../../mod/events.php:324
+#: ../../mod/events.php:391
 msgid "Adjust for viewer timezone"
 msgstr ""
 
-#: ../../mod/events.php:326
+#: ../../mod/events.php:393
 msgid "Description:"
 msgstr ""
 
-#: ../../mod/events.php:328 ../../include/event.php:37
-#: ../../include/bb2diaspora.php:271 ../../boot.php:976
+#: ../../mod/events.php:395 ../../include/event.php:37
+#: ../../include/bb2diaspora.php:260 ../../boot.php:980
 msgid "Location:"
 msgstr ""
 
-#: ../../mod/events.php:330
+#: ../../mod/events.php:397
 msgid "Share this event"
 msgstr ""
 
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/dfrn_request.php:685 ../../mod/settings.php:454
-#: ../../mod/settings.php:480 ../../addon/js_upload/js_upload.php:45
+#: ../../mod/dfrn_request.php:686 ../../mod/settings.php:461
+#: ../../mod/settings.php:487 ../../addon/js_upload/js_upload.php:45
 msgid "Cancel"
 msgstr ""
 
@@ -306,24 +311,24 @@ msgid ""
 "and/or create new posts for you?"
 msgstr ""
 
-#: ../../mod/api.php:105 ../../mod/dfrn_request.php:675
-#: ../../mod/settings.php:681 ../../mod/settings.php:687
-#: ../../mod/settings.php:695 ../../mod/settings.php:699
-#: ../../mod/settings.php:704 ../../mod/settings.php:710
-#: ../../mod/settings.php:716 ../../mod/settings.php:763
-#: ../../mod/settings.php:764 ../../mod/settings.php:765
-#: ../../mod/settings.php:766 ../../mod/register.php:524
+#: ../../mod/api.php:105 ../../mod/dfrn_request.php:676
+#: ../../mod/settings.php:692 ../../mod/settings.php:698
+#: ../../mod/settings.php:706 ../../mod/settings.php:710
+#: ../../mod/settings.php:715 ../../mod/settings.php:721
+#: ../../mod/settings.php:727 ../../mod/settings.php:787
+#: ../../mod/settings.php:788 ../../mod/settings.php:789
+#: ../../mod/settings.php:790 ../../mod/register.php:524
 #: ../../mod/profiles.php:357
 msgid "Yes"
 msgstr ""
 
-#: ../../mod/api.php:106 ../../mod/dfrn_request.php:676
-#: ../../mod/settings.php:681 ../../mod/settings.php:687
-#: ../../mod/settings.php:695 ../../mod/settings.php:699
-#: ../../mod/settings.php:704 ../../mod/settings.php:710
-#: ../../mod/settings.php:716 ../../mod/settings.php:763
-#: ../../mod/settings.php:764 ../../mod/settings.php:765
-#: ../../mod/settings.php:766 ../../mod/register.php:525
+#: ../../mod/api.php:106 ../../mod/dfrn_request.php:677
+#: ../../mod/settings.php:692 ../../mod/settings.php:698
+#: ../../mod/settings.php:706 ../../mod/settings.php:710
+#: ../../mod/settings.php:715 ../../mod/settings.php:721
+#: ../../mod/settings.php:727 ../../mod/settings.php:787
+#: ../../mod/settings.php:788 ../../mod/settings.php:789
+#: ../../mod/settings.php:790 ../../mod/register.php:525
 #: ../../mod/profiles.php:358
 msgid "No"
 msgstr ""
@@ -377,9 +382,9 @@ msgid "was tagged in a"
 msgstr ""
 
 #: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70
-#: ../../addon/communityhome/communityhome.php:163
-#: ../../include/diaspora.php:1587 ../../include/conversation.php:31
-#: ../../include/conversation.php:104
+#: ../../addon/communityhome/communityhome.php:163 ../../include/text.php:1226
+#: ../../include/diaspora.php:1600 ../../include/conversation.php:53
+#: ../../include/conversation.php:126
 msgid "photo"
 msgstr ""
 
@@ -387,7 +392,7 @@ msgstr ""
 msgid "by"
 msgstr ""
 
-#: ../../mod/photos.php:631 ../../addon/js_upload/js_upload.php:312
+#: ../../mod/photos.php:631 ../../addon/js_upload/js_upload.php:315
 msgid "Image exceeds size limit of "
 msgstr ""
 
@@ -406,8 +411,8 @@ msgid "Image upload failed."
 msgstr ""
 
 #: ../../mod/photos.php:759 ../../mod/community.php:16
-#: ../../mod/dfrn_request.php:624 ../../mod/viewcontacts.php:16
-#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:31
+#: ../../mod/dfrn_request.php:625 ../../mod/viewcontacts.php:17
+#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:33
 msgid "Public access denied."
 msgstr ""
 
@@ -467,7 +472,7 @@ msgstr ""
 msgid "Use as profile photo"
 msgstr ""
 
-#: ../../mod/photos.php:1078 ../../include/conversation.php:450
+#: ../../mod/photos.php:1078 ../../include/conversation.php:482
 msgid "Private Message"
 msgstr ""
 
@@ -499,44 +504,44 @@ msgstr ""
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: ../../mod/photos.php:1200 ../../include/conversation.php:497
+#: ../../mod/photos.php:1200 ../../include/conversation.php:529
 msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1201 ../../include/conversation.php:498
+#: ../../mod/photos.php:1201 ../../include/conversation.php:530
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1202 ../../include/conversation.php:889
+#: ../../mod/photos.php:1202 ../../include/conversation.php:933
 msgid "Share"
 msgstr ""
 
-#: ../../mod/photos.php:1203 ../../mod/editpost.php:100
+#: ../../mod/photos.php:1203 ../../mod/editpost.php:104
 #: ../../mod/message.php:155 ../../mod/message.php:296
-#: ../../include/conversation.php:321 ../../include/conversation.php:652
-#: ../../include/conversation.php:906
+#: ../../include/conversation.php:348 ../../include/conversation.php:694
+#: ../../include/conversation.php:950
 msgid "Please wait"
 msgstr ""
 
 #: ../../mod/photos.php:1219 ../../mod/photos.php:1259
-#: ../../mod/photos.php:1290 ../../include/conversation.php:512
+#: ../../mod/photos.php:1290 ../../include/conversation.php:549
 msgid "This is you"
 msgstr ""
 
 #: ../../mod/photos.php:1221 ../../mod/photos.php:1261
-#: ../../mod/photos.php:1292 ../../include/conversation.php:514
-#: ../../boot.php:443
+#: ../../mod/photos.php:1292 ../../include/conversation.php:551
+#: ../../boot.php:447
 msgid "Comment"
 msgstr ""
 
-#: ../../mod/photos.php:1223 ../../mod/editpost.php:119
-#: ../../include/conversation.php:516 ../../include/conversation.php:924
+#: ../../mod/photos.php:1223 ../../mod/editpost.php:123
+#: ../../include/conversation.php:553 ../../include/conversation.php:968
 msgid "Preview"
 msgstr ""
 
-#: ../../mod/photos.php:1320 ../../mod/settings.php:513
-#: ../../mod/group.php:154 ../../mod/admin.php:468
-#: ../../include/conversation.php:280 ../../include/conversation.php:536
+#: ../../mod/photos.php:1320 ../../mod/settings.php:520
+#: ../../mod/settings.php:601 ../../mod/group.php:158 ../../mod/admin.php:488
+#: ../../include/conversation.php:304 ../../include/conversation.php:573
 msgid "Delete"
 msgstr ""
 
@@ -596,70 +601,70 @@ msgstr ""
 msgid "Item not found"
 msgstr ""
 
-#: ../../mod/editpost.php:32
+#: ../../mod/editpost.php:36
 msgid "Edit post"
 msgstr ""
 
-#: ../../mod/editpost.php:76 ../../include/conversation.php:875
+#: ../../mod/editpost.php:80 ../../include/conversation.php:919
 msgid "Post to Email"
 msgstr ""
 
-#: ../../mod/editpost.php:91 ../../mod/settings.php:512
-#: ../../include/conversation.php:523
+#: ../../mod/editpost.php:95 ../../mod/settings.php:519
+#: ../../include/conversation.php:560
 msgid "Edit"
 msgstr ""
 
-#: ../../mod/editpost.php:92 ../../mod/message.php:153
-#: ../../mod/message.php:294 ../../include/conversation.php:890
+#: ../../mod/editpost.php:96 ../../mod/message.php:153
+#: ../../mod/message.php:294 ../../include/conversation.php:934
 msgid "Upload photo"
 msgstr ""
 
-#: ../../mod/editpost.php:93 ../../include/conversation.php:892
+#: ../../mod/editpost.php:97 ../../include/conversation.php:936
 msgid "Attach file"
 msgstr ""
 
-#: ../../mod/editpost.php:94 ../../mod/message.php:154
-#: ../../mod/message.php:295 ../../include/conversation.php:894
+#: ../../mod/editpost.php:98 ../../mod/message.php:154
+#: ../../mod/message.php:295 ../../include/conversation.php:938
 msgid "Insert web link"
 msgstr ""
 
-#: ../../mod/editpost.php:95
+#: ../../mod/editpost.php:99
 msgid "Insert YouTube video"
 msgstr ""
 
-#: ../../mod/editpost.php:96
+#: ../../mod/editpost.php:100
 msgid "Insert Vorbis [.ogg] video"
 msgstr ""
 
-#: ../../mod/editpost.php:97
+#: ../../mod/editpost.php:101
 msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../mod/editpost.php:98 ../../include/conversation.php:900
+#: ../../mod/editpost.php:102 ../../include/conversation.php:944
 msgid "Set your location"
 msgstr ""
 
-#: ../../mod/editpost.php:99 ../../include/conversation.php:902
+#: ../../mod/editpost.php:103 ../../include/conversation.php:946
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/editpost.php:101 ../../include/conversation.php:907
+#: ../../mod/editpost.php:105 ../../include/conversation.php:951
 msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/editpost.php:109 ../../include/conversation.php:916
+#: ../../mod/editpost.php:113 ../../include/conversation.php:960
 msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/editpost.php:110 ../../include/conversation.php:917
+#: ../../mod/editpost.php:114 ../../include/conversation.php:961
 msgid "Public post"
 msgstr ""
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:905
+#: ../../mod/editpost.php:117 ../../include/conversation.php:949
 msgid "Set title"
 msgstr ""
 
-#: ../../mod/editpost.php:114 ../../include/conversation.php:919
+#: ../../mod/editpost.php:118 ../../include/conversation.php:963
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
@@ -768,68 +773,68 @@ msgstr ""
 msgid "Confirm"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:581 ../../include/items.php:2443
+#: ../../mod/dfrn_request.php:582 ../../include/items.php:2566
 msgid "[Name Withheld]"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:665
+#: ../../mod/dfrn_request.php:666
 #, php-format
 msgid ""
 "Diaspora members: Please do not use this form. Instead, enter \"%s\" into "
 "your Diaspora search bar."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:668
+#: ../../mod/dfrn_request.php:669
 msgid ""
 "Please enter your 'Identity Address' from one of the following supported "
 "social networks:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:671
+#: ../../mod/dfrn_request.php:672
 msgid "Friend/Connection Request"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:672
+#: ../../mod/dfrn_request.php:673
 msgid ""
 "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, "
 "testuser@identi.ca"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:673
+#: ../../mod/dfrn_request.php:674
 msgid "Please answer the following:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:674
+#: ../../mod/dfrn_request.php:675
 #, php-format
 msgid "Does %s know you?"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:677
+#: ../../mod/dfrn_request.php:678
 msgid "Add a personal note:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:679 ../../include/contact_selectors.php:76
+#: ../../mod/dfrn_request.php:680 ../../include/contact_selectors.php:76
 msgid "Friendica"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:680
+#: ../../mod/dfrn_request.php:681
 msgid "StatusNet/Federated Social Web"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:681 ../../mod/settings.php:548
+#: ../../mod/dfrn_request.php:682 ../../mod/settings.php:555
 #: ../../include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:682
+#: ../../mod/dfrn_request.php:683
 msgid "- please share from your own site as noted above"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:683
+#: ../../mod/dfrn_request.php:684
 msgid "Your Identity Address:"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:684
+#: ../../mod/dfrn_request.php:685
 msgid "Submit Request"
 msgstr ""
 
@@ -1078,7 +1083,7 @@ msgid "Errors encountered creating database tables."
 msgstr ""
 
 #: ../../mod/localtime.php:12 ../../include/event.php:11
-#: ../../include/bb2diaspora.php:249
+#: ../../include/bb2diaspora.php:238
 msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
@@ -1124,7 +1129,7 @@ msgid "is interested in:"
 msgstr ""
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:926
+#: ../../include/contact_widgets.php:9 ../../boot.php:930
 msgid "Connect"
 msgstr ""
 
@@ -1149,165 +1154,187 @@ msgstr ""
 msgid "Invalid request identifier."
 msgstr ""
 
-#: ../../mod/notifications.php:35 ../../mod/notifications.php:152
-#: ../../mod/notifications.php:198
+#: ../../mod/notifications.php:35 ../../mod/notifications.php:157
+#: ../../mod/notifications.php:203
 msgid "Discard"
 msgstr ""
 
-#: ../../mod/notifications.php:47 ../../mod/notifications.php:151
-#: ../../mod/notifications.php:197 ../../mod/contacts.php:302
+#: ../../mod/notifications.php:47 ../../mod/notifications.php:156
+#: ../../mod/notifications.php:202 ../../mod/contacts.php:302
 #: ../../mod/contacts.php:345
 msgid "Ignore"
 msgstr ""
 
-#: ../../mod/notifications.php:71 ../../include/nav.php:109
+#: ../../mod/notifications.php:71
+msgid "System"
+msgstr ""
+
+#: ../../mod/notifications.php:76 ../../include/nav.php:109
 msgid "Network"
 msgstr ""
 
-#: ../../mod/notifications.php:76 ../../mod/network.php:177
+#: ../../mod/notifications.php:81 ../../mod/network.php:177
 msgid "Personal"
 msgstr ""
 
-#: ../../mod/notifications.php:81 ../../include/nav.php:73
+#: ../../mod/notifications.php:86 ../../include/nav.php:73
 #: ../../include/nav.php:111
 msgid "Home"
 msgstr ""
 
-#: ../../mod/notifications.php:86 ../../include/nav.php:117
+#: ../../mod/notifications.php:91 ../../include/nav.php:117
 msgid "Introductions"
 msgstr ""
 
-#: ../../mod/notifications.php:91 ../../mod/message.php:76
-#: ../../include/nav.php:123
+#: ../../mod/notifications.php:96 ../../mod/message.php:76
+#: ../../include/nav.php:124
 msgid "Messages"
 msgstr ""
 
-#: ../../mod/notifications.php:110
+#: ../../mod/notifications.php:115
 msgid "Show Ignored Requests"
 msgstr ""
 
-#: ../../mod/notifications.php:110
+#: ../../mod/notifications.php:115
 msgid "Hide Ignored Requests"
 msgstr ""
 
-#: ../../mod/notifications.php:136 ../../mod/notifications.php:182
+#: ../../mod/notifications.php:141 ../../mod/notifications.php:187
 msgid "Notification type: "
 msgstr ""
 
-#: ../../mod/notifications.php:137
+#: ../../mod/notifications.php:142
 msgid "Friend Suggestion"
 msgstr ""
 
-#: ../../mod/notifications.php:139
+#: ../../mod/notifications.php:144
 #, php-format
 msgid "suggested by %s"
 msgstr ""
 
-#: ../../mod/notifications.php:144 ../../mod/notifications.php:191
+#: ../../mod/notifications.php:149 ../../mod/notifications.php:196
 #: ../../mod/contacts.php:350
 msgid "Hide this contact from others"
 msgstr ""
 
-#: ../../mod/notifications.php:145 ../../mod/notifications.php:192
+#: ../../mod/notifications.php:150 ../../mod/notifications.php:197
 msgid "Post a new friend activity"
 msgstr ""
 
-#: ../../mod/notifications.php:145 ../../mod/notifications.php:192
+#: ../../mod/notifications.php:150 ../../mod/notifications.php:197
 msgid "if applicable"
 msgstr ""
 
-#: ../../mod/notifications.php:148 ../../mod/notifications.php:195
-#: ../../mod/admin.php:466
+#: ../../mod/notifications.php:153 ../../mod/notifications.php:200
+#: ../../mod/admin.php:486
 msgid "Approve"
 msgstr ""
 
-#: ../../mod/notifications.php:168
+#: ../../mod/notifications.php:173
 msgid "Claims to be known to you: "
 msgstr ""
 
-#: ../../mod/notifications.php:168
+#: ../../mod/notifications.php:173
 msgid "yes"
 msgstr ""
 
-#: ../../mod/notifications.php:168
+#: ../../mod/notifications.php:173
 msgid "no"
 msgstr ""
 
-#: ../../mod/notifications.php:175
+#: ../../mod/notifications.php:180
 msgid "Approve as: "
 msgstr ""
 
-#: ../../mod/notifications.php:176
+#: ../../mod/notifications.php:181
 msgid "Friend"
 msgstr ""
 
-#: ../../mod/notifications.php:177
+#: ../../mod/notifications.php:182
 msgid "Sharer"
 msgstr ""
 
-#: ../../mod/notifications.php:177
+#: ../../mod/notifications.php:182
 msgid "Fan/Admirer"
 msgstr ""
 
-#: ../../mod/notifications.php:183
+#: ../../mod/notifications.php:188
 msgid "Friend/Connect Request"
 msgstr ""
 
-#: ../../mod/notifications.php:183
+#: ../../mod/notifications.php:188
 msgid "New Follower"
 msgstr ""
 
-#: ../../mod/notifications.php:204
+#: ../../mod/notifications.php:209
 msgid "No introductions."
 msgstr ""
 
-#: ../../mod/notifications.php:207 ../../mod/notifications.php:293
-#: ../../mod/notifications.php:388 ../../mod/notifications.php:469
-#: ../../include/nav.php:118
+#: ../../mod/notifications.php:212 ../../include/nav.php:118
 msgid "Notifications"
 msgstr ""
 
-#: ../../mod/notifications.php:244 ../../mod/notifications.php:339
-#: ../../mod/notifications.php:426
+#: ../../mod/notifications.php:249 ../../mod/notifications.php:374
+#: ../../mod/notifications.php:461
 #, php-format
 msgid "%s liked %s's post"
 msgstr ""
 
-#: ../../mod/notifications.php:253 ../../mod/notifications.php:348
-#: ../../mod/notifications.php:435
+#: ../../mod/notifications.php:258 ../../mod/notifications.php:383
+#: ../../mod/notifications.php:470
 #, php-format
 msgid "%s disliked %s's post"
 msgstr ""
 
-#: ../../mod/notifications.php:267 ../../mod/notifications.php:362
-#: ../../mod/notifications.php:449
+#: ../../mod/notifications.php:272 ../../mod/notifications.php:397
+#: ../../mod/notifications.php:484
 #, php-format
 msgid "%s is now friends with %s"
 msgstr ""
 
-#: ../../mod/notifications.php:274 ../../mod/notifications.php:369
+#: ../../mod/notifications.php:279 ../../mod/notifications.php:404
 #, php-format
 msgid "%s created a new post"
 msgstr ""
 
-#: ../../mod/notifications.php:275 ../../mod/notifications.php:370
-#: ../../mod/notifications.php:458
+#: ../../mod/notifications.php:280 ../../mod/notifications.php:405
+#: ../../mod/notifications.php:493
 #, php-format
 msgid "%s commented on %s's post"
 msgstr ""
 
-#: ../../mod/notifications.php:289
+#: ../../mod/notifications.php:294
 msgid "No more network notifications."
 msgstr ""
 
-#: ../../mod/notifications.php:384
+#: ../../mod/notifications.php:298
+msgid "Network Notifications"
+msgstr ""
+
+#: ../../mod/notifications.php:324 ../../mod/notify.php:61
+msgid "No more system notifications."
+msgstr ""
+
+#: ../../mod/notifications.php:328 ../../mod/notify.php:65
+msgid "System Notifications"
+msgstr ""
+
+#: ../../mod/notifications.php:419
 msgid "No more personal notifications."
 msgstr ""
 
-#: ../../mod/notifications.php:465
+#: ../../mod/notifications.php:423
+msgid "Personal Notifications"
+msgstr ""
+
+#: ../../mod/notifications.php:500
 msgid "No more home notifications."
 msgstr ""
 
+#: ../../mod/notifications.php:504
+msgid "Home Notifications"
+msgstr ""
+
 #: ../../mod/contacts.php:63 ../../mod/contacts.php:143
 msgid "Could not access contact record."
 msgstr ""
@@ -1396,12 +1423,12 @@ msgid "View all contacts"
 msgstr ""
 
 #: ../../mod/contacts.php:297 ../../mod/contacts.php:344
-#: ../../mod/admin.php:470
+#: ../../mod/admin.php:490
 msgid "Unblock"
 msgstr ""
 
 #: ../../mod/contacts.php:297 ../../mod/contacts.php:344
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:489
 msgid "Block"
 msgstr ""
 
@@ -1436,8 +1463,8 @@ msgstr ""
 msgid "Edit contact notes"
 msgstr ""
 
-#: ../../mod/contacts.php:328 ../../mod/contacts.php:458
-#: ../../mod/viewcontacts.php:61
+#: ../../mod/contacts.php:328 ../../mod/contacts.php:497
+#: ../../mod/viewcontacts.php:60
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr ""
@@ -1470,7 +1497,7 @@ msgstr ""
 msgid "Update public posts"
 msgstr ""
 
-#: ../../mod/contacts.php:341 ../../mod/admin.php:701
+#: ../../mod/contacts.php:341 ../../mod/admin.php:905
 msgid "Update now"
 msgstr ""
 
@@ -1487,52 +1514,60 @@ msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr ""
 
-#: ../../mod/contacts.php:387 ../../include/nav.php:131
-msgid "Contacts"
-msgstr ""
-
-#: ../../mod/contacts.php:389
-msgid "Show Unblocked Contacts"
-msgstr ""
-
-#: ../../mod/contacts.php:389
-msgid "Show Blocked Contacts"
+#: ../../mod/contacts.php:399 ../../mod/group.php:179
+msgid "All Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:391
-msgid "Show All Contacts"
+#: ../../mod/contacts.php:404
+msgid "Unblocked Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:393
-msgid "Search your contacts"
+#: ../../mod/contacts.php:410
+msgid "Blocked Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:394 ../../mod/directory.php:65
-msgid "Finding: "
+#: ../../mod/contacts.php:416
+msgid "Ignored Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:395 ../../mod/directory.php:67
-#: ../../include/contact_widgets.php:34
-msgid "Find"
+#: ../../mod/contacts.php:422
+msgid "Hidden Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:434
+#: ../../mod/contacts.php:473
 msgid "Mutual Friendship"
 msgstr ""
 
-#: ../../mod/contacts.php:438
+#: ../../mod/contacts.php:477
 msgid "is a fan of yours"
 msgstr ""
 
-#: ../../mod/contacts.php:442
+#: ../../mod/contacts.php:481
 msgid "you are a fan of"
 msgstr ""
 
-#: ../../mod/contacts.php:459 ../../include/Contact.php:135
-#: ../../include/conversation.php:748
+#: ../../mod/contacts.php:498 ../../include/Contact.php:135
+#: ../../include/conversation.php:792
 msgid "Edit contact"
 msgstr ""
 
+#: ../../mod/contacts.php:519 ../../include/nav.php:132
+msgid "Contacts"
+msgstr ""
+
+#: ../../mod/contacts.php:523
+msgid "Search your contacts"
+msgstr ""
+
+#: ../../mod/contacts.php:524 ../../mod/directory.php:67
+msgid "Finding: "
+msgstr ""
+
+#: ../../mod/contacts.php:525 ../../mod/directory.php:69
+#: ../../include/contact_widgets.php:34
+msgid "Find"
+msgstr ""
+
 #: ../../mod/lostpass.php:16
 msgid "No valid account found."
 msgstr ""
@@ -1548,8 +1583,8 @@ msgstr ""
 
 #: ../../mod/lostpass.php:44 ../../mod/lostpass.php:106
 #: ../../mod/register.php:380 ../../mod/register.php:434
-#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:716
-#: ../../include/items.php:2452
+#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:726
+#: ../../include/items.php:2575
 msgid "Administrator"
 msgstr ""
 
@@ -1559,7 +1594,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:82 ../../boot.php:719
+#: ../../mod/lostpass.php:82 ../../boot.php:723
 msgid "Password Reset"
 msgstr ""
 
@@ -1603,427 +1638,444 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
-#: ../../mod/settings.php:70
+#: ../../mod/settings.php:72
 msgid "Missing some important data!"
 msgstr ""
 
-#: ../../mod/settings.php:73 ../../mod/settings.php:479 ../../mod/admin.php:62
+#: ../../mod/settings.php:75 ../../mod/settings.php:486 ../../mod/admin.php:75
 msgid "Update"
 msgstr ""
 
-#: ../../mod/settings.php:168
+#: ../../mod/settings.php:175
 msgid "Failed to connect with email account using the settings provided."
 msgstr ""
 
-#: ../../mod/settings.php:173
+#: ../../mod/settings.php:180
 msgid "Email settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:191
+#: ../../mod/settings.php:198
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:196
+#: ../../mod/settings.php:203
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:207
+#: ../../mod/settings.php:214
 msgid "Password changed."
 msgstr ""
 
-#: ../../mod/settings.php:209
+#: ../../mod/settings.php:216
 msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/settings.php:273
+#: ../../mod/settings.php:280
 msgid " Please use a shorter name."
 msgstr ""
 
-#: ../../mod/settings.php:275
+#: ../../mod/settings.php:282
 msgid " Name too short."
 msgstr ""
 
-#: ../../mod/settings.php:281
+#: ../../mod/settings.php:288
 msgid " Not valid email."
 msgstr ""
 
-#: ../../mod/settings.php:283
+#: ../../mod/settings.php:290
 msgid " Cannot change to that email."
 msgstr ""
 
-#: ../../mod/settings.php:351 ../../addon/facebook/facebook.php:320
-#: ../../addon/impressum/impressum.php:64 ../../addon/piwik/piwik.php:94
-#: ../../addon/twitter/twitter.php:310
+#: ../../mod/settings.php:358 ../../addon/facebook/facebook.php:321
+#: ../../addon/impressum/impressum.php:64
+#: ../../addon/openstreetmap/openstreetmap.php:80
+#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:350
 msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:415 ../../include/nav.php:129
+#: ../../mod/settings.php:422 ../../include/nav.php:130
 msgid "Account settings"
 msgstr ""
 
-#: ../../mod/settings.php:420
+#: ../../mod/settings.php:427
 msgid "Connector settings"
 msgstr ""
 
-#: ../../mod/settings.php:425
+#: ../../mod/settings.php:432
 msgid "Plugin settings"
 msgstr ""
 
-#: ../../mod/settings.php:430
+#: ../../mod/settings.php:437
 msgid "Connections"
 msgstr ""
 
-#: ../../mod/settings.php:435
+#: ../../mod/settings.php:442
 msgid "Export personal data"
 msgstr ""
 
-#: ../../mod/settings.php:452 ../../mod/settings.php:478
-#: ../../mod/settings.php:511
+#: ../../mod/settings.php:459 ../../mod/settings.php:485
+#: ../../mod/settings.php:518
 msgid "Add application"
 msgstr ""
 
-#: ../../mod/settings.php:456 ../../mod/settings.php:482
-#: ../../addon/statusnet/statusnet.php:489
+#: ../../mod/settings.php:463 ../../mod/settings.php:489
+#: ../../addon/statusnet/statusnet.php:526
 msgid "Consumer Key"
 msgstr ""
 
-#: ../../mod/settings.php:457 ../../mod/settings.php:483
-#: ../../addon/statusnet/statusnet.php:488
+#: ../../mod/settings.php:464 ../../mod/settings.php:490
+#: ../../addon/statusnet/statusnet.php:525
 msgid "Consumer Secret"
 msgstr ""
 
-#: ../../mod/settings.php:458 ../../mod/settings.php:484
+#: ../../mod/settings.php:465 ../../mod/settings.php:491
 msgid "Redirect"
 msgstr ""
 
-#: ../../mod/settings.php:459 ../../mod/settings.php:485
+#: ../../mod/settings.php:466 ../../mod/settings.php:492
 msgid "Icon url"
 msgstr ""
 
-#: ../../mod/settings.php:470
+#: ../../mod/settings.php:477
 msgid "You can't edit this application."
 msgstr ""
 
-#: ../../mod/settings.php:510
+#: ../../mod/settings.php:517
 msgid "Connected Apps"
 msgstr ""
 
-#: ../../mod/settings.php:514
+#: ../../mod/settings.php:521
 msgid "Client key starts with"
 msgstr ""
 
-#: ../../mod/settings.php:515
+#: ../../mod/settings.php:522
 msgid "No name"
 msgstr ""
 
-#: ../../mod/settings.php:516
+#: ../../mod/settings.php:523
 msgid "Remove authorization"
 msgstr ""
 
-#: ../../mod/settings.php:528
+#: ../../mod/settings.php:535
 msgid "No Plugin settings configured"
 msgstr ""
 
-#: ../../mod/settings.php:535 ../../addon/widgets/widgets.php:122
+#: ../../mod/settings.php:542 ../../addon/widgets/widgets.php:122
 msgid "Plugin Settings"
 msgstr ""
 
-#: ../../mod/settings.php:548 ../../mod/settings.php:549
+#: ../../mod/settings.php:555 ../../mod/settings.php:556
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr ""
 
-#: ../../mod/settings.php:548 ../../mod/settings.php:549
+#: ../../mod/settings.php:555 ../../mod/settings.php:556
 msgid "enabled"
 msgstr ""
 
-#: ../../mod/settings.php:548 ../../mod/settings.php:549
+#: ../../mod/settings.php:555 ../../mod/settings.php:556
 msgid "disabled"
 msgstr ""
 
-#: ../../mod/settings.php:549
+#: ../../mod/settings.php:556
 msgid "StatusNet"
 msgstr ""
 
-#: ../../mod/settings.php:575
+#: ../../mod/settings.php:584
 msgid "Connector Settings"
 msgstr ""
 
-#: ../../mod/settings.php:581
+#: ../../mod/settings.php:590
 msgid "Email/Mailbox Setup"
 msgstr ""
 
-#: ../../mod/settings.php:582
+#: ../../mod/settings.php:591
 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:583
+#: ../../mod/settings.php:592
 msgid "Last successful email check:"
 msgstr ""
 
-#: ../../mod/settings.php:584
+#: ../../mod/settings.php:593
 msgid "Email access is disabled on this site."
 msgstr ""
 
-#: ../../mod/settings.php:585
+#: ../../mod/settings.php:594
 msgid "IMAP server name:"
 msgstr ""
 
-#: ../../mod/settings.php:586
+#: ../../mod/settings.php:595
 msgid "IMAP port:"
 msgstr ""
 
-#: ../../mod/settings.php:587
+#: ../../mod/settings.php:596
 msgid "Security:"
 msgstr ""
 
-#: ../../mod/settings.php:587
+#: ../../mod/settings.php:596 ../../mod/settings.php:601
 msgid "None"
 msgstr ""
 
-#: ../../mod/settings.php:588
+#: ../../mod/settings.php:597
 msgid "Email login name:"
 msgstr ""
 
-#: ../../mod/settings.php:589
+#: ../../mod/settings.php:598
 msgid "Email password:"
 msgstr ""
 
-#: ../../mod/settings.php:590
+#: ../../mod/settings.php:599
 msgid "Reply-to address:"
 msgstr ""
 
-#: ../../mod/settings.php:591
+#: ../../mod/settings.php:600
 msgid "Send public posts to all email contacts:"
 msgstr ""
 
-#: ../../mod/settings.php:648 ../../mod/admin.php:126 ../../mod/admin.php:443
+#: ../../mod/settings.php:601
+msgid "Action after import:"
+msgstr ""
+
+#: ../../mod/settings.php:601
+msgid "Mark as seen"
+msgstr ""
+
+#: ../../mod/settings.php:601
+msgid "Move to folder"
+msgstr ""
+
+#: ../../mod/settings.php:602
+msgid "Move to folder:"
+msgstr ""
+
+#: ../../mod/settings.php:659 ../../mod/admin.php:142 ../../mod/admin.php:462
 msgid "Normal Account"
 msgstr ""
 
-#: ../../mod/settings.php:649
+#: ../../mod/settings.php:660
 msgid "This account is a normal personal profile"
 msgstr ""
 
-#: ../../mod/settings.php:652 ../../mod/admin.php:127 ../../mod/admin.php:444
+#: ../../mod/settings.php:663 ../../mod/admin.php:143 ../../mod/admin.php:463
 msgid "Soapbox Account"
 msgstr ""
 
-#: ../../mod/settings.php:653
+#: ../../mod/settings.php:664
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr ""
 
-#: ../../mod/settings.php:656 ../../mod/admin.php:128 ../../mod/admin.php:445
+#: ../../mod/settings.php:667 ../../mod/admin.php:144 ../../mod/admin.php:464
 msgid "Community/Celebrity Account"
 msgstr ""
 
-#: ../../mod/settings.php:657
+#: ../../mod/settings.php:668
 msgid "Automatically approve all connection/friend requests as read-write fans"
 msgstr ""
 
-#: ../../mod/settings.php:660 ../../mod/admin.php:129 ../../mod/admin.php:446
+#: ../../mod/settings.php:671 ../../mod/admin.php:145 ../../mod/admin.php:465
 msgid "Automatic Friend Account"
 msgstr ""
 
-#: ../../mod/settings.php:661
+#: ../../mod/settings.php:672
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr ""
 
-#: ../../mod/settings.php:671
+#: ../../mod/settings.php:682
 msgid "OpenID:"
 msgstr ""
 
-#: ../../mod/settings.php:671
+#: ../../mod/settings.php:682
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: ../../mod/settings.php:681
+#: ../../mod/settings.php:692
 msgid "Publish your default profile in your local site directory?"
 msgstr ""
 
-#: ../../mod/settings.php:687
+#: ../../mod/settings.php:698
 msgid "Publish your default profile in the global social directory?"
 msgstr ""
 
-#: ../../mod/settings.php:695
+#: ../../mod/settings.php:706
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr ""
 
-#: ../../mod/settings.php:699
+#: ../../mod/settings.php:710
 msgid "Hide your profile details from unknown viewers?"
 msgstr ""
 
-#: ../../mod/settings.php:704
+#: ../../mod/settings.php:715
 msgid "Allow friends to post to your profile page?"
 msgstr ""
 
-#: ../../mod/settings.php:710
+#: ../../mod/settings.php:721
 msgid "Allow friends to tag your posts?"
 msgstr ""
 
-#: ../../mod/settings.php:716
+#: ../../mod/settings.php:727
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../mod/settings.php:725
+#: ../../mod/settings.php:736
 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: ../../mod/settings.php:744 ../../mod/profile_photo.php:206
+#: ../../mod/settings.php:768 ../../mod/profile_photo.php:206
 msgid "or"
 msgstr ""
 
-#: ../../mod/settings.php:749
+#: ../../mod/settings.php:773
 msgid "Your Identity Address is"
 msgstr ""
 
-#: ../../mod/settings.php:760
+#: ../../mod/settings.php:784
 msgid "Automatically expire posts after this many days:"
 msgstr ""
 
-#: ../../mod/settings.php:760
+#: ../../mod/settings.php:784
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr ""
 
-#: ../../mod/settings.php:761
+#: ../../mod/settings.php:785
 msgid "Advanced expiration settings"
 msgstr ""
 
-#: ../../mod/settings.php:762
+#: ../../mod/settings.php:786
 msgid "Advanced Expiration"
 msgstr ""
 
-#: ../../mod/settings.php:763
+#: ../../mod/settings.php:787
 msgid "Expire posts:"
 msgstr ""
 
-#: ../../mod/settings.php:764
+#: ../../mod/settings.php:788
 msgid "Expire personal notes:"
 msgstr ""
 
-#: ../../mod/settings.php:765
+#: ../../mod/settings.php:789
 msgid "Expire starred posts:"
 msgstr ""
 
-#: ../../mod/settings.php:766
+#: ../../mod/settings.php:790
 msgid "Expire photos:"
 msgstr ""
 
-#: ../../mod/settings.php:771
+#: ../../mod/settings.php:795
 msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/settings.php:779
+#: ../../mod/settings.php:803
 msgid "Password Settings"
 msgstr ""
 
-#: ../../mod/settings.php:780
+#: ../../mod/settings.php:804
 msgid "New Password:"
 msgstr ""
 
-#: ../../mod/settings.php:781
+#: ../../mod/settings.php:805
 msgid "Confirm:"
 msgstr ""
 
-#: ../../mod/settings.php:781
+#: ../../mod/settings.php:805
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/settings.php:785
+#: ../../mod/settings.php:809
 msgid "Basic Settings"
 msgstr ""
 
-#: ../../mod/settings.php:786 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:810 ../../include/profile_advanced.php:15
 msgid "Full Name:"
 msgstr ""
 
-#: ../../mod/settings.php:787
+#: ../../mod/settings.php:811
 msgid "Email Address:"
 msgstr ""
 
-#: ../../mod/settings.php:788
+#: ../../mod/settings.php:812
 msgid "Your Timezone:"
 msgstr ""
 
-#: ../../mod/settings.php:789
+#: ../../mod/settings.php:813
 msgid "Default Post Location:"
 msgstr ""
 
-#: ../../mod/settings.php:790
+#: ../../mod/settings.php:814
 msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../mod/settings.php:791
+#: ../../mod/settings.php:815
 msgid "Display Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:792
+#: ../../mod/settings.php:816
 msgid "Update browser every xx seconds"
 msgstr ""
 
-#: ../../mod/settings.php:792
+#: ../../mod/settings.php:816
 msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
-#: ../../mod/settings.php:794
+#: ../../mod/settings.php:818
 msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../mod/settings.php:796
+#: ../../mod/settings.php:820
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/settings.php:796
+#: ../../mod/settings.php:820
 msgid "(to prevent spam abuse)"
 msgstr ""
 
-#: ../../mod/settings.php:797
+#: ../../mod/settings.php:821
 msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:798
+#: ../../mod/settings.php:822
 msgid "(click to open/close)"
 msgstr ""
 
-#: ../../mod/settings.php:813
+#: ../../mod/settings.php:837
 msgid "Notification Settings"
 msgstr ""
 
-#: ../../mod/settings.php:814
+#: ../../mod/settings.php:838
 msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../mod/settings.php:815
+#: ../../mod/settings.php:839
 msgid "You receive an introduction"
 msgstr ""
 
-#: ../../mod/settings.php:816
+#: ../../mod/settings.php:840
 msgid "Your introductions are confirmed"
 msgstr ""
 
-#: ../../mod/settings.php:817
+#: ../../mod/settings.php:841
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../mod/settings.php:818
+#: ../../mod/settings.php:842
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../mod/settings.php:819
+#: ../../mod/settings.php:843
 msgid "You receive a private message"
 msgstr ""
 
-#: ../../mod/settings.php:820
+#: ../../mod/settings.php:844
 msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../mod/settings.php:821
+#: ../../mod/settings.php:845
 msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../mod/settings.php:824
+#: ../../mod/settings.php:848
 msgid "Advanced Page Settings"
 msgstr ""
 
@@ -2089,35 +2141,35 @@ msgstr[1] ""
 msgid "Private messages to this group are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/network.php:304
+#: ../../mod/network.php:298
 msgid "No such group"
 msgstr ""
 
-#: ../../mod/network.php:315
+#: ../../mod/network.php:309
 msgid "Group is empty"
 msgstr ""
 
-#: ../../mod/network.php:319
+#: ../../mod/network.php:313
 msgid "Group: "
 msgstr ""
 
-#: ../../mod/network.php:329
+#: ../../mod/network.php:323
 msgid "Contact: "
 msgstr ""
 
-#: ../../mod/network.php:331
+#: ../../mod/network.php:325
 msgid "Private messages to this person are at risk of public disclosure."
 msgstr ""
 
-#: ../../mod/network.php:336
+#: ../../mod/network.php:330
 msgid "Invalid contact."
 msgstr ""
 
-#: ../../mod/notes.php:44 ../../boot.php:1350
+#: ../../mod/notes.php:44 ../../boot.php:1354
 msgid "Personal Notes"
 msgstr ""
 
-#: ../../mod/notes.php:63 ../../include/text.php:639
+#: ../../mod/notes.php:63 ../../include/text.php:645
 msgid "Save"
 msgstr ""
 
@@ -2132,13 +2184,16 @@ msgstr ""
 #: ../../mod/newmember.php:12
 msgid ""
 "We would like to offer some tips and links to help make your experience "
-"enjoyable. Click any item to visit the relevant page."
+"enjoyable. Click any item to visit the relevant page. A link to this page "
+"will be visible from your home page for two weeks after your initial "
+"registration and then will quietly disappear."
 msgstr ""
 
 #: ../../mod/newmember.php:16
 msgid ""
 "On your <em>Settings</em> page -  change your initial password. Also make a "
-"note of your Identity Address. This will be useful in making friends."
+"note of your Identity Address. This looks just like an email address - and "
+"will be useful in making friends on the free social web."
 msgstr ""
 
 #: ../../mod/newmember.php:18
@@ -2162,49 +2217,64 @@ msgid ""
 "and we will (optionally) import all your Facebook friends and conversations."
 msgstr ""
 
-#: ../../mod/newmember.php:28
+#: ../../mod/newmember.php:25
+msgid ""
+"<em>If</em> this is your own personal server, installing the Facebook addon "
+"may ease your transition to the free social web."
+msgstr ""
+
+#: ../../mod/newmember.php:30
 msgid ""
 "Enter your email access information on your Connector Settings page if you "
 "wish to import and interact with friends or mailing lists from your email "
 "INBOX"
 msgstr ""
 
-#: ../../mod/newmember.php:30
+#: ../../mod/newmember.php:32
 msgid ""
 "Edit your <strong>default</strong> profile to your liking. Review the "
 "settings for hiding your list of friends and hiding the profile from unknown "
 "visitors."
 msgstr ""
 
-#: ../../mod/newmember.php:32
+#: ../../mod/newmember.php:34
 msgid ""
 "Set some public keywords for your default profile which describe your "
 "interests. We may be able to find other people with similar interests and "
 "suggest friendships."
 msgstr ""
 
-#: ../../mod/newmember.php:34
+#: ../../mod/newmember.php:36
 msgid ""
 "Your Contacts page is your gateway to managing friendships and connecting "
 "with friends on other networks. Typically you enter their address or site "
 "URL in the <em>Add New Contact</em> dialog."
 msgstr ""
 
-#: ../../mod/newmember.php:36
+#: ../../mod/newmember.php:38
 msgid ""
 "The Directory page lets you find other people in this network or other "
 "federated sites. Look for a <em>Connect</em> or <em>Follow</em> link on "
 "their profile page. Provide your own Identity Address if requested."
 msgstr ""
 
-#: ../../mod/newmember.php:38
+#: ../../mod/newmember.php:40
+msgid ""
+"On the side panel of the Contacts page are several tools to find new "
+"friends. We can match people by interest, look up people by name or "
+"interest, and provide suggestions based on network relationships. On a brand "
+"new site, friend suggestions will usually begin to be populated within 24 "
+"hours."
+msgstr ""
+
+#: ../../mod/newmember.php:42
 msgid ""
 "Once you have made some friends, organize them into private conversation "
 "groups from the sidebar of your Contacts page and then you can interact with "
 "each group privately on your Network page."
 msgstr ""
 
-#: ../../mod/newmember.php:40
+#: ../../mod/newmember.php:44
 msgid ""
 "Our <strong>help</strong> pages may be consulted for detail on other program "
 "features and resources."
@@ -2226,7 +2296,7 @@ msgstr ""
 msgid "Could not create group."
 msgstr ""
 
-#: ../../mod/group.php:43 ../../mod/group.php:123
+#: ../../mod/group.php:43 ../../mod/group.php:127
 msgid "Group not found."
 msgstr ""
 
@@ -2238,36 +2308,32 @@ msgstr ""
 msgid "Permission denied"
 msgstr ""
 
-#: ../../mod/group.php:82
+#: ../../mod/group.php:85
 msgid "Create a group of contacts/friends."
 msgstr ""
 
-#: ../../mod/group.php:83 ../../mod/group.php:166
+#: ../../mod/group.php:86 ../../mod/group.php:166
 msgid "Group Name: "
 msgstr ""
 
-#: ../../mod/group.php:98
+#: ../../mod/group.php:102
 msgid "Group removed."
 msgstr ""
 
-#: ../../mod/group.php:100
+#: ../../mod/group.php:104
 msgid "Unable to remove group."
 msgstr ""
 
-#: ../../mod/group.php:164 ../../mod/profperm.php:105
-msgid "Click on a contact to add or remove."
-msgstr ""
-
 #: ../../mod/group.php:165
 msgid "Group Editor"
 msgstr ""
 
-#: ../../mod/group.php:179
+#: ../../mod/group.php:177
 msgid "Members"
 msgstr ""
 
-#: ../../mod/group.php:194
-msgid "All Contacts"
+#: ../../mod/group.php:209 ../../mod/profperm.php:105
+msgid "Click on a contact to add or remove."
 msgstr ""
 
 #: ../../mod/profperm.php:25 ../../mod/profperm.php:55
@@ -2280,7 +2346,7 @@ msgstr ""
 
 #: ../../mod/profperm.php:103 ../../include/profile_advanced.php:7
 #: ../../include/profile_advanced.php:76 ../../include/nav.php:48
-#: ../../boot.php:1332
+#: ../../boot.php:1336
 msgid "Profile"
 msgstr ""
 
@@ -2292,12 +2358,12 @@ msgstr ""
 msgid "All Contacts (with secure profile access)"
 msgstr ""
 
-#: ../../mod/viewcontacts.php:25 ../../include/text.php:578
-msgid "View Contacts"
+#: ../../mod/viewcontacts.php:39
+msgid "No contacts."
 msgstr ""
 
-#: ../../mod/viewcontacts.php:40
-msgid "No contacts."
+#: ../../mod/viewcontacts.php:74 ../../include/text.php:584
+msgid "View Contacts"
 msgstr ""
 
 #: ../../mod/register.php:62
@@ -2423,7 +2489,7 @@ msgstr ""
 msgid "Your invitation ID: "
 msgstr ""
 
-#: ../../mod/register.php:540 ../../mod/admin.php:297
+#: ../../mod/register.php:540 ../../mod/admin.php:314
 msgid "Registration"
 msgstr ""
 
@@ -2446,7 +2512,7 @@ msgstr ""
 msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/register.php:554 ../../include/nav.php:77 ../../boot.php:689
+#: ../../mod/register.php:554 ../../include/nav.php:77 ../../boot.php:693
 msgid "Register"
 msgstr ""
 
@@ -2455,30 +2521,31 @@ msgid "People Search"
 msgstr ""
 
 #: ../../mod/like.php:127 ../../mod/tagger.php:70
-#: ../../addon/facebook/facebook.php:1091
+#: ../../addon/facebook/facebook.php:1092
 #: ../../addon/communityhome/communityhome.php:158
 #: ../../addon/communityhome/communityhome.php:167
-#: ../../include/diaspora.php:1587 ../../include/conversation.php:26
-#: ../../include/conversation.php:35 ../../include/conversation.php:99
-#: ../../include/conversation.php:108
+#: ../../include/diaspora.php:1600 ../../include/conversation.php:48
+#: ../../include/conversation.php:57 ../../include/conversation.php:121
+#: ../../include/conversation.php:130
 msgid "status"
 msgstr ""
 
-#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1095
+#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1096
 #: ../../addon/communityhome/communityhome.php:172
-#: ../../include/diaspora.php:1603 ../../include/conversation.php:43
+#: ../../include/diaspora.php:1616 ../../include/conversation.php:65
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/like.php:146 ../../include/conversation.php:46
+#: ../../mod/like.php:146 ../../include/conversation.php:68
 #, 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:111
-#: ../../mod/admin.php:502 ../../mod/display.php:28 ../../mod/display.php:116
-#: ../../mod/viewd.php:14 ../../include/items.php:2819
+#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:127
+#: ../../mod/admin.php:522 ../../mod/admin.php:700 ../../mod/display.php:29
+#: ../../mod/display.php:137 ../../mod/viewd.php:14
+#: ../../include/items.php:2942
 msgid "Item not found."
 msgstr ""
 
@@ -2499,42 +2566,42 @@ msgstr ""
 msgid "Please login."
 msgstr ""
 
-#: ../../mod/item.php:88
+#: ../../mod/item.php:89
 msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../mod/item.php:248
+#: ../../mod/item.php:249
 msgid "Empty post discarded."
 msgstr ""
 
-#: ../../mod/item.php:350 ../../mod/wall_upload.php:81
+#: ../../mod/item.php:351 ../../mod/wall_upload.php:81
 #: ../../mod/wall_upload.php:90 ../../mod/wall_upload.php:97
 #: ../../include/message.php:143
 msgid "Wall Photos"
 msgstr ""
 
-#: ../../mod/item.php:827
+#: ../../mod/item.php:833
 msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/item.php:852
+#: ../../mod/item.php:858
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social network."
 msgstr ""
 
-#: ../../mod/item.php:854
+#: ../../mod/item.php:860
 #, php-format
 msgid "You may visit them online at %s"
 msgstr ""
 
-#: ../../mod/item.php:855
+#: ../../mod/item.php:861
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr ""
 
-#: ../../mod/item.php:857
+#: ../../mod/item.php:863
 #, php-format
 msgid "%s posted an update."
 msgstr ""
@@ -2658,7 +2725,7 @@ msgstr ""
 msgid "Conversation removed."
 msgstr ""
 
-#: ../../mod/message.php:137 ../../include/conversation.php:843
+#: ../../mod/message.php:137 ../../include/conversation.php:887
 msgid "Please enter a link URL:"
 msgstr ""
 
@@ -2712,348 +2779,471 @@ msgstr ""
 msgid "No friends to display."
 msgstr ""
 
-#: ../../mod/admin.php:59 ../../mod/admin.php:295
+#: ../../mod/admin.php:71 ../../mod/admin.php:312
 msgid "Site"
 msgstr ""
 
-#: ../../mod/admin.php:60 ../../mod/admin.php:460 ../../mod/admin.php:472
+#: ../../mod/admin.php:72 ../../mod/admin.php:480 ../../mod/admin.php:492
 msgid "Users"
 msgstr ""
 
-#: ../../mod/admin.php:61 ../../mod/admin.php:549 ../../mod/admin.php:586
+#: ../../mod/admin.php:73 ../../mod/admin.php:569 ../../mod/admin.php:608
 msgid "Plugins"
 msgstr ""
 
-#: ../../mod/admin.php:76 ../../mod/admin.php:651
+#: ../../mod/admin.php:74 ../../mod/admin.php:742 ../../mod/admin.php:775
+msgid "Themes"
+msgstr ""
+
+#: ../../mod/admin.php:89 ../../mod/admin.php:855
 msgid "Logs"
 msgstr ""
 
-#: ../../mod/admin.php:81
+#: ../../mod/admin.php:94
 msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: ../../mod/admin.php:144 ../../mod/admin.php:294 ../../mod/admin.php:459
-#: ../../mod/admin.php:548 ../../mod/admin.php:585 ../../mod/admin.php:650
+#: ../../mod/admin.php:161 ../../mod/admin.php:311 ../../mod/admin.php:479
+#: ../../mod/admin.php:568 ../../mod/admin.php:607 ../../mod/admin.php:741
+#: ../../mod/admin.php:774 ../../mod/admin.php:854
 msgid "Administration"
 msgstr ""
 
-#: ../../mod/admin.php:145
+#: ../../mod/admin.php:162
 msgid "Summary"
 msgstr ""
 
-#: ../../mod/admin.php:146
+#: ../../mod/admin.php:163
 msgid "Registered users"
 msgstr ""
 
-#: ../../mod/admin.php:148
+#: ../../mod/admin.php:165
 msgid "Pending registrations"
 msgstr ""
 
-#: ../../mod/admin.php:149
+#: ../../mod/admin.php:166
 msgid "Version"
 msgstr ""
 
-#: ../../mod/admin.php:151
+#: ../../mod/admin.php:168
 msgid "Active plugins"
 msgstr ""
 
-#: ../../mod/admin.php:243
+#: ../../mod/admin.php:260
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:287
+#: ../../mod/admin.php:304
 msgid "Closed"
 msgstr ""
 
-#: ../../mod/admin.php:288
+#: ../../mod/admin.php:305
 msgid "Requires approval"
 msgstr ""
 
-#: ../../mod/admin.php:289
+#: ../../mod/admin.php:306
 msgid "Open"
 msgstr ""
 
-#: ../../mod/admin.php:298
+#: ../../mod/admin.php:315
 msgid "File upload"
 msgstr ""
 
-#: ../../mod/admin.php:299
+#: ../../mod/admin.php:316
 msgid "Policies"
 msgstr ""
 
-#: ../../mod/admin.php:300
+#: ../../mod/admin.php:317
 msgid "Advanced"
 msgstr ""
 
-#: ../../mod/admin.php:304 ../../addon/statusnet/statusnet.php:486
+#: ../../mod/admin.php:321 ../../addon/statusnet/statusnet.php:523
 msgid "Site name"
 msgstr ""
 
-#: ../../mod/admin.php:305
+#: ../../mod/admin.php:322
 msgid "Banner/Logo"
 msgstr ""
 
-#: ../../mod/admin.php:306
+#: ../../mod/admin.php:323
 msgid "System language"
 msgstr ""
 
-#: ../../mod/admin.php:307
+#: ../../mod/admin.php:324
 msgid "System theme"
 msgstr ""
 
-#: ../../mod/admin.php:309
+#: ../../mod/admin.php:324
+msgid "Default system theme - may be over-ridden by user profiles"
+msgstr ""
+
+#: ../../mod/admin.php:326
 msgid "Maximum image size"
 msgstr ""
 
-#: ../../mod/admin.php:311
+#: ../../mod/admin.php:326
+msgid ""
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
+msgstr ""
+
+#: ../../mod/admin.php:328
 msgid "Register policy"
 msgstr ""
 
-#: ../../mod/admin.php:312
+#: ../../mod/admin.php:329
 msgid "Register text"
 msgstr ""
 
-#: ../../mod/admin.php:313
+#: ../../mod/admin.php:329
+msgid "Will be displayed prominently on the registration page."
+msgstr ""
+
+#: ../../mod/admin.php:330
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: ../../mod/admin.php:313
+#: ../../mod/admin.php:330
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: ../../mod/admin.php:314
+#: ../../mod/admin.php:331
 msgid "Allowed friend domains"
 msgstr ""
 
-#: ../../mod/admin.php:315
+#: ../../mod/admin.php:331
+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:332
 msgid "Allowed email domains"
 msgstr ""
 
-#: ../../mod/admin.php:316
+#: ../../mod/admin.php:332
+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:333
 msgid "Block public"
 msgstr ""
 
-#: ../../mod/admin.php:317
+#: ../../mod/admin.php:333
+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:334
 msgid "Force publish"
 msgstr ""
 
-#: ../../mod/admin.php:318
+#: ../../mod/admin.php:334
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
+msgstr ""
+
+#: ../../mod/admin.php:335
 msgid "Global directory update URL"
 msgstr ""
 
-#: ../../mod/admin.php:320
+#: ../../mod/admin.php:335
+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:337
 msgid "Block multiple registrations"
 msgstr ""
 
-#: ../../mod/admin.php:321
+#: ../../mod/admin.php:337
+msgid "Disallow users to register additional accounts for use as pages."
+msgstr ""
+
+#: ../../mod/admin.php:338
 msgid "OpenID support"
 msgstr ""
 
-#: ../../mod/admin.php:322
+#: ../../mod/admin.php:338
+msgid "OpenID support for registration and logins."
+msgstr ""
+
+#: ../../mod/admin.php:339
 msgid "Gravatar support"
 msgstr ""
 
-#: ../../mod/admin.php:323
+#: ../../mod/admin.php:339
+msgid "Search new user's photo on Gravatar."
+msgstr ""
+
+#: ../../mod/admin.php:340
 msgid "Fullname check"
 msgstr ""
 
-#: ../../mod/admin.php:324
+#: ../../mod/admin.php:340
+msgid ""
+"Force users to register with a space between firstname and lastname in Full "
+"name, as an antispam measure"
+msgstr ""
+
+#: ../../mod/admin.php:341
 msgid "UTF-8 Regular expressions"
 msgstr ""
 
-#: ../../mod/admin.php:325
+#: ../../mod/admin.php:341
+msgid "Use PHP UTF8 regular expressions"
+msgstr ""
+
+#: ../../mod/admin.php:342
 msgid "Show Community Page"
 msgstr ""
 
-#: ../../mod/admin.php:326
+#: ../../mod/admin.php:342
+msgid ""
+"Display a Community page showing all recent public postings on this site."
+msgstr ""
+
+#: ../../mod/admin.php:343
 msgid "Enable OStatus support"
 msgstr ""
 
-#: ../../mod/admin.php:327
+#: ../../mod/admin.php:343
+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:344
 msgid "Enable Diaspora support"
 msgstr ""
 
-#: ../../mod/admin.php:328
+#: ../../mod/admin.php:344
+msgid "Provide built-in Diaspora network compatibility."
+msgstr ""
+
+#: ../../mod/admin.php:345
 msgid "Only allow Friendica contacts"
 msgstr ""
 
-#: ../../mod/admin.php:329
+#: ../../mod/admin.php:345
+msgid ""
+"All contacts must use Friendica protocols. All other built-in communication "
+"protocols disabled."
+msgstr ""
+
+#: ../../mod/admin.php:346
 msgid "Verify SSL"
 msgstr ""
 
-#: ../../mod/admin.php:330
+#: ../../mod/admin.php:346
+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:347
 msgid "Proxy user"
 msgstr ""
 
-#: ../../mod/admin.php:331
+#: ../../mod/admin.php:348
 msgid "Proxy URL"
 msgstr ""
 
-#: ../../mod/admin.php:332
+#: ../../mod/admin.php:349
 msgid "Network timeout"
 msgstr ""
 
-#: ../../mod/admin.php:353
+#: ../../mod/admin.php:349
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+msgstr ""
+
+#: ../../mod/admin.php:370
 #, php-format
-msgid "%s user blocked"
+msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:360
+#: ../../mod/admin.php:377
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:394
+#: ../../mod/admin.php:411
 #, php-format
 msgid "User '%s' deleted"
 msgstr ""
 
-#: ../../mod/admin.php:401
+#: ../../mod/admin.php:418
 #, php-format
 msgid "User '%s' unblocked"
 msgstr ""
 
-#: ../../mod/admin.php:401
+#: ../../mod/admin.php:418
 #, php-format
 msgid "User '%s' blocked"
 msgstr ""
 
-#: ../../mod/admin.php:462
+#: ../../mod/admin.php:482
 msgid "select all"
 msgstr ""
 
-#: ../../mod/admin.php:463
+#: ../../mod/admin.php:483
 msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:484
 msgid "Request date"
 msgstr ""
 
-#: ../../mod/admin.php:464 ../../mod/admin.php:473
+#: ../../mod/admin.php:484 ../../mod/admin.php:493
 #: ../../include/contact_selectors.php:79
 msgid "Email"
 msgstr ""
 
-#: ../../mod/admin.php:465
+#: ../../mod/admin.php:485
 msgid "No registrations."
 msgstr ""
 
-#: ../../mod/admin.php:467
+#: ../../mod/admin.php:487
 msgid "Deny"
 msgstr ""
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:493
 msgid "Register date"
 msgstr ""
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:493
 msgid "Last login"
 msgstr ""
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:493
 msgid "Last item"
 msgstr ""
 
-#: ../../mod/admin.php:473
+#: ../../mod/admin.php:493
 msgid "Account"
 msgstr ""
 
-#: ../../mod/admin.php:475
+#: ../../mod/admin.php:495
 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:476
+#: ../../mod/admin.php:496
 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:512
+#: ../../mod/admin.php:532
 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../mod/admin.php:516
+#: ../../mod/admin.php:536
 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../mod/admin.php:526
+#: ../../mod/admin.php:546 ../../mod/admin.php:724
 msgid "Disable"
 msgstr ""
 
-#: ../../mod/admin.php:528
+#: ../../mod/admin.php:548 ../../mod/admin.php:726
 msgid "Enable"
 msgstr ""
 
-#: ../../mod/admin.php:550
+#: ../../mod/admin.php:570 ../../mod/admin.php:743
 msgid "Toggle"
 msgstr ""
 
-#: ../../mod/admin.php:551 ../../include/nav.php:129
+#: ../../mod/admin.php:571 ../../mod/admin.php:744 ../../include/nav.php:130
 msgid "Settings"
 msgstr ""
 
-#: ../../mod/admin.php:613
+#: ../../mod/admin.php:578 ../../mod/admin.php:753
+msgid "Author: "
+msgstr ""
+
+#: ../../mod/admin.php:579 ../../mod/admin.php:754
+msgid "Maintainer: "
+msgstr ""
+
+#: ../../mod/admin.php:689
+msgid "No themes found."
+msgstr ""
+
+#: ../../mod/admin.php:780
+msgid "[Experimental]"
+msgstr ""
+
+#: ../../mod/admin.php:781
+msgid "[Unsupported]"
+msgstr ""
+
+#: ../../mod/admin.php:804
 msgid "Log settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:653
+#: ../../mod/admin.php:857
 msgid "Clear"
 msgstr ""
 
-#: ../../mod/admin.php:659
+#: ../../mod/admin.php:863
 msgid "Debugging"
 msgstr ""
 
-#: ../../mod/admin.php:660
+#: ../../mod/admin.php:864
 msgid "Log file"
 msgstr ""
 
-#: ../../mod/admin.php:660
+#: ../../mod/admin.php:864
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr ""
 
-#: ../../mod/admin.php:661
+#: ../../mod/admin.php:865
 msgid "Log level"
 msgstr ""
 
-#: ../../mod/admin.php:702
+#: ../../mod/admin.php:906
 msgid "Close"
 msgstr ""
 
-#: ../../mod/admin.php:708
+#: ../../mod/admin.php:912
 msgid "FTP Host"
 msgstr ""
 
-#: ../../mod/admin.php:709
+#: ../../mod/admin.php:913
 msgid "FTP Path"
 msgstr ""
 
-#: ../../mod/admin.php:710
+#: ../../mod/admin.php:914
 msgid "FTP User"
 msgstr ""
 
-#: ../../mod/admin.php:711
+#: ../../mod/admin.php:915
 msgid "FTP Password"
 msgstr ""
 
-#: ../../mod/profile.php:15 ../../boot.php:841
+#: ../../mod/profile.php:15 ../../boot.php:845
 msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../mod/profile.php:111 ../../mod/display.php:66
+#: ../../mod/profile.php:111 ../../mod/display.php:67
 msgid "Access to this profile has been restricted."
 msgstr ""
 
@@ -3061,48 +3251,48 @@ msgstr ""
 msgid "Tips for New Members"
 msgstr ""
 
-#: ../../mod/ping.php:148
+#: ../../mod/ping.php:174
 msgid "{0} wants to be your friend"
 msgstr ""
 
-#: ../../mod/ping.php:153
+#: ../../mod/ping.php:179
 msgid "{0} sent you a message"
 msgstr ""
 
-#: ../../mod/ping.php:158
+#: ../../mod/ping.php:184
 msgid "{0} requested registration"
 msgstr ""
 
-#: ../../mod/ping.php:164
+#: ../../mod/ping.php:190
 #, php-format
 msgid "{0} commented %s's post"
 msgstr ""
 
-#: ../../mod/ping.php:169
+#: ../../mod/ping.php:195
 #, php-format
 msgid "{0} liked %s's post"
 msgstr ""
 
-#: ../../mod/ping.php:174
+#: ../../mod/ping.php:200
 #, php-format
 msgid "{0} disliked %s's post"
 msgstr ""
 
-#: ../../mod/ping.php:179
+#: ../../mod/ping.php:205
 #, php-format
 msgid "{0} is now friends with %s"
 msgstr ""
 
-#: ../../mod/ping.php:184
+#: ../../mod/ping.php:210
 msgid "{0} posted"
 msgstr ""
 
-#: ../../mod/ping.php:189
+#: ../../mod/ping.php:215
 #, php-format
 msgid "{0} tagged %s's post with #%s"
 msgstr ""
 
-#: ../../mod/ping.php:195
+#: ../../mod/ping.php:221
 msgid "{0} mentioned you in a post"
 msgstr ""
 
@@ -3120,39 +3310,39 @@ msgid ""
 "This site is not configured to allow communications with other networks."
 msgstr ""
 
-#: ../../mod/follow.php:48 ../../mod/follow.php:58
+#: ../../mod/follow.php:48 ../../mod/follow.php:63
 msgid "No compatible communication protocols or feeds were discovered."
 msgstr ""
 
-#: ../../mod/follow.php:56
+#: ../../mod/follow.php:61
 msgid "The profile address specified does not provide adequate information."
 msgstr ""
 
-#: ../../mod/follow.php:60
+#: ../../mod/follow.php:65
 msgid "An author or name was not found."
 msgstr ""
 
-#: ../../mod/follow.php:62
+#: ../../mod/follow.php:67
 msgid "No browser URL could be matched to this address."
 msgstr ""
 
-#: ../../mod/follow.php:69
+#: ../../mod/follow.php:74
 msgid ""
 "The profile address specified belongs to a network which has been disabled "
 "on this site."
 msgstr ""
 
-#: ../../mod/follow.php:74
+#: ../../mod/follow.php:79
 msgid ""
 "Limited profile. This person will be unable to receive direct/personal "
 "notifications from you."
 msgstr ""
 
-#: ../../mod/follow.php:144
+#: ../../mod/follow.php:149
 msgid "Unable to retrieve contact information."
 msgstr ""
 
-#: ../../mod/follow.php:190
+#: ../../mod/follow.php:195
 msgid "following"
 msgstr ""
 
@@ -3164,7 +3354,7 @@ msgstr ""
 msgid "No friends in common."
 msgstr ""
 
-#: ../../mod/display.php:109
+#: ../../mod/display.php:130
 msgid "Item has been removed."
 msgstr ""
 
@@ -3368,7 +3558,7 @@ msgid ""
 "be visible to anybody using the internet."
 msgstr ""
 
-#: ../../mod/profiles.php:426 ../../mod/directory.php:122
+#: ../../mod/profiles.php:426 ../../mod/directory.php:124
 msgid "Age: "
 msgstr ""
 
@@ -3376,27 +3566,27 @@ msgstr ""
 msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/profiles.php:462 ../../boot.php:942
+#: ../../mod/profiles.php:462 ../../boot.php:946
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/profiles.php:463 ../../boot.php:943
+#: ../../mod/profiles.php:463 ../../boot.php:947
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/profiles.php:473 ../../boot.php:953
+#: ../../mod/profiles.php:473 ../../boot.php:957
 msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/profiles.php:475 ../../boot.php:956
+#: ../../mod/profiles.php:475 ../../boot.php:960
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../mod/profiles.php:476 ../../boot.php:957
+#: ../../mod/profiles.php:476 ../../boot.php:961
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../mod/tagger.php:103 ../../include/conversation.php:116
+#: ../../mod/tagger.php:103 ../../include/conversation.php:138
 #, php-format
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
@@ -3450,31 +3640,31 @@ msgstr ""
 msgid "Ignore/Hide"
 msgstr ""
 
-#: ../../mod/directory.php:49
+#: ../../mod/directory.php:51
 msgid "Global Directory"
 msgstr ""
 
-#: ../../mod/directory.php:55
+#: ../../mod/directory.php:57
 msgid "Normal site view"
 msgstr ""
 
-#: ../../mod/directory.php:57
+#: ../../mod/directory.php:59
 msgid "Admin - View all site entries"
 msgstr ""
 
-#: ../../mod/directory.php:63
+#: ../../mod/directory.php:65
 msgid "Find on this site"
 msgstr ""
 
-#: ../../mod/directory.php:66
+#: ../../mod/directory.php:68
 msgid "Site Directory"
 msgstr ""
 
-#: ../../mod/directory.php:125
+#: ../../mod/directory.php:127
 msgid "Gender: "
 msgstr ""
 
-#: ../../mod/directory.php:151
+#: ../../mod/directory.php:153
 msgid "No entries (some entries may be hidden)."
 msgstr ""
 
@@ -3530,147 +3720,153 @@ msgid ""
 "Once you have registered, please connect with me via my profile page at:"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:238
+#: ../../mod/dfrn_confirm.php:119
+msgid ""
+"This may occasionally happen if contact was requested by both persons and it "
+"has already been approved."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:239
 msgid "Response from remote site was not understood."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:247
+#: ../../mod/dfrn_confirm.php:248
 msgid "Unexpected response from remote site: "
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:255
+#: ../../mod/dfrn_confirm.php:256
 msgid "Confirmation completed successfully."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:257 ../../mod/dfrn_confirm.php:271
-#: ../../mod/dfrn_confirm.php:278
+#: ../../mod/dfrn_confirm.php:258 ../../mod/dfrn_confirm.php:272
+#: ../../mod/dfrn_confirm.php:279
 msgid "Remote site reported: "
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:269
+#: ../../mod/dfrn_confirm.php:270
 msgid "Temporary failure. Please wait and try again."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:276
+#: ../../mod/dfrn_confirm.php:277
 msgid "Introduction failed or was revoked."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:421
+#: ../../mod/dfrn_confirm.php:422
 msgid "Unable to set contact photo."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:473 ../../include/diaspora.php:495
-#: ../../include/conversation.php:79
+#: ../../mod/dfrn_confirm.php:474 ../../include/diaspora.php:495
+#: ../../include/conversation.php:101
 #, php-format
 msgid "%1$s is now friends with %2$s"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:543
+#: ../../mod/dfrn_confirm.php:544
 #, php-format
 msgid "No user record found for '%s' "
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:553
+#: ../../mod/dfrn_confirm.php:554
 msgid "Our site encryption key is apparently messed up."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:564
+#: ../../mod/dfrn_confirm.php:565
 msgid "Empty site URL was provided or URL could not be decrypted by us."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:585
+#: ../../mod/dfrn_confirm.php:586
 msgid "Contact record was not found for you on our site."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:599
+#: ../../mod/dfrn_confirm.php:600
 #, php-format
 msgid "Site public key not available in contact record for URL %s."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:619
+#: ../../mod/dfrn_confirm.php:620
 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:630
+#: ../../mod/dfrn_confirm.php:631
 msgid "Unable to set your contact credentials on our system."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:684
+#: ../../mod/dfrn_confirm.php:694
 msgid "Unable to update your contact profile details on our system"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:714
+#: ../../mod/dfrn_confirm.php:724
 #, php-format
 msgid "Connection accepted at %s"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:337
+#: ../../addon/facebook/facebook.php:338
 msgid "Facebook disabled"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:342
+#: ../../addon/facebook/facebook.php:343
 msgid "Updating contacts"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:351
+#: ../../addon/facebook/facebook.php:352
 msgid "Facebook API key is missing."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:358
+#: ../../addon/facebook/facebook.php:359
 msgid "Facebook Connect"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:364
+#: ../../addon/facebook/facebook.php:365
 msgid "Install Facebook connector for this account."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:371
+#: ../../addon/facebook/facebook.php:372
 msgid "Remove Facebook connector"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:376
+#: ../../addon/facebook/facebook.php:377
 msgid ""
 "Re-authenticate [This is necessary whenever your Facebook password is "
 "changed.]"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:383
+#: ../../addon/facebook/facebook.php:384
 msgid "Post to Facebook by default"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:387
+#: ../../addon/facebook/facebook.php:388
 msgid "Link all your Facebook friends and conversations on this website"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:389
+#: ../../addon/facebook/facebook.php:390
 msgid ""
 "Facebook conversations consist of your <em>profile wall</em> and your friend "
 "<em>stream</em>."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:390
+#: ../../addon/facebook/facebook.php:391
 msgid "On this website, your Facebook friend stream is only visible to you."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:391
+#: ../../addon/facebook/facebook.php:392
 msgid ""
 "The following settings determine the privacy of your Facebook profile wall "
 "on this website."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:395
+#: ../../addon/facebook/facebook.php:396
 msgid ""
 "On this website your Facebook profile wall conversations will only be "
 "visible to you"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:400
+#: ../../addon/facebook/facebook.php:401
 msgid "Do not import your Facebook profile wall conversations"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:402
+#: ../../addon/facebook/facebook.php:403
 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 "
@@ -3678,43 +3874,43 @@ msgid ""
 "who may see the conversations."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:407
+#: ../../addon/facebook/facebook.php:408
 msgid "Comma separated applications to ignore"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:475
+#: ../../addon/facebook/facebook.php:476
 #: ../../include/contact_selectors.php:81
 msgid "Facebook"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:476
+#: ../../addon/facebook/facebook.php:477
 msgid "Facebook Connector Settings"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:490
+#: ../../addon/facebook/facebook.php:491
 msgid "Post to Facebook"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:581
+#: ../../addon/facebook/facebook.php:582
 msgid ""
 "Post to Facebook cancelled because of multi-network access permission "
 "conflict."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:650
+#: ../../addon/facebook/facebook.php:651
 msgid "Image: "
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:727
+#: ../../addon/facebook/facebook.php:728
 msgid "View on Friendica"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:751
+#: ../../addon/facebook/facebook.php:752
 msgid "Facebook post failed. Queued for retry."
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:876 ../../addon/facebook/facebook.php:885
-#: ../../include/bb2diaspora.php:113
+#: ../../addon/facebook/facebook.php:877 ../../addon/facebook/facebook.php:886
+#: ../../include/bb2diaspora.php:102
 msgid "link"
 msgstr ""
 
@@ -3772,6 +3968,30 @@ msgstr ""
 msgid "yourls Settings saved."
 msgstr ""
 
+#: ../../addon/ljpost/ljpost.php:38
+msgid "Post to LiveJournal"
+msgstr ""
+
+#: ../../addon/ljpost/ljpost.php:69
+msgid "LiveJournal Post Settings"
+msgstr ""
+
+#: ../../addon/ljpost/ljpost.php:71
+msgid "Enable LiveJournal Post Plugin"
+msgstr ""
+
+#: ../../addon/ljpost/ljpost.php:76
+msgid "LiveJournal username"
+msgstr ""
+
+#: ../../addon/ljpost/ljpost.php:81
+msgid "LiveJournal password"
+msgstr ""
+
+#: ../../addon/ljpost/ljpost.php:86
+msgid "Post to LiveJournal by default"
+msgstr ""
+
 #: ../../addon/nsfw/nsfw.php:47
 msgid "\"Not Safe For Work\" Settings"
 msgstr ""
@@ -3798,12 +4018,15 @@ msgid "%s - Click to open/close"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:28
-#: ../../addon/communityhome/communityhome.php:34 ../../include/nav.php:62
-#: ../../boot.php:706
+#: ../../addon/communityhome/communityhome.php:34
+#: ../../addon/communityhome/twillingham/communityhome.php:28
+#: ../../addon/communityhome/twillingham/communityhome.php:34
+#: ../../include/nav.php:62 ../../boot.php:710
 msgid "Login"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:29
+#: ../../addon/communityhome/twillingham/communityhome.php:29
 msgid "OpenID"
 msgstr ""
 
@@ -3812,6 +4035,7 @@ msgid "Last users"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:81
+#: ../../addon/communityhome/twillingham/communityhome.php:81
 msgid "Most active users"
 msgstr ""
 
@@ -3823,11 +4047,15 @@ msgstr ""
 msgid "Last likes"
 msgstr ""
 
-#: ../../addon/communityhome/communityhome.php:155
-#: ../../include/conversation.php:23 ../../include/conversation.php:96
+#: ../../addon/communityhome/communityhome.php:155 ../../include/text.php:1224
+#: ../../include/conversation.php:45 ../../include/conversation.php:118
 msgid "event"
 msgstr ""
 
+#: ../../addon/communityhome/twillingham/communityhome.php:38
+msgid "Latest users"
+msgstr ""
+
 #: ../../addon/uhremotestorage/uhremotestorage.php:84
 #, php-format
 msgid ""
@@ -3914,6 +4142,30 @@ msgstr ""
 msgid "Enable Randplace Plugin"
 msgstr ""
 
+#: ../../addon/dwpost/dwpost.php:38
+msgid "Post to Dreamwidth"
+msgstr ""
+
+#: ../../addon/dwpost/dwpost.php:69
+msgid "Dreamwidth Post Settings"
+msgstr ""
+
+#: ../../addon/dwpost/dwpost.php:71
+msgid "Enable dreamwidth Post Plugin"
+msgstr ""
+
+#: ../../addon/dwpost/dwpost.php:76
+msgid "dreamwidth username"
+msgstr ""
+
+#: ../../addon/dwpost/dwpost.php:81
+msgid "dreamwidth password"
+msgstr ""
+
+#: ../../addon/dwpost/dwpost.php:86
+msgid "Post to dreamwidth by default"
+msgstr ""
+
 #: ../../addon/drpost/drpost.php:35
 msgid "Post to Drupal"
 msgstr ""
@@ -3979,19 +4231,19 @@ msgstr ""
 msgid "Failed"
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:294
+#: ../../addon/js_upload/js_upload.php:297
 msgid "No files were uploaded."
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:300
+#: ../../addon/js_upload/js_upload.php:303
 msgid "Uploaded file is empty"
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:323
+#: ../../addon/js_upload/js_upload.php:326
 msgid "File has an invalid extension, it should be one of "
 msgstr ""
 
-#: ../../addon/js_upload/js_upload.php:334
+#: ../../addon/js_upload/js_upload.php:337
 msgid "Upload was cancelled, or server error encountered"
 msgstr ""
 
@@ -4075,6 +4327,54 @@ msgstr ""
 msgid "blockem settings updated"
 msgstr ""
 
+#: ../../addon/qcomment/qcomment.php:51
+msgid ":-)"
+msgstr ""
+
+#: ../../addon/qcomment/qcomment.php:51
+msgid ":-("
+msgstr ""
+
+#: ../../addon/qcomment/qcomment.php:51
+msgid "lol"
+msgstr ""
+
+#: ../../addon/qcomment/qcomment.php:54
+msgid "Quick Comment Settings"
+msgstr ""
+
+#: ../../addon/qcomment/qcomment.php:56
+msgid ""
+"Quick comments are found near comment boxes, sometimes hidden. Click them to "
+"provide simple replies."
+msgstr ""
+
+#: ../../addon/qcomment/qcomment.php:57
+msgid "Enter quick comments, one per line"
+msgstr ""
+
+#: ../../addon/qcomment/qcomment.php:75
+msgid "Quick Comment settings saved."
+msgstr ""
+
+#: ../../addon/openstreetmap/openstreetmap.php:71
+msgid "Tile Server URL"
+msgstr ""
+
+#: ../../addon/openstreetmap/openstreetmap.php:71
+msgid ""
+"A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank"
+"\">public tile servers</a>"
+msgstr ""
+
+#: ../../addon/openstreetmap/openstreetmap.php:72
+msgid "Default zoom"
+msgstr ""
+
+#: ../../addon/openstreetmap/openstreetmap.php:72
+msgid "The default zoom level. (1:world, 18:highest)"
+msgstr ""
+
 #: ../../addon/editplain/editplain.php:46
 msgid "Editplain settings updated."
 msgstr ""
@@ -4099,44 +4399,44 @@ msgstr ""
 msgid "View Source"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:140
+#: ../../addon/statusnet/statusnet.php:134
 msgid "Post to StatusNet"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:182
+#: ../../addon/statusnet/statusnet.php:175
 msgid ""
 "Please contact your site administrator.<br />The provided API URL is not "
 "valid."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:210
+#: ../../addon/statusnet/statusnet.php:203
 msgid "We could not contact the StatusNet API with the Path you entered."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:236
+#: ../../addon/statusnet/statusnet.php:229
 msgid "StatusNet settings updated."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:259
+#: ../../addon/statusnet/statusnet.php:252
 msgid "StatusNet Posting Settings"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:273
+#: ../../addon/statusnet/statusnet.php:266
 msgid "Globally Available StatusNet OAuthKeys"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:274
+#: ../../addon/statusnet/statusnet.php:267
 msgid ""
 "There are preconfigured OAuth key pairs for some StatusNet servers "
 "available. If you are useing one of them, please use these credentials. If "
 "not feel free to connect to any other StatusNet instance (see below)."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:282
+#: ../../addon/statusnet/statusnet.php:275
 msgid "Provide your own OAuth Credentials"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:283
+#: ../../addon/statusnet/statusnet.php:276
 msgid ""
 "No consumer key pair for StatusNet found. Register your Friendica Account as "
 "an desktop client on your StatusNet account, copy the consumer key pair here "
@@ -4145,19 +4445,19 @@ msgid ""
 "installation at your favorited StatusNet installation."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:285
+#: ../../addon/statusnet/statusnet.php:278
 msgid "OAuth Consumer Key"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:288
+#: ../../addon/statusnet/statusnet.php:281
 msgid "OAuth Consumer Secret"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:291
+#: ../../addon/statusnet/statusnet.php:284
 msgid "Base API Path (remember the trailing /)"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:312
+#: ../../addon/statusnet/statusnet.php:305
 msgid ""
 "To connect to your StatusNet account click the button below to get a "
 "security code from StatusNet which you have to copy into the input box below "
@@ -4165,50 +4465,58 @@ msgid ""
 "to StatusNet."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:313
+#: ../../addon/statusnet/statusnet.php:306
 msgid "Log in with StatusNet"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:315
+#: ../../addon/statusnet/statusnet.php:308
 msgid "Copy the security code from StatusNet here"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:321
+#: ../../addon/statusnet/statusnet.php:314
 msgid "Cancel Connection Process"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:323
+#: ../../addon/statusnet/statusnet.php:316
 msgid "Current StatusNet API is"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:324
+#: ../../addon/statusnet/statusnet.php:317
 msgid "Cancel StatusNet Connection"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:335 ../../addon/twitter/twitter.php:189
+#: ../../addon/statusnet/statusnet.php:328 ../../addon/twitter/twitter.php:184
 msgid "Currently connected to: "
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:336
+#: ../../addon/statusnet/statusnet.php:329
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated StatusNet account. You can choose to do so by default (here) or "
 "for every posting separately in the posting options when writing the entry."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:338
+#: ../../addon/statusnet/statusnet.php:331
+msgid ""
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to StatusNet will lead the visitor to a blank page "
+"informing the visitor that the access to your profile has been restricted."
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:334
 msgid "Allow posting to StatusNet"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:341
+#: ../../addon/statusnet/statusnet.php:337
 msgid "Send public postings to StatusNet by default"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:346 ../../addon/twitter/twitter.php:200
+#: ../../addon/statusnet/statusnet.php:342 ../../addon/twitter/twitter.php:198
 msgid "Clear OAuth configuration"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:487
+#: ../../addon/statusnet/statusnet.php:524
 msgid "API URL"
 msgstr ""
 
@@ -4248,6 +4556,29 @@ msgstr ""
 msgid "How many contacts to display on profile sidebar"
 msgstr ""
 
+#: ../../addon/gnot/gnot.php:48
+msgid "Gnot settings updated."
+msgstr ""
+
+#: ../../addon/gnot/gnot.php:79
+msgid "Gnot Settings"
+msgstr ""
+
+#: ../../addon/gnot/gnot.php:81
+msgid ""
+"Allows threading of email comment notifications on Gmail and anonymising the "
+"subject line."
+msgstr ""
+
+#: ../../addon/gnot/gnot.php:82
+msgid "Enable this plugin/addon?"
+msgstr ""
+
+#: ../../addon/gnot/gnot.php:97
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%d"
+msgstr ""
+
 #: ../../addon/wppost/wppost.php:42
 msgid "Post to Wordpress"
 msgstr ""
@@ -4276,13 +4607,33 @@ msgstr ""
 msgid "Post to WordPress by default"
 msgstr ""
 
-#: ../../addon/piwik/piwik.php:70
+#: ../../addon/showmore/showmore.php:38
+msgid "\"Show more\" Settings"
+msgstr ""
+
+#: ../../addon/showmore/showmore.php:41
+msgid "Enable Show More"
+msgstr ""
+
+#: ../../addon/showmore/showmore.php:44
+msgid "Cutting posts after how much characters"
+msgstr ""
+
+#: ../../addon/showmore/showmore.php:64
+msgid "Show More Settings saved."
+msgstr ""
+
+#: ../../addon/showmore/showmore.php:86
+msgid "Show More"
+msgstr ""
+
+#: ../../addon/piwik/piwik.php:79
 msgid ""
 "This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
 "analytics tool."
 msgstr ""
 
-#: ../../addon/piwik/piwik.php:73
+#: ../../addon/piwik/piwik.php:82
 #, php-format
 msgid ""
 "If you do not want that your visits are logged this way you <a href='%s'>can "
@@ -4290,37 +4641,47 @@ msgid ""
 "(opt-out)."
 msgstr ""
 
-#: ../../addon/piwik/piwik.php:82
+#: ../../addon/piwik/piwik.php:90
 msgid "Piwik Base URL"
 msgstr ""
 
-#: ../../addon/piwik/piwik.php:83
+#: ../../addon/piwik/piwik.php:90
+msgid ""
+"Absolute path to your Piwik installation. (without protocol (http/s), with "
+"trailing slash)"
+msgstr ""
+
+#: ../../addon/piwik/piwik.php:91
 msgid "Site ID"
 msgstr ""
 
-#: ../../addon/piwik/piwik.php:84
+#: ../../addon/piwik/piwik.php:92
 msgid "Show opt-out cookie link?"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:78
+#: ../../addon/piwik/piwik.php:93
+msgid "Asynchronous tracking"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:73
 msgid "Post to Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:124
+#: ../../addon/twitter/twitter.php:119
 msgid "Twitter settings updated."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:146
+#: ../../addon/twitter/twitter.php:141
 msgid "Twitter Posting Settings"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:153
+#: ../../addon/twitter/twitter.php:148
 msgid ""
 "No consumer key pair for Twitter found. Please contact your site "
 "administrator."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:172
+#: ../../addon/twitter/twitter.php:167
 msgid ""
 "At this Friendica instance the Twitter plugin was enabled but you have not "
 "yet connected your account to your Twitter account. To do so click the "
@@ -4329,37 +4690,49 @@ msgid ""
 "be posted to Twitter."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:173
+#: ../../addon/twitter/twitter.php:168
 msgid "Log in with Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:175
+#: ../../addon/twitter/twitter.php:170
 msgid "Copy the PIN from Twitter here"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:190
+#: ../../addon/twitter/twitter.php:185
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated Twitter account. You can choose to do so by default (here) or for "
 "every posting separately in the posting options when writing the entry."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:192
+#: ../../addon/twitter/twitter.php:187
+msgid ""
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to Twitter will lead the visitor to a blank page informing "
+"the visitor that the access to your profile has been restricted."
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:190
 msgid "Allow posting to Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:195
+#: ../../addon/twitter/twitter.php:193
 msgid "Send public postings to Twitter by default"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:317
+#: ../../addon/twitter/twitter.php:357
 msgid "Consumer key"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:318
+#: ../../addon/twitter/twitter.php:358
 msgid "Consumer secret"
 msgstr ""
 
+#: ../../addon/irc/irc.php:20
+msgid "irc Chatroom"
+msgstr ""
+
 #: ../../addon/posterous/posterous.php:36
 msgid "Post to Posterous"
 msgstr ""
@@ -4384,7 +4757,23 @@ msgstr ""
 msgid "Post to Posterous by default"
 msgstr ""
 
-#: ../../include/profile_advanced.php:17 ../../boot.php:978
+#: ../../view/theme/quattro/theme.php:17
+msgid "Theme settings"
+msgstr ""
+
+#: ../../view/theme/quattro/theme.php:18
+msgid "Alignment"
+msgstr ""
+
+#: ../../view/theme/quattro/theme.php:18
+msgid "Left"
+msgstr ""
+
+#: ../../view/theme/quattro/theme.php:18
+msgid "Center"
+msgstr ""
+
+#: ../../include/profile_advanced.php:17 ../../boot.php:982
 msgid "Gender:"
 msgstr ""
 
@@ -4397,7 +4786,7 @@ msgid "j F"
 msgstr ""
 
 #: ../../include/profile_advanced.php:30 ../../include/datetime.php:438
-#: ../../include/items.php:1318
+#: ../../include/items.php:1349
 msgid "Birthday:"
 msgstr ""
 
@@ -4405,11 +4794,11 @@ msgstr ""
 msgid "Age:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:37 ../../boot.php:981
+#: ../../include/profile_advanced.php:37 ../../boot.php:985
 msgid "Status:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:45 ../../boot.php:983
+#: ../../include/profile_advanced.php:45 ../../boot.php:987
 msgid "Homepage:"
 msgstr ""
 
@@ -4745,155 +5134,171 @@ msgstr ""
 msgid "Ask me"
 msgstr ""
 
-#: ../../include/event.php:17 ../../include/bb2diaspora.php:255
+#: ../../include/event.php:17 ../../include/bb2diaspora.php:244
 msgid "Starts:"
 msgstr ""
 
-#: ../../include/event.php:27 ../../include/bb2diaspora.php:263
+#: ../../include/event.php:27 ../../include/bb2diaspora.php:252
 msgid "Finishes:"
 msgstr ""
 
-#: ../../include/delivery.php:416 ../../include/notifier.php:629
+#: ../../include/delivery.php:425 ../../include/notifier.php:638
 msgid "(no subject)"
 msgstr ""
 
-#: ../../include/delivery.php:423 ../../include/enotify.php:16
-#: ../../include/notifier.php:636
+#: ../../include/delivery.php:432 ../../include/enotify.php:17
+#: ../../include/notifier.php:645
 msgid "noreply"
 msgstr ""
 
-#: ../../include/text.php:232
+#: ../../include/text.php:238
 msgid "prev"
 msgstr ""
 
-#: ../../include/text.php:234
+#: ../../include/text.php:240
 msgid "first"
 msgstr ""
 
-#: ../../include/text.php:263
+#: ../../include/text.php:269
 msgid "last"
 msgstr ""
 
-#: ../../include/text.php:266
+#: ../../include/text.php:272
 msgid "next"
 msgstr ""
 
-#: ../../include/text.php:557
+#: ../../include/text.php:563
 msgid "No contacts"
 msgstr ""
 
-#: ../../include/text.php:566
+#: ../../include/text.php:572
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/text.php:637 ../../include/nav.php:87
+#: ../../include/text.php:643 ../../include/nav.php:87
 msgid "Search"
 msgstr ""
 
-#: ../../include/text.php:735
+#: ../../include/text.php:831
 msgid "Monday"
 msgstr ""
 
-#: ../../include/text.php:735
+#: ../../include/text.php:831
 msgid "Tuesday"
 msgstr ""
 
-#: ../../include/text.php:735
+#: ../../include/text.php:831
 msgid "Wednesday"
 msgstr ""
 
-#: ../../include/text.php:735
+#: ../../include/text.php:831
 msgid "Thursday"
 msgstr ""
 
-#: ../../include/text.php:735
+#: ../../include/text.php:831
 msgid "Friday"
 msgstr ""
 
-#: ../../include/text.php:735
+#: ../../include/text.php:831
 msgid "Saturday"
 msgstr ""
 
-#: ../../include/text.php:735
+#: ../../include/text.php:831
 msgid "Sunday"
 msgstr ""
 
-#: ../../include/text.php:739
+#: ../../include/text.php:835
 msgid "January"
 msgstr ""
 
-#: ../../include/text.php:739
+#: ../../include/text.php:835
 msgid "February"
 msgstr ""
 
-#: ../../include/text.php:739
+#: ../../include/text.php:835
 msgid "March"
 msgstr ""
 
-#: ../../include/text.php:739
+#: ../../include/text.php:835
 msgid "April"
 msgstr ""
 
-#: ../../include/text.php:739
+#: ../../include/text.php:835
 msgid "May"
 msgstr ""
 
-#: ../../include/text.php:739
+#: ../../include/text.php:835
 msgid "June"
 msgstr ""
 
-#: ../../include/text.php:739
+#: ../../include/text.php:835
 msgid "July"
 msgstr ""
 
-#: ../../include/text.php:739
+#: ../../include/text.php:835
 msgid "August"
 msgstr ""
 
-#: ../../include/text.php:739
+#: ../../include/text.php:835
 msgid "September"
 msgstr ""
 
-#: ../../include/text.php:739
+#: ../../include/text.php:835
 msgid "October"
 msgstr ""
 
-#: ../../include/text.php:739
+#: ../../include/text.php:835
 msgid "November"
 msgstr ""
 
-#: ../../include/text.php:739
+#: ../../include/text.php:835
 msgid "December"
 msgstr ""
 
-#: ../../include/text.php:809
+#: ../../include/text.php:905
 msgid "bytes"
 msgstr ""
 
-#: ../../include/text.php:901
+#: ../../include/text.php:1000
 msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/text.php:913
+#: ../../include/text.php:1012
 msgid "default"
 msgstr ""
 
+#: ../../include/text.php:1228
+msgid "activity"
+msgstr ""
+
+#: ../../include/text.php:1230
+msgid "comment"
+msgstr ""
+
+#: ../../include/text.php:1231
+msgid "post"
+msgstr ""
+
 #: ../../include/diaspora.php:570
 msgid "Sharing notification from Diaspora network"
 msgstr ""
 
-#: ../../include/diaspora.php:1895
+#: ../../include/diaspora.php:1911
 msgid "Attachments:"
 msgstr ""
 
-#: ../../include/diaspora.php:2078
+#: ../../include/diaspora.php:2094
 #, php-format
 msgid "[Relayed] Comment authored by %s from network %s"
 msgstr ""
 
+#: ../../include/network.php:814
+msgid "view full size"
+msgstr ""
+
 #: ../../include/oembed.php:128
 msgid "Embedded content"
 msgstr ""
@@ -4929,7 +5334,7 @@ msgstr ""
 msgid "Create a new group"
 msgstr ""
 
-#: ../../include/nav.php:44 ../../boot.php:705
+#: ../../include/nav.php:44 ../../boot.php:709
 msgid "Logout"
 msgstr ""
 
@@ -4937,7 +5342,7 @@ msgstr ""
 msgid "End this session"
 msgstr ""
 
-#: ../../include/nav.php:47 ../../boot.php:1327
+#: ../../include/nav.php:47 ../../boot.php:1331
 msgid "Status"
 msgstr ""
 
@@ -4949,7 +5354,7 @@ msgstr ""
 msgid "Your profile page"
 msgstr ""
 
-#: ../../include/nav.php:49 ../../boot.php:1337
+#: ../../include/nav.php:49 ../../boot.php:1341
 msgid "Photos"
 msgstr ""
 
@@ -5021,39 +5426,43 @@ msgstr ""
 msgid "See all notifications"
 msgstr ""
 
-#: ../../include/nav.php:123
+#: ../../include/nav.php:120
+msgid "Mark all system notifications seen"
+msgstr ""
+
+#: ../../include/nav.php:124
 msgid "Private mail"
 msgstr ""
 
-#: ../../include/nav.php:126
+#: ../../include/nav.php:127
 msgid "Manage"
 msgstr ""
 
-#: ../../include/nav.php:126
+#: ../../include/nav.php:127
 msgid "Manage other pages"
 msgstr ""
 
-#: ../../include/nav.php:130 ../../boot.php:936
+#: ../../include/nav.php:131 ../../boot.php:940
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/nav.php:130 ../../boot.php:936
+#: ../../include/nav.php:131 ../../boot.php:940
 msgid "Manage/edit profiles"
 msgstr ""
 
-#: ../../include/nav.php:131
+#: ../../include/nav.php:132
 msgid "Manage/edit friends and contacts"
 msgstr ""
 
-#: ../../include/nav.php:138
+#: ../../include/nav.php:139
 msgid "Admin"
 msgstr ""
 
-#: ../../include/nav.php:138
+#: ../../include/nav.php:139
 msgid "Site setup and configuration"
 msgstr ""
 
-#: ../../include/nav.php:161
+#: ../../include/nav.php:162
 msgid "Nothing new here"
 msgstr ""
 
@@ -5185,11 +5594,15 @@ msgstr ""
 msgid "%1$d %2$s ago"
 msgstr ""
 
-#: ../../include/poller.php:459
+#: ../../include/poller.php:513
 msgid "From: "
 msgstr ""
 
-#: ../../include/bbcode.php:166 ../../include/bbcode.php:225
+#: ../../include/bbcode.php:202
+msgid "$1 wrote:"
+msgstr ""
+
+#: ../../include/bbcode.php:216 ../../include/bbcode.php:282
 msgid "Image/photo"
 msgstr ""
 
@@ -5202,15 +5615,15 @@ msgstr ""
 msgid "[no subject]"
 msgstr ""
 
-#: ../../include/acl_selectors.php:279
+#: ../../include/acl_selectors.php:284
 msgid "Visible to everybody"
 msgstr ""
 
-#: ../../include/acl_selectors.php:280
+#: ../../include/acl_selectors.php:285
 msgid "show"
 msgstr ""
 
-#: ../../include/acl_selectors.php:281
+#: ../../include/acl_selectors.php:286
 msgid "don't show"
 msgstr ""
 
@@ -5227,109 +5640,191 @@ msgstr ""
 msgid "%s Administrator"
 msgstr ""
 
-#: ../../include/enotify.php:28
+#: ../../include/enotify.php:29
 #, php-format
-msgid "New mail received at %s"
+msgid "%s <!item_type!>"
 msgstr ""
 
-#: ../../include/enotify.php:30
+#: ../../include/enotify.php:33
+#, php-format
+msgid "[Friendica:Notify] New mail received at %s"
+msgstr ""
+
+#: ../../include/enotify.php:35
 #, php-format
 msgid "%s sent you a new private message at %s."
 msgstr ""
 
-#: ../../include/enotify.php:32
+#: ../../include/enotify.php:36
+#, php-format
+msgid "%s sent you %s."
+msgstr ""
+
+#: ../../include/enotify.php:36
+msgid "a private message"
+msgstr ""
+
+#: ../../include/enotify.php:37
 #, php-format
 msgid "Please visit %s to view and/or reply to your private messages."
 msgstr ""
 
-#: ../../include/enotify.php:40
+#: ../../include/enotify.php:67
 #, php-format
-msgid "%s commented on an item at %s"
+msgid "%s's"
 msgstr ""
 
-#: ../../include/enotify.php:41
+#: ../../include/enotify.php:71
+msgid "your"
+msgstr ""
+
+#: ../../include/enotify.php:78
+#, php-format
+msgid "[Friendica:Notify] Comment to conversation #%d by %s"
+msgstr ""
+
+#: ../../include/enotify.php:79
 #, php-format
 msgid "%s commented on an item/conversation you have been following."
 msgstr ""
 
-#: ../../include/enotify.php:42 ../../include/enotify.php:51
-#: ../../include/enotify.php:60 ../../include/enotify.php:69
+#: ../../include/enotify.php:80
+#, php-format
+msgid "%s commented on %s."
+msgstr ""
+
+#: ../../include/enotify.php:82 ../../include/enotify.php:95
+#: ../../include/enotify.php:106 ../../include/enotify.php:117
 #, php-format
 msgid "Please visit %s to view and/or reply to the conversation."
 msgstr ""
 
-#: ../../include/enotify.php:49
+#: ../../include/enotify.php:89
+#, php-format
+msgid "[Friendica:Notify] %s posted to your profile wall"
+msgstr ""
+
+#: ../../include/enotify.php:91
 #, php-format
 msgid "%s posted to your profile wall at %s"
 msgstr ""
 
-#: ../../include/enotify.php:58
+#: ../../include/enotify.php:93
+#, php-format
+msgid "%s posted to %s"
+msgstr ""
+
+#: ../../include/enotify.php:93
+msgid "your profile wall."
+msgstr ""
+
+#: ../../include/enotify.php:102
+#, php-format
+msgid "[Friendica:Notify] %s tagged you"
+msgstr ""
+
+#: ../../include/enotify.php:103
 #, php-format
 msgid "%s tagged you at %s"
 msgstr ""
 
-#: ../../include/enotify.php:67
+#: ../../include/enotify.php:104
+#, php-format
+msgid "%s %s."
+msgstr ""
+
+#: ../../include/enotify.php:104
+msgid "tagged you"
+msgstr ""
+
+#: ../../include/enotify.php:113
+#, php-format
+msgid "[Friendica:Notify] %s tagged your post"
+msgstr ""
+
+#: ../../include/enotify.php:114
 #, php-format
 msgid "%s tagged your post at %s"
 msgstr ""
 
-#: ../../include/enotify.php:76
+#: ../../include/enotify.php:115
 #, php-format
-msgid "Introduction received at %s"
+msgid "%s tagged %s"
+msgstr ""
+
+#: ../../include/enotify.php:115
+msgid "your post"
+msgstr ""
+
+#: ../../include/enotify.php:124
+msgid "[Friendica:Notify] Introduction received"
 msgstr ""
 
-#: ../../include/enotify.php:77
+#: ../../include/enotify.php:125
 #, php-format
 msgid "You've received an introduction from '%s' at %s"
 msgstr ""
 
-#: ../../include/enotify.php:78 ../../include/enotify.php:91
+#: ../../include/enotify.php:126
+#, php-format
+msgid "You've received %s from %s."
+msgstr ""
+
+#: ../../include/enotify.php:126
+msgid "an introduction"
+msgstr ""
+
+#: ../../include/enotify.php:127 ../../include/enotify.php:144
 #, php-format
 msgid "You may visit their profile at %s"
 msgstr ""
 
-#: ../../include/enotify.php:80
+#: ../../include/enotify.php:129
 #, php-format
 msgid "Please visit %s to approve or reject the introduction."
 msgstr ""
 
-#: ../../include/enotify.php:87
-#, php-format
-msgid "Friend suggestion received at %s"
+#: ../../include/enotify.php:136
+msgid "[Friendica:Notify] Friend suggestion received"
 msgstr ""
 
-#: ../../include/enotify.php:88
+#: ../../include/enotify.php:137
 #, php-format
 msgid "You've received a friend suggestion from '%s' at %s"
 msgstr ""
 
-#: ../../include/enotify.php:89
+#: ../../include/enotify.php:138
+#, php-format
+msgid "You've received %s for %s from %s."
+msgstr ""
+
+#: ../../include/enotify.php:139
+msgid "a friend suggestion"
+msgstr ""
+
+#: ../../include/enotify.php:142
 msgid "Name:"
 msgstr ""
 
-#: ../../include/enotify.php:90
+#: ../../include/enotify.php:143
 msgid "Photo:"
 msgstr ""
 
-#: ../../include/enotify.php:93
+#: ../../include/enotify.php:146
 #, php-format
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: ../../include/items.php:2450
+#: ../../include/items.php:2573
 msgid "A new person is sharing with you at "
 msgstr ""
 
-#: ../../include/items.php:2450
+#: ../../include/items.php:2573
 msgid "You have a new follower at "
 msgstr ""
 
-#: ../../include/bb2diaspora.php:64
-msgid "view full size"
-msgstr ""
-
-#: ../../include/bb2diaspora.php:113 ../../include/bb2diaspora.php:123
-#: ../../include/bb2diaspora.php:124
+#: ../../include/bb2diaspora.php:102 ../../include/bb2diaspora.php:112
+#: ../../include/bb2diaspora.php:113
 msgid "image/photo"
 msgstr ""
 
@@ -5345,282 +5840,282 @@ msgstr ""
 msgid "Welcome back "
 msgstr ""
 
-#: ../../include/Contact.php:131 ../../include/conversation.php:744
+#: ../../include/Contact.php:131 ../../include/conversation.php:788
 msgid "View status"
 msgstr ""
 
-#: ../../include/Contact.php:132 ../../include/conversation.php:745
+#: ../../include/Contact.php:132 ../../include/conversation.php:789
 msgid "View profile"
 msgstr ""
 
-#: ../../include/Contact.php:133 ../../include/conversation.php:746
+#: ../../include/Contact.php:133 ../../include/conversation.php:790
 msgid "View photos"
 msgstr ""
 
 #: ../../include/Contact.php:134 ../../include/Contact.php:147
-#: ../../include/conversation.php:747
+#: ../../include/conversation.php:791
 msgid "View recent"
 msgstr ""
 
 #: ../../include/Contact.php:136 ../../include/Contact.php:147
-#: ../../include/conversation.php:749
+#: ../../include/conversation.php:793
 msgid "Send PM"
 msgstr ""
 
-#: ../../include/conversation.php:141
+#: ../../include/conversation.php:163
 msgid "post/item"
 msgstr ""
 
-#: ../../include/conversation.php:142
+#: ../../include/conversation.php:164
 #, php-format
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr ""
 
-#: ../../include/conversation.php:279 ../../include/conversation.php:535
+#: ../../include/conversation.php:303 ../../include/conversation.php:572
 msgid "Select"
 msgstr ""
 
-#: ../../include/conversation.php:294 ../../include/conversation.php:623
-#: ../../include/conversation.php:624
+#: ../../include/conversation.php:320 ../../include/conversation.php:665
+#: ../../include/conversation.php:666
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""
 
-#: ../../include/conversation.php:303 ../../include/conversation.php:635
+#: ../../include/conversation.php:330 ../../include/conversation.php:677
 #, php-format
 msgid "%s from %s"
 msgstr ""
 
-#: ../../include/conversation.php:319
+#: ../../include/conversation.php:346
 msgid "View in context"
 msgstr ""
 
-#: ../../include/conversation.php:434
+#: ../../include/conversation.php:467
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/conversation.php:437 ../../boot.php:444
+#: ../../include/conversation.php:468 ../../boot.php:448
 msgid "show more"
 msgstr ""
 
-#: ../../include/conversation.php:497
+#: ../../include/conversation.php:529
 msgid "like"
 msgstr ""
 
-#: ../../include/conversation.php:498
+#: ../../include/conversation.php:530
 msgid "dislike"
 msgstr ""
 
-#: ../../include/conversation.php:500
+#: ../../include/conversation.php:532
 msgid "Share this"
 msgstr ""
 
-#: ../../include/conversation.php:500
+#: ../../include/conversation.php:532
 msgid "share"
 msgstr ""
 
-#: ../../include/conversation.php:545
+#: ../../include/conversation.php:582
 msgid "add star"
 msgstr ""
 
-#: ../../include/conversation.php:546
+#: ../../include/conversation.php:583
 msgid "remove star"
 msgstr ""
 
-#: ../../include/conversation.php:547
+#: ../../include/conversation.php:584
 msgid "toggle star status"
 msgstr ""
 
-#: ../../include/conversation.php:550
+#: ../../include/conversation.php:587
 msgid "starred"
 msgstr ""
 
-#: ../../include/conversation.php:551
+#: ../../include/conversation.php:588
 msgid "add tag"
 msgstr ""
 
-#: ../../include/conversation.php:625
+#: ../../include/conversation.php:667
 msgid "to"
 msgstr ""
 
-#: ../../include/conversation.php:626
+#: ../../include/conversation.php:668
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../include/conversation.php:627
+#: ../../include/conversation.php:669
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../include/conversation.php:669
+#: ../../include/conversation.php:713
 msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/conversation.php:801
+#: ../../include/conversation.php:845
 #, php-format
 msgid "%s likes this."
 msgstr ""
 
-#: ../../include/conversation.php:801
+#: ../../include/conversation.php:845
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/conversation.php:805
+#: ../../include/conversation.php:849
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""
 
-#: ../../include/conversation.php:807
+#: ../../include/conversation.php:851
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:813
+#: ../../include/conversation.php:857
 msgid "and"
 msgstr ""
 
-#: ../../include/conversation.php:816
+#: ../../include/conversation.php:860
 #, php-format
 msgid ", and %d other people"
 msgstr ""
 
-#: ../../include/conversation.php:817
+#: ../../include/conversation.php:861
 #, php-format
 msgid "%s like this."
 msgstr ""
 
-#: ../../include/conversation.php:817
+#: ../../include/conversation.php:861
 #, php-format
 msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/conversation.php:842
+#: ../../include/conversation.php:886
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: ../../include/conversation.php:844
+#: ../../include/conversation.php:888
 msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:845
+#: ../../include/conversation.php:889
 msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../include/conversation.php:846
+#: ../../include/conversation.php:890
 msgid "Tag term:"
 msgstr ""
 
-#: ../../include/conversation.php:847
+#: ../../include/conversation.php:891
 msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/conversation.php:848
+#: ../../include/conversation.php:892
 msgid "Enter a title for this item"
 msgstr ""
 
-#: ../../include/conversation.php:891
+#: ../../include/conversation.php:935
 msgid "upload photo"
 msgstr ""
 
-#: ../../include/conversation.php:893
+#: ../../include/conversation.php:937
 msgid "attach file"
 msgstr ""
 
-#: ../../include/conversation.php:895
+#: ../../include/conversation.php:939
 msgid "web link"
 msgstr ""
 
-#: ../../include/conversation.php:896
+#: ../../include/conversation.php:940
 msgid "Insert video link"
 msgstr ""
 
-#: ../../include/conversation.php:897
+#: ../../include/conversation.php:941
 msgid "video link"
 msgstr ""
 
-#: ../../include/conversation.php:898
+#: ../../include/conversation.php:942
 msgid "Insert audio link"
 msgstr ""
 
-#: ../../include/conversation.php:899
+#: ../../include/conversation.php:943
 msgid "audio link"
 msgstr ""
 
-#: ../../include/conversation.php:901
+#: ../../include/conversation.php:945
 msgid "set location"
 msgstr ""
 
-#: ../../include/conversation.php:903
+#: ../../include/conversation.php:947
 msgid "clear location"
 msgstr ""
 
-#: ../../include/conversation.php:908
+#: ../../include/conversation.php:952
 msgid "permissions"
 msgstr ""
 
-#: ../../boot.php:442
+#: ../../boot.php:446
 msgid "Delete this item?"
 msgstr ""
 
-#: ../../boot.php:445
+#: ../../boot.php:449
 msgid "show fewer"
 msgstr ""
 
-#: ../../boot.php:688
+#: ../../boot.php:692
 msgid "Create a New Account"
 msgstr ""
 
-#: ../../boot.php:708
+#: ../../boot.php:712
 msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../boot.php:709
+#: ../../boot.php:713
 msgid "Password: "
 msgstr ""
 
-#: ../../boot.php:712
+#: ../../boot.php:716
 msgid "Or login using OpenID: "
 msgstr ""
 
-#: ../../boot.php:718
+#: ../../boot.php:722
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:875
+#: ../../boot.php:879
 msgid "Edit profile"
 msgstr ""
 
-#: ../../boot.php:1042 ../../boot.php:1113
+#: ../../boot.php:1046 ../../boot.php:1117
 msgid "g A l F d"
 msgstr ""
 
-#: ../../boot.php:1043 ../../boot.php:1114
+#: ../../boot.php:1047 ../../boot.php:1118
 msgid "F d"
 msgstr ""
 
-#: ../../boot.php:1068
+#: ../../boot.php:1072
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../boot.php:1069
+#: ../../boot.php:1073
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../boot.php:1092 ../../boot.php:1156
+#: ../../boot.php:1096 ../../boot.php:1160
 msgid "[today]"
 msgstr ""
 
-#: ../../boot.php:1137
+#: ../../boot.php:1141
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../boot.php:1138
+#: ../../boot.php:1142
 msgid "Events this week:"
 msgstr ""
 
-#: ../../boot.php:1150
+#: ../../boot.php:1154
 msgid "[No description]"
 msgstr ""