Merge branch 'master' of git://github.com/friendica/friendica

2 files changed, 661 insertions, 438 deletions

diff --git a/util/messages.po b/util/messages.po
index 43368ced0..1a30447b9 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1363\n"
+"Project-Id-Version: 3.0.1370\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-03 10:00-0700\n"
+"POT-Creation-Date: 2012-06-10 10:00-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -36,9 +36,9 @@ msgstr ""
 
 #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44
 #: ../../mod/fsuggest.php:78 ../../mod/events.php:138 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:920
+#: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:928
 #: ../../mod/editpost.php:10 ../../mod/install.php:151
-#: ../../mod/notifications.php:66 ../../mod/contacts.php:125
+#: ../../mod/notifications.php:66 ../../mod/contacts.php:145
 #: ../../mod/settings.php:106 ../../mod/settings.php:537
 #: ../../mod/settings.php:542 ../../mod/manage.php:86 ../../mod/network.php:6
 #: ../../mod/notes.php:20 ../../mod/wallmessage.php:9
@@ -47,15 +47,16 @@ msgstr ""
 #: ../../mod/group.php:19 ../../mod/viewcontacts.php:22
 #: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:124
 #: ../../mod/item.php:140 ../../mod/profile_photo.php:19
-#: ../../mod/profile_photo.php:139 ../../mod/profile_photo.php:150
-#: ../../mod/profile_photo.php:163 ../../mod/message.php:44
-#: ../../mod/message.php:96 ../../mod/allfriends.php:9
+#: ../../mod/profile_photo.php:141 ../../mod/profile_photo.php:152
+#: ../../mod/profile_photo.php:165 ../../mod/message.php:45
+#: ../../mod/message.php:97 ../../mod/allfriends.php:9
 #: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53
 #: ../../mod/follow.php:9 ../../mod/display.php:138 ../../mod/profiles.php:7
 #: ../../mod/profiles.php:385 ../../mod/delegate.php:6
 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:503
-#: ../../include/items.php:3297 ../../index.php:306
+#: ../../addon/dav/layout.fnk.php:387 ../../include/items.php:3342
+#: ../../index.php:306
 msgid "Permission denied."
 msgstr ""
 
@@ -85,7 +86,7 @@ msgid "Return to contact editor"
 msgstr ""
 
 #: ../../mod/crepair.php:148 ../../mod/settings.php:557
-#: ../../mod/settings.php:583 ../../mod/admin.php:656 ../../mod/admin.php:665
+#: ../../mod/settings.php:583 ../../mod/admin.php:659 ../../mod/admin.php:668
 msgid "Name"
 msgstr ""
 
@@ -122,17 +123,18 @@ msgid "New photo from this URL"
 msgstr ""
 
 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
-#: ../../mod/events.php:428 ../../mod/photos.php:955 ../../mod/photos.php:1013
-#: ../../mod/photos.php:1256 ../../mod/photos.php:1296
-#: ../../mod/photos.php:1336 ../../mod/photos.php:1367
+#: ../../mod/events.php:428 ../../mod/photos.php:963 ../../mod/photos.php:1021
+#: ../../mod/photos.php:1266 ../../mod/photos.php:1306
+#: ../../mod/photos.php:1346 ../../mod/photos.php:1377
 #: ../../mod/install.php:246 ../../mod/install.php:284
-#: ../../mod/localtime.php:45 ../../mod/contacts.php:322
+#: ../../mod/localtime.php:45 ../../mod/contacts.php:342
 #: ../../mod/settings.php:555 ../../mod/settings.php:701
 #: ../../mod/settings.php:762 ../../mod/settings.php:969
-#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:417
-#: ../../mod/admin.php:653 ../../mod/admin.php:789 ../../mod/admin.php:988
-#: ../../mod/admin.php:1075 ../../mod/profiles.php:554
+#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/message.php:216
+#: ../../mod/admin.php:420 ../../mod/admin.php:656 ../../mod/admin.php:792
+#: ../../mod/admin.php:991 ../../mod/admin.php:1078 ../../mod/profiles.php:554
 #: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:605
+#: ../../addon/snautofollow/snautofollow.php:64
 #: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93
 #: ../../addon/nsfw/nsfw.php:57 ../../addon/planets/planets.php:158
 #: ../../addon/uhremotestorage/uhremotestorage.php:89
@@ -142,8 +144,9 @@ msgstr ""
 #: ../../addon/impressum/impressum.php:82 ../../addon/blockem/blockem.php:57
 #: ../../addon/qcomment/qcomment.php:61
 #: ../../addon/openstreetmap/openstreetmap.php:70
-#: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84
-#: ../../addon/blackout/blackout.php:98 ../../addon/gravatar/gravatar.php:86
+#: ../../addon/libertree/libertree.php:90 ../../addon/mathjax/mathjax.php:42
+#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:98
+#: ../../addon/gravatar/gravatar.php:86
 #: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93
 #: ../../addon/jappixmini/jappixmini.php:302
 #: ../../addon/statusnet/statusnet.php:278
@@ -153,7 +156,7 @@ msgstr ""
 #: ../../addon/statusnet/statusnet.php:353
 #: ../../addon/statusnet/statusnet.php:561 ../../addon/tumblr/tumblr.php:90
 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88
-#: ../../addon/wppost/wppost.php:109 ../../addon/showmore/showmore.php:48
+#: ../../addon/wppost/wppost.php:110 ../../addon/showmore/showmore.php:48
 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180
 #: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:381
 #: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102
@@ -170,7 +173,8 @@ msgstr ""
 msgid "Help:"
 msgstr ""
 
-#: ../../mod/help.php:34 ../../include/nav.php:86
+#: ../../mod/help.php:34 ../../addon/dav/layout.fnk.php:112
+#: ../../include/nav.php:86
 msgid "Help"
 msgstr ""
 
@@ -221,7 +225,7 @@ msgid "link to source"
 msgstr ""
 
 #: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:131
-#: ../../include/nav.php:52 ../../boot.php:1520
+#: ../../include/nav.php:52 ../../boot.php:1525
 msgid "Events"
 msgstr ""
 
@@ -229,11 +233,12 @@ msgstr ""
 msgid "Create New Event"
 msgstr ""
 
-#: ../../mod/events.php:326
+#: ../../mod/events.php:326 ../../addon/dav/layout.fnk.php:147
 msgid "Previous"
 msgstr ""
 
 #: ../../mod/events.php:327 ../../mod/install.php:205
+#: ../../addon/dav/layout.fnk.php:150
 msgid "Next"
 msgstr ""
 
@@ -271,7 +276,7 @@ msgid "Description:"
 msgstr ""
 
 #: ../../mod/events.php:423 ../../include/event.php:37
-#: ../../include/bb2diaspora.php:265 ../../boot.php:1100
+#: ../../include/bb2diaspora.php:265 ../../boot.php:1105
 msgid "Location:"
 msgstr ""
 
@@ -348,231 +353,231 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: ../../mod/photos.php:43 ../../boot.php:1514
+#: ../../mod/photos.php:44 ../../boot.php:1519
 msgid "Photo Albums"
 msgstr ""
 
-#: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:934
-#: ../../mod/photos.php:1005 ../../mod/photos.php:1020
-#: ../../mod/photos.php:1445 ../../mod/photos.php:1457
+#: ../../mod/photos.php:52 ../../mod/photos.php:154 ../../mod/photos.php:942
+#: ../../mod/photos.php:1013 ../../mod/photos.php:1028
+#: ../../mod/photos.php:1455 ../../mod/photos.php:1467
 #: ../../addon/communityhome/communityhome.php:110
 #: ../../view/theme/diabook/theme.php:598
 msgid "Contact Photos"
 msgstr ""
 
-#: ../../mod/photos.php:58 ../../mod/photos.php:1030 ../../mod/photos.php:1494
+#: ../../mod/photos.php:59 ../../mod/photos.php:1038 ../../mod/photos.php:1505
 msgid "Upload New Photos"
 msgstr ""
 
-#: ../../mod/photos.php:69 ../../mod/settings.php:21
+#: ../../mod/photos.php:70 ../../mod/settings.php:21
 msgid "everybody"
 msgstr ""
 
-#: ../../mod/photos.php:140
+#: ../../mod/photos.php:143
 msgid "Contact information unavailable"
 msgstr ""
 
-#: ../../mod/photos.php:151 ../../mod/photos.php:652 ../../mod/photos.php:1005
-#: ../../mod/photos.php:1020 ../../mod/profile_photo.php:60
+#: ../../mod/photos.php:154 ../../mod/photos.php:656 ../../mod/photos.php:1013
+#: ../../mod/photos.php:1028 ../../mod/profile_photo.php:60
 #: ../../mod/profile_photo.php:67 ../../mod/profile_photo.php:74
-#: ../../mod/profile_photo.php:174 ../../mod/profile_photo.php:252
-#: ../../mod/profile_photo.php:261
+#: ../../mod/profile_photo.php:176 ../../mod/profile_photo.php:254
+#: ../../mod/profile_photo.php:263
 #: ../../addon/communityhome/communityhome.php:111
-#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:294
-#: ../../include/user.php:301 ../../include/user.php:308
+#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:298
+#: ../../include/user.php:305 ../../include/user.php:312
 msgid "Profile Photos"
 msgstr ""
 
-#: ../../mod/photos.php:161
+#: ../../mod/photos.php:164
 msgid "Album not found."
 msgstr ""
 
-#: ../../mod/photos.php:179 ../../mod/photos.php:1014
+#: ../../mod/photos.php:182 ../../mod/photos.php:1022
 msgid "Delete Album"
 msgstr ""
 
-#: ../../mod/photos.php:242 ../../mod/photos.php:1257
+#: ../../mod/photos.php:245 ../../mod/photos.php:1267
 msgid "Delete Photo"
 msgstr ""
 
-#: ../../mod/photos.php:583
+#: ../../mod/photos.php:587
 msgid "was tagged in a"
 msgstr ""
 
-#: ../../mod/photos.php:583 ../../mod/like.php:127 ../../mod/tagger.php:70
+#: ../../mod/photos.php:587 ../../mod/like.php:185 ../../mod/tagger.php:70
 #: ../../addon/communityhome/communityhome.php:163
 #: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1316
-#: ../../include/diaspora.php:1662 ../../include/conversation.php:53
+#: ../../include/diaspora.php:1671 ../../include/conversation.php:53
 #: ../../include/conversation.php:126
 msgid "photo"
 msgstr ""
 
-#: ../../mod/photos.php:583
+#: ../../mod/photos.php:587
 msgid "by"
 msgstr ""
 
-#: ../../mod/photos.php:686 ../../addon/js_upload/js_upload.php:315
+#: ../../mod/photos.php:692 ../../addon/js_upload/js_upload.php:315
 msgid "Image exceeds size limit of "
 msgstr ""
 
-#: ../../mod/photos.php:694
+#: ../../mod/photos.php:700
 msgid "Image file is empty."
 msgstr ""
 
-#: ../../mod/photos.php:708 ../../mod/profile_photo.php:124
-#: ../../mod/wall_upload.php:83
+#: ../../mod/photos.php:714 ../../mod/profile_photo.php:126
+#: ../../mod/wall_upload.php:86
 msgid "Unable to process image."
 msgstr ""
 
-#: ../../mod/photos.php:728 ../../mod/profile_photo.php:257
-#: ../../mod/wall_upload.php:102
+#: ../../mod/photos.php:734 ../../mod/profile_photo.php:259
+#: ../../mod/wall_upload.php:105
 msgid "Image upload failed."
 msgstr ""
 
-#: ../../mod/photos.php:814 ../../mod/community.php:16
+#: ../../mod/photos.php:820 ../../mod/community.php:16
 #: ../../mod/dfrn_request.php:744 ../../mod/viewcontacts.php:17
 #: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29
 msgid "Public access denied."
 msgstr ""
 
-#: ../../mod/photos.php:824
+#: ../../mod/photos.php:830
 msgid "No photos selected"
 msgstr ""
 
-#: ../../mod/photos.php:901
+#: ../../mod/photos.php:909
 msgid "Access to this item is restricted."
 msgstr ""
 
-#: ../../mod/photos.php:962
+#: ../../mod/photos.php:970
 msgid "Upload Photos"
 msgstr ""
 
-#: ../../mod/photos.php:965 ../../mod/photos.php:1009
+#: ../../mod/photos.php:973 ../../mod/photos.php:1017
 msgid "New album name: "
 msgstr ""
 
-#: ../../mod/photos.php:966
+#: ../../mod/photos.php:974
 msgid "or existing album name: "
 msgstr ""
 
-#: ../../mod/photos.php:967
+#: ../../mod/photos.php:975
 msgid "Do not show a status post for this upload"
 msgstr ""
 
-#: ../../mod/photos.php:969 ../../mod/photos.php:1252
+#: ../../mod/photos.php:977 ../../mod/photos.php:1262
 msgid "Permissions"
 msgstr ""
 
-#: ../../mod/photos.php:1024
+#: ../../mod/photos.php:1032
 msgid "Edit Album"
 msgstr ""
 
-#: ../../mod/photos.php:1046 ../../mod/photos.php:1477
+#: ../../mod/photos.php:1056 ../../mod/photos.php:1488
 msgid "View Photo"
 msgstr ""
 
-#: ../../mod/photos.php:1081
+#: ../../mod/photos.php:1091
 msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: ../../mod/photos.php:1083
+#: ../../mod/photos.php:1093
 msgid "Photo not available"
 msgstr ""
 
-#: ../../mod/photos.php:1133
+#: ../../mod/photos.php:1143
 msgid "View photo"
 msgstr ""
 
-#: ../../mod/photos.php:1133
+#: ../../mod/photos.php:1143
 msgid "Edit photo"
 msgstr ""
 
-#: ../../mod/photos.php:1134
+#: ../../mod/photos.php:1144
 msgid "Use as profile photo"
 msgstr ""
 
-#: ../../mod/photos.php:1140 ../../include/conversation.php:490
+#: ../../mod/photos.php:1150 ../../include/conversation.php:490
 msgid "Private Message"
 msgstr ""
 
-#: ../../mod/photos.php:1162
+#: ../../mod/photos.php:1172
 msgid "View Full Size"
 msgstr ""
 
-#: ../../mod/photos.php:1230
+#: ../../mod/photos.php:1240
 msgid "Tags: "
 msgstr ""
 
-#: ../../mod/photos.php:1233
+#: ../../mod/photos.php:1243
 msgid "[Remove any tag]"
 msgstr ""
 
-#: ../../mod/photos.php:1243
+#: ../../mod/photos.php:1253
 msgid "Rotate CW"
 msgstr ""
 
-#: ../../mod/photos.php:1245
+#: ../../mod/photos.php:1255
 msgid "New album name"
 msgstr ""
 
-#: ../../mod/photos.php:1248
+#: ../../mod/photos.php:1258
 msgid "Caption"
 msgstr ""
 
-#: ../../mod/photos.php:1250
+#: ../../mod/photos.php:1260
 msgid "Add a Tag"
 msgstr ""
 
-#: ../../mod/photos.php:1254
+#: ../../mod/photos.php:1264
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: ../../mod/photos.php:1274 ../../include/conversation.php:554
+#: ../../mod/photos.php:1284 ../../include/conversation.php:554
 msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1275 ../../include/conversation.php:555
+#: ../../mod/photos.php:1285 ../../include/conversation.php:555
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../mod/photos.php:1276 ../../include/conversation.php:989
+#: ../../mod/photos.php:1286 ../../include/conversation.php:989
 msgid "Share"
 msgstr ""
 
-#: ../../mod/photos.php:1277 ../../mod/editpost.php:104
-#: ../../mod/wallmessage.php:145 ../../mod/message.php:214
-#: ../../mod/message.php:408 ../../include/conversation.php:371
+#: ../../mod/photos.php:1287 ../../mod/editpost.php:104
+#: ../../mod/wallmessage.php:145 ../../mod/message.php:215
+#: ../../mod/message.php:410 ../../include/conversation.php:371
 #: ../../include/conversation.php:731 ../../include/conversation.php:1008
 msgid "Please wait"
 msgstr ""
 
-#: ../../mod/photos.php:1293 ../../mod/photos.php:1333
-#: ../../mod/photos.php:1364 ../../include/conversation.php:577
+#: ../../mod/photos.php:1303 ../../mod/photos.php:1343
+#: ../../mod/photos.php:1374 ../../include/conversation.php:577
 msgid "This is you"
 msgstr ""
 
-#: ../../mod/photos.php:1295 ../../mod/photos.php:1335
-#: ../../mod/photos.php:1366 ../../include/conversation.php:579
-#: ../../boot.php:514
+#: ../../mod/photos.php:1305 ../../mod/photos.php:1345
+#: ../../mod/photos.php:1376 ../../include/conversation.php:579
+#: ../../boot.php:519
 msgid "Comment"
 msgstr ""
 
-#: ../../mod/photos.php:1297 ../../mod/editpost.php:125
+#: ../../mod/photos.php:1307 ../../mod/editpost.php:125
 #: ../../include/conversation.php:589 ../../include/conversation.php:1026
 msgid "Preview"
 msgstr ""
 
-#: ../../mod/photos.php:1394 ../../mod/settings.php:618
-#: ../../mod/settings.php:699 ../../mod/group.php:168 ../../mod/admin.php:660
+#: ../../mod/photos.php:1404 ../../mod/settings.php:618
+#: ../../mod/settings.php:699 ../../mod/group.php:168 ../../mod/admin.php:663
 #: ../../include/conversation.php:328 ../../include/conversation.php:609
 msgid "Delete"
 msgstr ""
 
-#: ../../mod/photos.php:1483
+#: ../../mod/photos.php:1494
 msgid "View Album"
 msgstr ""
 
-#: ../../mod/photos.php:1492
+#: ../../mod/photos.php:1503
 msgid "Recent Photos"
 msgstr ""
 
@@ -639,7 +644,7 @@ msgid "Edit"
 msgstr ""
 
 #: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143
-#: ../../mod/message.php:212 ../../mod/message.php:406
+#: ../../mod/message.php:213 ../../mod/message.php:408
 #: ../../include/conversation.php:990
 msgid "Upload photo"
 msgstr ""
@@ -649,7 +654,7 @@ msgid "Attach file"
 msgstr ""
 
 #: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144
-#: ../../mod/message.php:213 ../../mod/message.php:407
+#: ../../mod/message.php:214 ../../mod/message.php:409
 #: ../../include/conversation.php:994
 msgid "Insert web link"
 msgstr ""
@@ -779,7 +784,7 @@ msgstr ""
 msgid "Disallowed profile URL."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:555 ../../mod/contacts.php:102
+#: ../../mod/dfrn_request.php:555 ../../mod/contacts.php:122
 msgid "Failed to update contact record."
 msgstr ""
 
@@ -815,7 +820,7 @@ msgstr ""
 msgid "Confirm"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:700 ../../include/items.php:2733
+#: ../../mod/dfrn_request.php:700 ../../include/items.php:2738
 msgid "[Name Withheld]"
 msgstr ""
 
@@ -1187,7 +1192,7 @@ msgid "is interested in:"
 msgstr ""
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1044
+#: ../../include/contact_widgets.php:9 ../../boot.php:1049
 msgid "Connect"
 msgstr ""
 
@@ -1218,8 +1223,8 @@ msgid "Discard"
 msgstr ""
 
 #: ../../mod/notifications.php:51 ../../mod/notifications.php:160
-#: ../../mod/notifications.php:206 ../../mod/contacts.php:296
-#: ../../mod/contacts.php:348
+#: ../../mod/notifications.php:206 ../../mod/contacts.php:316
+#: ../../mod/contacts.php:368
 msgid "Ignore"
 msgstr ""
 
@@ -1244,7 +1249,7 @@ msgstr ""
 msgid "Introductions"
 msgstr ""
 
-#: ../../mod/notifications.php:100 ../../mod/message.php:104
+#: ../../mod/notifications.php:100 ../../mod/message.php:105
 #: ../../include/nav.php:128
 msgid "Messages"
 msgstr ""
@@ -1271,7 +1276,7 @@ msgid "suggested by %s"
 msgstr ""
 
 #: ../../mod/notifications.php:153 ../../mod/notifications.php:200
-#: ../../mod/contacts.php:354
+#: ../../mod/contacts.php:374
 msgid "Hide this contact from others"
 msgstr ""
 
@@ -1284,7 +1289,7 @@ msgid "if applicable"
 msgstr ""
 
 #: ../../mod/notifications.php:157 ../../mod/notifications.php:204
-#: ../../mod/admin.php:658
+#: ../../mod/admin.php:661
 msgid "Approve"
 msgstr ""
 
@@ -1393,303 +1398,303 @@ msgstr ""
 msgid "Home Notifications"
 msgstr ""
 
-#: ../../mod/contacts.php:63 ../../mod/contacts.php:143
+#: ../../mod/contacts.php:83 ../../mod/contacts.php:163
 msgid "Could not access contact record."
 msgstr ""
 
-#: ../../mod/contacts.php:77
+#: ../../mod/contacts.php:97
 msgid "Could not locate selected profile."
 msgstr ""
 
-#: ../../mod/contacts.php:100
+#: ../../mod/contacts.php:120
 msgid "Contact updated."
 msgstr ""
 
-#: ../../mod/contacts.php:165
+#: ../../mod/contacts.php:185
 msgid "Contact has been blocked"
 msgstr ""
 
-#: ../../mod/contacts.php:165
+#: ../../mod/contacts.php:185
 msgid "Contact has been unblocked"
 msgstr ""
 
-#: ../../mod/contacts.php:179
+#: ../../mod/contacts.php:199
 msgid "Contact has been ignored"
 msgstr ""
 
-#: ../../mod/contacts.php:179
+#: ../../mod/contacts.php:199
 msgid "Contact has been unignored"
 msgstr ""
 
-#: ../../mod/contacts.php:195
+#: ../../mod/contacts.php:215
 msgid "Contact has been archived"
 msgstr ""
 
-#: ../../mod/contacts.php:195
+#: ../../mod/contacts.php:215
 msgid "Contact has been unarchived"
 msgstr ""
 
-#: ../../mod/contacts.php:208
+#: ../../mod/contacts.php:228
 msgid "Contact has been removed."
 msgstr ""
 
-#: ../../mod/contacts.php:238
+#: ../../mod/contacts.php:258
 #, php-format
 msgid "You are mutual friends with %s"
 msgstr ""
 
-#: ../../mod/contacts.php:242
+#: ../../mod/contacts.php:262
 #, php-format
 msgid "You are sharing with %s"
 msgstr ""
 
-#: ../../mod/contacts.php:247
+#: ../../mod/contacts.php:267
 #, php-format
 msgid "%s is sharing with you"
 msgstr ""
 
-#: ../../mod/contacts.php:264
+#: ../../mod/contacts.php:284
 msgid "Private communications are not available for this contact."
 msgstr ""
 
-#: ../../mod/contacts.php:267
+#: ../../mod/contacts.php:287
 msgid "Never"
 msgstr ""
 
-#: ../../mod/contacts.php:271
+#: ../../mod/contacts.php:291
 msgid "(Update was successful)"
 msgstr ""
 
-#: ../../mod/contacts.php:271
+#: ../../mod/contacts.php:291
 msgid "(Update was not successful)"
 msgstr ""
 
-#: ../../mod/contacts.php:273
+#: ../../mod/contacts.php:293
 msgid "Suggest friends"
 msgstr ""
 
-#: ../../mod/contacts.php:277
+#: ../../mod/contacts.php:297
 #, php-format
 msgid "Network type: %s"
 msgstr ""
 
-#: ../../mod/contacts.php:280 ../../include/contact_widgets.php:183
+#: ../../mod/contacts.php:300 ../../include/contact_widgets.php:183
 #, php-format
 msgid "%d contact in common"
 msgid_plural "%d contacts in common"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/contacts.php:285
+#: ../../mod/contacts.php:305
 msgid "View all contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:290 ../../mod/contacts.php:347
-#: ../../mod/admin.php:662
+#: ../../mod/contacts.php:310 ../../mod/contacts.php:367
+#: ../../mod/admin.php:665
 msgid "Unblock"
 msgstr ""
 
-#: ../../mod/contacts.php:290 ../../mod/contacts.php:347
-#: ../../mod/admin.php:661
+#: ../../mod/contacts.php:310 ../../mod/contacts.php:367
+#: ../../mod/admin.php:664
 msgid "Block"
 msgstr ""
 
-#: ../../mod/contacts.php:293
+#: ../../mod/contacts.php:313
 msgid "Toggle Blocked status"
 msgstr ""
 
-#: ../../mod/contacts.php:296 ../../mod/contacts.php:348
+#: ../../mod/contacts.php:316 ../../mod/contacts.php:368
 msgid "Unignore"
 msgstr ""
 
-#: ../../mod/contacts.php:299
+#: ../../mod/contacts.php:319
 msgid "Toggle Ignored status"
 msgstr ""
 
-#: ../../mod/contacts.php:303
+#: ../../mod/contacts.php:323
 msgid "Unarchive"
 msgstr ""
 
-#: ../../mod/contacts.php:303
+#: ../../mod/contacts.php:323
 msgid "Archive"
 msgstr ""
 
-#: ../../mod/contacts.php:306
+#: ../../mod/contacts.php:326
 msgid "Toggle Archive status"
 msgstr ""
 
-#: ../../mod/contacts.php:309
+#: ../../mod/contacts.php:329
 msgid "Repair"
 msgstr ""
 
-#: ../../mod/contacts.php:312
+#: ../../mod/contacts.php:332
 msgid "Advanced Contact Settings"
 msgstr ""
 
-#: ../../mod/contacts.php:320
+#: ../../mod/contacts.php:340
 msgid "Contact Editor"
 msgstr ""
 
-#: ../../mod/contacts.php:323
+#: ../../mod/contacts.php:343
 msgid "Profile Visibility"
 msgstr ""
 
-#: ../../mod/contacts.php:324
+#: ../../mod/contacts.php:344
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr ""
 
-#: ../../mod/contacts.php:325
+#: ../../mod/contacts.php:345
 msgid "Contact Information / Notes"
 msgstr ""
 
-#: ../../mod/contacts.php:326
+#: ../../mod/contacts.php:346
 msgid "Edit contact notes"
 msgstr ""
 
-#: ../../mod/contacts.php:331 ../../mod/contacts.php:522
+#: ../../mod/contacts.php:351 ../../mod/contacts.php:542
 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr ""
 
-#: ../../mod/contacts.php:332
+#: ../../mod/contacts.php:352
 msgid "Block/Unblock contact"
 msgstr ""
 
-#: ../../mod/contacts.php:333
+#: ../../mod/contacts.php:353
 msgid "Ignore contact"
 msgstr ""
 
-#: ../../mod/contacts.php:334
+#: ../../mod/contacts.php:354
 msgid "Repair URL settings"
 msgstr ""
 
-#: ../../mod/contacts.php:335
+#: ../../mod/contacts.php:355
 msgid "View conversations"
 msgstr ""
 
-#: ../../mod/contacts.php:337
+#: ../../mod/contacts.php:357
 msgid "Delete contact"
 msgstr ""
 
-#: ../../mod/contacts.php:341
+#: ../../mod/contacts.php:361
 msgid "Last update:"
 msgstr ""
 
-#: ../../mod/contacts.php:342
+#: ../../mod/contacts.php:362
 msgid "Update public posts"
 msgstr ""
 
-#: ../../mod/contacts.php:344 ../../mod/admin.php:1133
+#: ../../mod/contacts.php:364 ../../mod/admin.php:1136
 msgid "Update now"
 msgstr ""
 
-#: ../../mod/contacts.php:351
+#: ../../mod/contacts.php:371
 msgid "Currently blocked"
 msgstr ""
 
-#: ../../mod/contacts.php:352
+#: ../../mod/contacts.php:372
 msgid "Currently ignored"
 msgstr ""
 
-#: ../../mod/contacts.php:353
+#: ../../mod/contacts.php:373
 msgid "Currently archived"
 msgstr ""
 
-#: ../../mod/contacts.php:354
+#: ../../mod/contacts.php:374
 msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr ""
 
-#: ../../mod/contacts.php:407
+#: ../../mod/contacts.php:427
 msgid "Suggestions"
 msgstr ""
 
-#: ../../mod/contacts.php:410
+#: ../../mod/contacts.php:430
 msgid "Suggest potential friends"
 msgstr ""
 
-#: ../../mod/contacts.php:413 ../../mod/group.php:191
+#: ../../mod/contacts.php:433 ../../mod/group.php:191
 msgid "All Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:416
+#: ../../mod/contacts.php:436
 msgid "Show all contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:419
+#: ../../mod/contacts.php:439
 msgid "Unblocked"
 msgstr ""
 
-#: ../../mod/contacts.php:422
+#: ../../mod/contacts.php:442
 msgid "Only show unblocked contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:426
+#: ../../mod/contacts.php:446
 msgid "Blocked"
 msgstr ""
 
-#: ../../mod/contacts.php:429
+#: ../../mod/contacts.php:449
 msgid "Only show blocked contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:433
+#: ../../mod/contacts.php:453
 msgid "Ignored"
 msgstr ""
 
-#: ../../mod/contacts.php:436
+#: ../../mod/contacts.php:456
 msgid "Only show ignored contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:440
+#: ../../mod/contacts.php:460
 msgid "Archived"
 msgstr ""
 
-#: ../../mod/contacts.php:443
+#: ../../mod/contacts.php:463
 msgid "Only show archived contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:447
+#: ../../mod/contacts.php:467
 msgid "Hidden"
 msgstr ""
 
-#: ../../mod/contacts.php:450
+#: ../../mod/contacts.php:470
 msgid "Only show hidden contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:498
+#: ../../mod/contacts.php:518
 msgid "Mutual Friendship"
 msgstr ""
 
-#: ../../mod/contacts.php:502
+#: ../../mod/contacts.php:522
 msgid "is a fan of yours"
 msgstr ""
 
-#: ../../mod/contacts.php:506
+#: ../../mod/contacts.php:526
 msgid "you are a fan of"
 msgstr ""
 
-#: ../../mod/contacts.php:523 ../../mod/nogroup.php:41
+#: ../../mod/contacts.php:543 ../../mod/nogroup.php:41
 msgid "Edit contact"
 msgstr ""
 
-#: ../../mod/contacts.php:544 ../../view/theme/diabook/theme.php:129
+#: ../../mod/contacts.php:564 ../../view/theme/diabook/theme.php:129
 #: ../../include/nav.php:139
 msgid "Contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:548
+#: ../../mod/contacts.php:568
 msgid "Search your contacts"
 msgstr ""
 
-#: ../../mod/contacts.php:549 ../../mod/directory.php:57
+#: ../../mod/contacts.php:569 ../../mod/directory.php:57
 msgid "Finding: "
 msgstr ""
 
-#: ../../mod/contacts.php:550 ../../mod/directory.php:59
+#: ../../mod/contacts.php:570 ../../mod/directory.php:59
 #: ../../include/contact_widgets.php:33
 msgid "Find"
 msgstr ""
@@ -1713,8 +1718,8 @@ msgstr ""
 #: ../../addon/facebook/facebook.php:688
 #: ../../addon/facebook/facebook.php:1178
 #: ../../addon/public_server/public_server.php:62
-#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2742
-#: ../../boot.php:694
+#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2747
+#: ../../boot.php:699
 msgid "Administrator"
 msgstr ""
 
@@ -1724,7 +1729,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:83 ../../boot.php:826
+#: ../../mod/lostpass.php:83 ../../boot.php:831
 msgid "Password Reset"
 msgstr ""
 
@@ -1796,8 +1801,9 @@ msgstr ""
 msgid "Remove account"
 msgstr ""
 
-#: ../../mod/settings.php:89 ../../mod/admin.php:748 ../../mod/admin.php:953
-#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:643
+#: ../../mod/settings.php:89 ../../mod/admin.php:751 ../../mod/admin.php:956
+#: ../../addon/dav/layout.fnk.php:112 ../../addon/mathjax/mathjax.php:36
+#: ../../view/theme/diabook/theme.php:643
 #: ../../view/theme/diabook/theme.php:773 ../../include/nav.php:137
 msgid "Settings"
 msgstr ""
@@ -2116,7 +2122,7 @@ msgstr ""
 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: ../../mod/settings.php:937 ../../mod/profile_photo.php:211
+#: ../../mod/settings.php:937 ../../mod/profile_photo.php:213
 msgid "or"
 msgstr ""
 
@@ -2398,14 +2404,14 @@ msgstr ""
 msgid "Invalid contact."
 msgstr ""
 
-#: ../../mod/notes.php:44 ../../boot.php:1526
+#: ../../mod/notes.php:44 ../../boot.php:1531
 msgid "Personal Notes"
 msgstr ""
 
 #: ../../mod/notes.php:63 ../../mod/filer.php:30
 #: ../../addon/facebook/facebook.php:756
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:150
-#: ../../include/text.php:652
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:185
+#: ../../addon/dav/layout.fnk.php:418 ../../include/text.php:652
 msgid "Save"
 msgstr ""
 
@@ -2414,7 +2420,7 @@ msgstr ""
 msgid "Number of daily wall messages for %s exceeded. Message failed."
 msgstr ""
 
-#: ../../mod/wallmessage.php:56 ../../mod/message.php:65
+#: ../../mod/wallmessage.php:56 ../../mod/message.php:66
 msgid "No recipient selected."
 msgstr ""
 
@@ -2422,15 +2428,15 @@ msgstr ""
 msgid "Unable to check your home location."
 msgstr ""
 
-#: ../../mod/wallmessage.php:62 ../../mod/message.php:72
+#: ../../mod/wallmessage.php:62 ../../mod/message.php:73
 msgid "Message could not be sent."
 msgstr ""
 
-#: ../../mod/wallmessage.php:65 ../../mod/message.php:75
+#: ../../mod/wallmessage.php:65 ../../mod/message.php:76
 msgid "Message collection failure."
 msgstr ""
 
-#: ../../mod/wallmessage.php:68 ../../mod/message.php:78
+#: ../../mod/wallmessage.php:68 ../../mod/message.php:79
 msgid "Message sent."
 msgstr ""
 
@@ -2438,12 +2444,12 @@ msgstr ""
 msgid "No recipient."
 msgstr ""
 
-#: ../../mod/wallmessage.php:124 ../../mod/message.php:171
+#: ../../mod/wallmessage.php:124 ../../mod/message.php:172
 #: ../../include/conversation.php:943
 msgid "Please enter a link URL:"
 msgstr ""
 
-#: ../../mod/wallmessage.php:131 ../../mod/message.php:199
+#: ../../mod/wallmessage.php:131 ../../mod/message.php:200
 msgid "Send Private Message"
 msgstr ""
 
@@ -2454,18 +2460,18 @@ msgid ""
 "your site allow private mail from unknown senders."
 msgstr ""
 
-#: ../../mod/wallmessage.php:133 ../../mod/message.php:200
-#: ../../mod/message.php:397
+#: ../../mod/wallmessage.php:133 ../../mod/message.php:201
+#: ../../mod/message.php:399
 msgid "To:"
 msgstr ""
 
-#: ../../mod/wallmessage.php:134 ../../mod/message.php:205
-#: ../../mod/message.php:399
+#: ../../mod/wallmessage.php:134 ../../mod/message.php:206
+#: ../../mod/message.php:401
 msgid "Subject:"
 msgstr ""
 
-#: ../../mod/wallmessage.php:140 ../../mod/message.php:209
-#: ../../mod/message.php:402 ../../mod/invite.php:113
+#: ../../mod/wallmessage.php:140 ../../mod/message.php:210
+#: ../../mod/message.php:404 ../../mod/invite.php:113
 msgid "Your message:"
 msgstr ""
 
@@ -2649,7 +2655,7 @@ msgstr ""
 
 #: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:128
 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:79
-#: ../../include/nav.php:50 ../../boot.php:1505
+#: ../../include/nav.php:50 ../../boot.php:1510
 msgid "Profile"
 msgstr ""
 
@@ -2730,7 +2736,7 @@ msgstr ""
 msgid "Your invitation ID: "
 msgstr ""
 
-#: ../../mod/register.php:255 ../../mod/admin.php:418
+#: ../../mod/register.php:255 ../../mod/admin.php:421
 msgid "Registration"
 msgstr ""
 
@@ -2753,7 +2759,7 @@ msgstr ""
 msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:792
+#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:797
 msgid "Register"
 msgstr ""
 
@@ -2761,33 +2767,33 @@ msgstr ""
 msgid "People Search"
 msgstr ""
 
-#: ../../mod/like.php:127 ../../mod/tagger.php:70
+#: ../../mod/like.php:185 ../../mod/like.php:259 ../../mod/tagger.php:70
 #: ../../addon/facebook/facebook.php:1572
 #: ../../addon/communityhome/communityhome.php:158
 #: ../../addon/communityhome/communityhome.php:167
 #: ../../view/theme/diabook/theme.php:565
-#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1662
+#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1671
 #: ../../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:1576
+#: ../../mod/like.php:202 ../../addon/facebook/facebook.php:1576
 #: ../../addon/communityhome/communityhome.php:172
-#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1678
+#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1687
 #: ../../include/conversation.php:65
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/like.php:146 ../../include/conversation.php:68
+#: ../../mod/like.php:204 ../../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:156
-#: ../../mod/admin.php:697 ../../mod/admin.php:896 ../../mod/display.php:37
-#: ../../mod/display.php:142 ../../include/items.php:3179
+#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
+#: ../../mod/admin.php:700 ../../mod/admin.php:899 ../../mod/display.php:37
+#: ../../mod/display.php:142 ../../include/items.php:3189
 msgid "Item not found."
 msgstr ""
 
@@ -2795,12 +2801,12 @@ msgstr ""
 msgid "Access denied."
 msgstr ""
 
-#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:130
-#: ../../include/nav.php:51 ../../boot.php:1511
+#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130
+#: ../../include/nav.php:51 ../../boot.php:1516
 msgid "Photos"
 msgstr ""
 
-#: ../../mod/fbrowser.php:86
+#: ../../mod/fbrowser.php:96
 msgid "Files"
 msgstr ""
 
@@ -2825,8 +2831,8 @@ msgstr ""
 msgid "Empty post discarded."
 msgstr ""
 
-#: ../../mod/item.php:379 ../../mod/wall_upload.php:99
-#: ../../mod/wall_upload.php:108 ../../mod/wall_upload.php:115
+#: ../../mod/item.php:379 ../../mod/wall_upload.php:102
+#: ../../mod/wall_upload.php:111 ../../mod/wall_upload.php:118
 #: ../../include/message.php:144
 msgid "Wall Photos"
 msgstr ""
@@ -2862,7 +2868,7 @@ msgid "Image uploaded but image cropping failed."
 msgstr ""
 
 #: ../../mod/profile_photo.php:63 ../../mod/profile_photo.php:70
-#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:264
+#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:266
 #, php-format
 msgid "Image size reduction [%s] failed."
 msgstr ""
@@ -2877,44 +2883,44 @@ msgstr ""
 msgid "Unable to process image"
 msgstr ""
 
-#: ../../mod/profile_photo.php:115 ../../mod/wall_upload.php:74
+#: ../../mod/profile_photo.php:117 ../../mod/wall_upload.php:77
 #, php-format
 msgid "Image exceeds size limit of %d"
 msgstr ""
 
-#: ../../mod/profile_photo.php:207
+#: ../../mod/profile_photo.php:209
 msgid "Upload File:"
 msgstr ""
 
-#: ../../mod/profile_photo.php:208
+#: ../../mod/profile_photo.php:210
 msgid "Upload Profile Photo"
 msgstr ""
 
-#: ../../mod/profile_photo.php:209
+#: ../../mod/profile_photo.php:211
 msgid "Upload"
 msgstr ""
 
-#: ../../mod/profile_photo.php:211
+#: ../../mod/profile_photo.php:213
 msgid "skip this step"
 msgstr ""
 
-#: ../../mod/profile_photo.php:211
+#: ../../mod/profile_photo.php:213
 msgid "select a photo from your photo albums"
 msgstr ""
 
-#: ../../mod/profile_photo.php:224
+#: ../../mod/profile_photo.php:226
 msgid "Crop Image"
 msgstr ""
 
-#: ../../mod/profile_photo.php:225
+#: ../../mod/profile_photo.php:227
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 
-#: ../../mod/profile_photo.php:227
+#: ../../mod/profile_photo.php:229
 msgid "Done Editing"
 msgstr ""
 
-#: ../../mod/profile_photo.php:255
+#: ../../mod/profile_photo.php:257
 msgid "Image uploaded successfully."
 msgstr ""
 
@@ -2940,67 +2946,67 @@ msgstr ""
 msgid "New Message"
 msgstr ""
 
-#: ../../mod/message.php:69
+#: ../../mod/message.php:70
 msgid "Unable to locate contact information."
 msgstr ""
 
-#: ../../mod/message.php:119
+#: ../../mod/message.php:120
 msgid "Message deleted."
 msgstr ""
 
-#: ../../mod/message.php:149
+#: ../../mod/message.php:150
 msgid "Conversation removed."
 msgstr ""
 
-#: ../../mod/message.php:245
+#: ../../mod/message.php:247
 msgid "No messages."
 msgstr ""
 
-#: ../../mod/message.php:252
+#: ../../mod/message.php:254
 #, php-format
 msgid "Unknown sender - %s"
 msgstr ""
 
-#: ../../mod/message.php:255
+#: ../../mod/message.php:257
 #, php-format
 msgid "You and %s"
 msgstr ""
 
-#: ../../mod/message.php:258
+#: ../../mod/message.php:260
 #, php-format
 msgid "%s and You"
 msgstr ""
 
-#: ../../mod/message.php:268 ../../mod/message.php:390
+#: ../../mod/message.php:270 ../../mod/message.php:392
 msgid "Delete conversation"
 msgstr ""
 
-#: ../../mod/message.php:271
+#: ../../mod/message.php:273
 msgid "D, d M Y - g:i A"
 msgstr ""
 
-#: ../../mod/message.php:273
+#: ../../mod/message.php:275
 #, php-format
 msgid "%d message"
 msgid_plural "%d messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/message.php:308
+#: ../../mod/message.php:310
 msgid "Message not available."
 msgstr ""
 
-#: ../../mod/message.php:373
+#: ../../mod/message.php:375
 msgid "Delete message"
 msgstr ""
 
-#: ../../mod/message.php:392
+#: ../../mod/message.php:394
 msgid ""
 "No secure communications available. You <strong>may</strong> be able to "
 "respond from the sender's profile page."
 msgstr ""
 
-#: ../../mod/message.php:396
+#: ../../mod/message.php:398
 msgid "Send Reply"
 msgstr ""
 
@@ -3017,19 +3023,19 @@ msgstr ""
 msgid "Theme settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:96 ../../mod/admin.php:416
+#: ../../mod/admin.php:96 ../../mod/admin.php:419
 msgid "Site"
 msgstr ""
 
-#: ../../mod/admin.php:97 ../../mod/admin.php:652 ../../mod/admin.php:664
+#: ../../mod/admin.php:97 ../../mod/admin.php:655 ../../mod/admin.php:667
 msgid "Users"
 msgstr ""
 
-#: ../../mod/admin.php:98 ../../mod/admin.php:746 ../../mod/admin.php:788
+#: ../../mod/admin.php:98 ../../mod/admin.php:749 ../../mod/admin.php:791
 msgid "Plugins"
 msgstr ""
 
-#: ../../mod/admin.php:99 ../../mod/admin.php:951 ../../mod/admin.php:987
+#: ../../mod/admin.php:99 ../../mod/admin.php:954 ../../mod/admin.php:990
 msgid "Themes"
 msgstr ""
 
@@ -3037,561 +3043,569 @@ msgstr ""
 msgid "DB updates"
 msgstr ""
 
-#: ../../mod/admin.php:115 ../../mod/admin.php:1074
+#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1077
 msgid "Logs"
 msgstr ""
 
-#: ../../mod/admin.php:120
+#: ../../mod/admin.php:120 ../../include/nav.php:146
+msgid "Admin"
+msgstr ""
+
+#: ../../mod/admin.php:121
+msgid "Plugin Features"
+msgstr ""
+
+#: ../../mod/admin.php:123
 msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: ../../mod/admin.php:180 ../../mod/admin.php:634
+#: ../../mod/admin.php:183 ../../mod/admin.php:637
 msgid "Normal Account"
 msgstr ""
 
-#: ../../mod/admin.php:181 ../../mod/admin.php:635
+#: ../../mod/admin.php:184 ../../mod/admin.php:638
 msgid "Soapbox Account"
 msgstr ""
 
-#: ../../mod/admin.php:182 ../../mod/admin.php:636
+#: ../../mod/admin.php:185 ../../mod/admin.php:639
 msgid "Community/Celebrity Account"
 msgstr ""
 
-#: ../../mod/admin.php:183 ../../mod/admin.php:637
+#: ../../mod/admin.php:186 ../../mod/admin.php:640
 msgid "Automatic Friend Account"
 msgstr ""
 
-#: ../../mod/admin.php:202
+#: ../../mod/admin.php:205
 msgid "Message queues"
 msgstr ""
 
-#: ../../mod/admin.php:207 ../../mod/admin.php:415 ../../mod/admin.php:651
-#: ../../mod/admin.php:745 ../../mod/admin.php:787 ../../mod/admin.php:950
-#: ../../mod/admin.php:986 ../../mod/admin.php:1073
+#: ../../mod/admin.php:210 ../../mod/admin.php:418 ../../mod/admin.php:654
+#: ../../mod/admin.php:748 ../../mod/admin.php:790 ../../mod/admin.php:953
+#: ../../mod/admin.php:989 ../../mod/admin.php:1076
 msgid "Administration"
 msgstr ""
 
-#: ../../mod/admin.php:208
+#: ../../mod/admin.php:211
 msgid "Summary"
 msgstr ""
 
-#: ../../mod/admin.php:210
+#: ../../mod/admin.php:213
 msgid "Registered users"
 msgstr ""
 
-#: ../../mod/admin.php:212
+#: ../../mod/admin.php:215
 msgid "Pending registrations"
 msgstr ""
 
-#: ../../mod/admin.php:213
+#: ../../mod/admin.php:216
 msgid "Version"
 msgstr ""
 
-#: ../../mod/admin.php:215
+#: ../../mod/admin.php:218
 msgid "Active plugins"
 msgstr ""
 
-#: ../../mod/admin.php:354
+#: ../../mod/admin.php:357
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:402
+#: ../../mod/admin.php:405
 msgid "Closed"
 msgstr ""
 
-#: ../../mod/admin.php:403
+#: ../../mod/admin.php:406
 msgid "Requires approval"
 msgstr ""
 
-#: ../../mod/admin.php:404
+#: ../../mod/admin.php:407
 msgid "Open"
 msgstr ""
 
-#: ../../mod/admin.php:408
+#: ../../mod/admin.php:411
 msgid "No SSL policy, links will track page SSL state"
 msgstr ""
 
-#: ../../mod/admin.php:409
+#: ../../mod/admin.php:412
 msgid "Force all links to use SSL"
 msgstr ""
 
-#: ../../mod/admin.php:410
+#: ../../mod/admin.php:413
 msgid "Self-signed certificate, use SSL for local links only (discouraged)"
 msgstr ""
 
-#: ../../mod/admin.php:419
+#: ../../mod/admin.php:422
 msgid "File upload"
 msgstr ""
 
-#: ../../mod/admin.php:420
+#: ../../mod/admin.php:423
 msgid "Policies"
 msgstr ""
 
-#: ../../mod/admin.php:421
+#: ../../mod/admin.php:424
 msgid "Advanced"
 msgstr ""
 
-#: ../../mod/admin.php:425 ../../addon/statusnet/statusnet.php:552
+#: ../../mod/admin.php:428 ../../addon/statusnet/statusnet.php:552
 msgid "Site name"
 msgstr ""
 
-#: ../../mod/admin.php:426
+#: ../../mod/admin.php:429
 msgid "Banner/Logo"
 msgstr ""
 
-#: ../../mod/admin.php:427
+#: ../../mod/admin.php:430
 msgid "System language"
 msgstr ""
 
-#: ../../mod/admin.php:428
+#: ../../mod/admin.php:431
 msgid "System theme"
 msgstr ""
 
-#: ../../mod/admin.php:428
+#: ../../mod/admin.php:431
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr ""
 
-#: ../../mod/admin.php:429
+#: ../../mod/admin.php:432
 msgid "SSL link policy"
 msgstr ""
 
-#: ../../mod/admin.php:429
+#: ../../mod/admin.php:432
 msgid "Determines whether generated links should be forced to use SSL"
 msgstr ""
 
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:433
 msgid "Maximum image size"
 msgstr ""
 
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:433
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:435
 msgid "Register policy"
 msgstr ""
 
-#: ../../mod/admin.php:433
+#: ../../mod/admin.php:436
 msgid "Register text"
 msgstr ""
 
-#: ../../mod/admin.php:433
+#: ../../mod/admin.php:436
 msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:437
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:437
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: ../../mod/admin.php:435
+#: ../../mod/admin.php:438
 msgid "Allowed friend domains"
 msgstr ""
 
-#: ../../mod/admin.php:435
+#: ../../mod/admin.php:438
 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:436
+#: ../../mod/admin.php:439
 msgid "Allowed email domains"
 msgstr ""
 
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:439
 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:437
+#: ../../mod/admin.php:440
 msgid "Block public"
 msgstr ""
 
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:440
 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:438
+#: ../../mod/admin.php:441
 msgid "Force publish"
 msgstr ""
 
-#: ../../mod/admin.php:438
+#: ../../mod/admin.php:441
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: ../../mod/admin.php:439
+#: ../../mod/admin.php:442
 msgid "Global directory update URL"
 msgstr ""
 
-#: ../../mod/admin.php:439
+#: ../../mod/admin.php:442
 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:441
+#: ../../mod/admin.php:444
 msgid "Block multiple registrations"
 msgstr ""
 
-#: ../../mod/admin.php:441
+#: ../../mod/admin.php:444
 msgid "Disallow users to register additional accounts for use as pages."
 msgstr ""
 
-#: ../../mod/admin.php:442
+#: ../../mod/admin.php:445
 msgid "OpenID support"
 msgstr ""
 
-#: ../../mod/admin.php:442
+#: ../../mod/admin.php:445
 msgid "OpenID support for registration and logins."
 msgstr ""
 
-#: ../../mod/admin.php:443
+#: ../../mod/admin.php:446
 msgid "Fullname check"
 msgstr ""
 
-#: ../../mod/admin.php:443
+#: ../../mod/admin.php:446
 msgid ""
 "Force users to register with a space between firstname and lastname in Full "
 "name, as an antispam measure"
 msgstr ""
 
-#: ../../mod/admin.php:444
+#: ../../mod/admin.php:447
 msgid "UTF-8 Regular expressions"
 msgstr ""
 
-#: ../../mod/admin.php:444
+#: ../../mod/admin.php:447
 msgid "Use PHP UTF8 regular expressions"
 msgstr ""
 
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:448
 msgid "Show Community Page"
 msgstr ""
 
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:448
 msgid ""
 "Display a Community page showing all recent public postings on this site."
 msgstr ""
 
-#: ../../mod/admin.php:446
+#: ../../mod/admin.php:449
 msgid "Enable OStatus support"
 msgstr ""
 
-#: ../../mod/admin.php:446
+#: ../../mod/admin.php:449
 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:447
+#: ../../mod/admin.php:450
 msgid "Enable Diaspora support"
 msgstr ""
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:450
 msgid "Provide built-in Diaspora network compatibility."
 msgstr ""
 
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:451
 msgid "Only allow Friendica contacts"
 msgstr ""
 
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:451
 msgid ""
 "All contacts must use Friendica protocols. All other built-in communication "
 "protocols disabled."
 msgstr ""
 
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:452
 msgid "Verify SSL"
 msgstr ""
 
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:452
 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:450
+#: ../../mod/admin.php:453
 msgid "Proxy user"
 msgstr ""
 
-#: ../../mod/admin.php:451
+#: ../../mod/admin.php:454
 msgid "Proxy URL"
 msgstr ""
 
-#: ../../mod/admin.php:452
+#: ../../mod/admin.php:455
 msgid "Network timeout"
 msgstr ""
 
-#: ../../mod/admin.php:452
+#: ../../mod/admin.php:455
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: ../../mod/admin.php:453
+#: ../../mod/admin.php:456
 msgid "Delivery interval"
 msgstr ""
 
-#: ../../mod/admin.php:453
+#: ../../mod/admin.php:456
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr ""
 
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:457
 msgid "Poll interval"
 msgstr ""
 
-#: ../../mod/admin.php:454
+#: ../../mod/admin.php:457
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr ""
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:458
 msgid "Maximum Load Average"
 msgstr ""
 
-#: ../../mod/admin.php:455
+#: ../../mod/admin.php:458
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr ""
 
-#: ../../mod/admin.php:469
+#: ../../mod/admin.php:472
 msgid "Update has been marked successful"
 msgstr ""
 
-#: ../../mod/admin.php:479
+#: ../../mod/admin.php:482
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr ""
 
-#: ../../mod/admin.php:482
+#: ../../mod/admin.php:485
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr ""
 
-#: ../../mod/admin.php:486
+#: ../../mod/admin.php:489
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: ../../mod/admin.php:489
+#: ../../mod/admin.php:492
 #, php-format
 msgid "Update function %s could not be found."
 msgstr ""
 
-#: ../../mod/admin.php:504
+#: ../../mod/admin.php:507
 msgid "No failed updates."
 msgstr ""
 
-#: ../../mod/admin.php:508
+#: ../../mod/admin.php:511
 msgid "Failed Updates"
 msgstr ""
 
-#: ../../mod/admin.php:509
+#: ../../mod/admin.php:512
 msgid ""
 "This does not include updates prior to 1139, which did not return a status."
 msgstr ""
 
-#: ../../mod/admin.php:510
+#: ../../mod/admin.php:513
 msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: ../../mod/admin.php:511
+#: ../../mod/admin.php:514
 msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: ../../mod/admin.php:536
+#: ../../mod/admin.php:539
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:543
+#: ../../mod/admin.php:546
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:582
+#: ../../mod/admin.php:585
 #, php-format
 msgid "User '%s' deleted"
 msgstr ""
 
-#: ../../mod/admin.php:590
+#: ../../mod/admin.php:593
 #, php-format
 msgid "User '%s' unblocked"
 msgstr ""
 
-#: ../../mod/admin.php:590
+#: ../../mod/admin.php:593
 #, php-format
 msgid "User '%s' blocked"
 msgstr ""
 
-#: ../../mod/admin.php:654
+#: ../../mod/admin.php:657
 msgid "select all"
 msgstr ""
 
-#: ../../mod/admin.php:655
+#: ../../mod/admin.php:658
 msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../mod/admin.php:656
+#: ../../mod/admin.php:659
 msgid "Request date"
 msgstr ""
 
-#: ../../mod/admin.php:656 ../../mod/admin.php:665
+#: ../../mod/admin.php:659 ../../mod/admin.php:668
 #: ../../include/contact_selectors.php:79
 msgid "Email"
 msgstr ""
 
-#: ../../mod/admin.php:657
+#: ../../mod/admin.php:660
 msgid "No registrations."
 msgstr ""
 
-#: ../../mod/admin.php:659
+#: ../../mod/admin.php:662
 msgid "Deny"
 msgstr ""
 
-#: ../../mod/admin.php:665
+#: ../../mod/admin.php:668
 msgid "Register date"
 msgstr ""
 
-#: ../../mod/admin.php:665
+#: ../../mod/admin.php:668
 msgid "Last login"
 msgstr ""
 
-#: ../../mod/admin.php:665
+#: ../../mod/admin.php:668
 msgid "Last item"
 msgstr ""
 
-#: ../../mod/admin.php:665
+#: ../../mod/admin.php:668
 msgid "Account"
 msgstr ""
 
-#: ../../mod/admin.php:667
+#: ../../mod/admin.php:670
 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:668
+#: ../../mod/admin.php:671
 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:709
+#: ../../mod/admin.php:712
 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../mod/admin.php:713
+#: ../../mod/admin.php:716
 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../mod/admin.php:723 ../../mod/admin.php:921
+#: ../../mod/admin.php:726 ../../mod/admin.php:924
 msgid "Disable"
 msgstr ""
 
-#: ../../mod/admin.php:725 ../../mod/admin.php:923
+#: ../../mod/admin.php:728 ../../mod/admin.php:926
 msgid "Enable"
 msgstr ""
 
-#: ../../mod/admin.php:747 ../../mod/admin.php:952
+#: ../../mod/admin.php:750 ../../mod/admin.php:955
 msgid "Toggle"
 msgstr ""
 
-#: ../../mod/admin.php:755 ../../mod/admin.php:962
+#: ../../mod/admin.php:758 ../../mod/admin.php:965
 msgid "Author: "
 msgstr ""
 
-#: ../../mod/admin.php:756 ../../mod/admin.php:963
+#: ../../mod/admin.php:759 ../../mod/admin.php:966
 msgid "Maintainer: "
 msgstr ""
 
-#: ../../mod/admin.php:885
+#: ../../mod/admin.php:888
 msgid "No themes found."
 msgstr ""
 
-#: ../../mod/admin.php:944
+#: ../../mod/admin.php:947
 msgid "Screenshot"
 msgstr ""
 
-#: ../../mod/admin.php:992
+#: ../../mod/admin.php:995
 msgid "[Experimental]"
 msgstr ""
 
-#: ../../mod/admin.php:993
+#: ../../mod/admin.php:996
 msgid "[Unsupported]"
 msgstr ""
 
-#: ../../mod/admin.php:1020
+#: ../../mod/admin.php:1023
 msgid "Log settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:1076
+#: ../../mod/admin.php:1079
 msgid "Clear"
 msgstr ""
 
-#: ../../mod/admin.php:1082
+#: ../../mod/admin.php:1085
 msgid "Debugging"
 msgstr ""
 
-#: ../../mod/admin.php:1083
+#: ../../mod/admin.php:1086
 msgid "Log file"
 msgstr ""
 
-#: ../../mod/admin.php:1083
+#: ../../mod/admin.php:1086
 msgid ""
 "Must be writable by web server. Relative to your Friendica top-level "
 "directory."
 msgstr ""
 
-#: ../../mod/admin.php:1084
+#: ../../mod/admin.php:1087
 msgid "Log level"
 msgstr ""
 
-#: ../../mod/admin.php:1134
+#: ../../mod/admin.php:1137
 msgid "Close"
 msgstr ""
 
-#: ../../mod/admin.php:1140
+#: ../../mod/admin.php:1143
 msgid "FTP Host"
 msgstr ""
 
-#: ../../mod/admin.php:1141
+#: ../../mod/admin.php:1144
 msgid "FTP Path"
 msgstr ""
 
-#: ../../mod/admin.php:1142
+#: ../../mod/admin.php:1145
 msgid "FTP User"
 msgstr ""
 
-#: ../../mod/admin.php:1143
+#: ../../mod/admin.php:1146
 msgid "FTP Password"
 msgstr ""
 
-#: ../../mod/profile.php:21 ../../boot.php:957
+#: ../../mod/profile.php:21 ../../boot.php:962
 msgid "Requested profile is not available."
 msgstr ""
 
@@ -3966,23 +3980,23 @@ msgstr ""
 msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/profiles.php:645 ../../boot.php:1066
+#: ../../mod/profiles.php:645 ../../boot.php:1071
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/profiles.php:646 ../../boot.php:1067
+#: ../../mod/profiles.php:646 ../../boot.php:1072
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/profiles.php:657 ../../boot.php:1077
+#: ../../mod/profiles.php:657 ../../boot.php:1082
 msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/profiles.php:659 ../../boot.php:1080
+#: ../../mod/profiles.php:659 ../../boot.php:1085
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../mod/profiles.php:660 ../../boot.php:1081
+#: ../../mod/profiles.php:660 ../../boot.php:1086
 msgid "Edit visibility"
 msgstr ""
 
@@ -4188,7 +4202,7 @@ msgstr ""
 msgid "Unable to set contact photo."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:507
+#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:510
 #: ../../include/conversation.php:101
 #, php-format
 msgid "%1$s is now friends with %2$s"
@@ -4407,7 +4421,7 @@ msgstr ""
 msgid "Activate Real-Time Updates"
 msgstr ""
 
-#: ../../addon/facebook/facebook.php:785
+#: ../../addon/facebook/facebook.php:785 ../../addon/dav/layout.fnk.php:394
 msgid "The new values have been saved."
 msgstr ""
 
@@ -4447,23 +4461,35 @@ msgid ""
 "connection again, you have to %3$sre-authenticate the Facebook-connector%4$s."
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:147
+#: ../../addon/snautofollow/snautofollow.php:32
+msgid "StatusNet AutoFollow settings updated."
+msgstr ""
+
+#: ../../addon/snautofollow/snautofollow.php:56
+msgid "StatusNet AutoFollow Settings"
+msgstr ""
+
+#: ../../addon/snautofollow/snautofollow.php:58
+msgid "Automatically follow any StatusNet followers/mentioners"
+msgstr ""
+
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:182
 msgid "Lifetime of the cache (in hours)"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:152
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:187
 msgid "Cache Statistics"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:155
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:190
 msgid "Number of items"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:157
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:192
 msgid "Size of the cache"
 msgstr ""
 
-#: ../../addon/privacy_image_cache/privacy_image_cache.php:159
+#: ../../addon/privacy_image_cache/privacy_image_cache.php:194
 msgid "Delete the whole cache"
 msgstr ""
 
@@ -4590,7 +4616,7 @@ msgstr ""
 
 #: ../../addon/page/page.php:63 ../../addon/showmore/showmore.php:87
 #: ../../include/contact_widgets.php:188 ../../include/conversation.php:476
-#: ../../boot.php:515
+#: ../../boot.php:520
 msgid "show more"
 msgstr ""
 
@@ -4606,7 +4632,7 @@ msgstr ""
 #: ../../addon/communityhome/communityhome.php:34
 #: ../../addon/communityhome/twillingham/communityhome.php:28
 #: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:813
+#: ../../include/nav.php:64 ../../boot.php:818
 msgid "Login"
 msgstr ""
 
@@ -4639,6 +4665,185 @@ msgstr ""
 msgid "event"
 msgstr ""
 
+#: ../../addon/dav/common/wdcal_configuration.php:126
+msgid "U.S. Time Format (mm/dd/YYYY)"
+msgstr ""
+
+#: ../../addon/dav/common/wdcal_configuration.php:205
+msgid "German Time Format (dd.mm.YYYY)"
+msgstr ""
+
+#: ../../addon/dav/common/calendar.fnk.php:507
+#: ../../addon/dav/common/calendar.fnk.php:576
+#: ../../addon/dav/common/calendar.fnk.php:603
+#: ../../addon/dav/layout.fnk.php:266
+msgid "No access"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:116
+msgid "Today"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:132
+msgid "Week"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:139
+msgid "Month"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:144
+msgid "Reload"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:155
+msgid "Date"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:193 ../../addon/dav/layout.fnk.php:237
+msgid "Error"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:259
+msgid "Not found"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:326 ../../addon/dav/layout.fnk.php:399
+msgid "Go back to the calendar"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:346
+msgid "Description"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:349
+msgid "Notification"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:358
+msgid "Minutes"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:361
+msgid "Hours"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:364
+msgid "Days"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:365
+msgid "before"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:401
+msgid "Calendar Settings"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:407
+msgid "Date format"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:416
+msgid "Time zone"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:421
+msgid "Limitations"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:425
+msgid "Warning"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:429
+msgid "Synchronization (iPhone, Thunderbird Lightning, Android, ...)"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:436
+msgid "Synchronizing this calendar with the iPhone"
+msgstr ""
+
+#: ../../addon/dav/layout.fnk.php:447
+msgid "Synchronizing your Friendica-Contacts with the iPhone"
+msgstr ""
+
+#: ../../addon/dav/dav_carddav_backend_friendica_community.inc.php:37
+msgid "Friendica-Contacts"
+msgstr ""
+
+#: ../../addon/dav/dav_carddav_backend_friendica_community.inc.php:38
+msgid "Your Friendica-Contacts"
+msgstr ""
+
+#: ../../addon/dav/main.php:229
+msgid "Calendar"
+msgstr ""
+
+#: ../../addon/dav/main.php:232
+msgid "Extended calendar with CalDAV-support"
+msgstr ""
+
+#: ../../addon/dav/main.php:248
+msgid "The database tables have been installed."
+msgstr ""
+
+#: ../../addon/dav/main.php:249
+msgid "An error occurred during the installation."
+msgstr ""
+
+#: ../../addon/dav/main.php:265
+msgid "No system-wide settings yet."
+msgstr ""
+
+#: ../../addon/dav/main.php:268
+msgid "Database status"
+msgstr ""
+
+#: ../../addon/dav/main.php:271
+msgid "Installed"
+msgstr ""
+
+#: ../../addon/dav/main.php:274
+msgid "Upgrade needed"
+msgstr ""
+
+#: ../../addon/dav/main.php:274
+msgid "Upgrade"
+msgstr ""
+
+#: ../../addon/dav/main.php:277
+msgid "Not installed"
+msgstr ""
+
+#: ../../addon/dav/main.php:277
+msgid "Install"
+msgstr ""
+
+#: ../../addon/dav/main.php:282
+msgid "Troubleshooting"
+msgstr ""
+
+#: ../../addon/dav/main.php:283
+msgid "Manual creation of the database tables:"
+msgstr ""
+
+#: ../../addon/dav/main.php:284
+msgid "Show SQL-statements"
+msgstr ""
+
+#: ../../addon/dav/calendar.friendica.fnk.php:128
+msgid "Private Calendar"
+msgstr ""
+
+#: ../../addon/dav/calendar.friendica.fnk.php:135
+msgid "Friendica Events: Mine"
+msgstr ""
+
+#: ../../addon/dav/calendar.friendica.fnk.php:138
+msgid "Friendica Events: Contacts"
+msgstr ""
+
 #: ../../addon/uhremotestorage/uhremotestorage.php:84
 #, php-format
 msgid ""
@@ -4785,8 +4990,8 @@ msgstr ""
 msgid "Post to Drupal by default"
 msgstr ""
 
-#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:198
-#: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:192
+#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:199
+#: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:189
 msgid "Post from Friendica"
 msgstr ""
 
@@ -5019,6 +5224,30 @@ msgstr ""
 msgid "The default zoom level. (1:world, 18:highest)"
 msgstr ""
 
+#: ../../addon/libertree/libertree.php:36
+msgid "Post to libertree"
+msgstr ""
+
+#: ../../addon/libertree/libertree.php:67
+msgid "libertree Post Settings"
+msgstr ""
+
+#: ../../addon/libertree/libertree.php:69
+msgid "Enable Libertree Post Plugin"
+msgstr ""
+
+#: ../../addon/libertree/libertree.php:74
+msgid "Libertree API token"
+msgstr ""
+
+#: ../../addon/libertree/libertree.php:79
+msgid "Libertree site URL"
+msgstr ""
+
+#: ../../addon/libertree/libertree.php:84
+msgid "Post to Libertree by default"
+msgstr ""
+
 #: ../../addon/mathjax/mathjax.php:37
 msgid ""
 "The MathJax addon renders mathematical formulae written using the LaTeX "
@@ -5270,6 +5499,10 @@ msgstr ""
 msgid "API URL"
 msgstr ""
 
+#: ../../addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php:19
+msgid "Infinite Improbability Drive"
+msgstr ""
+
 #: ../../addon/tumblr/tumblr.php:36
 msgid "Post to Tumblr"
 msgstr ""
@@ -5357,11 +5590,11 @@ msgstr ""
 msgid "Post to WordPress by default"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:102
+#: ../../addon/wppost/wppost.php:103
 msgid "Provide a backlink to the Friendica post"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:204
+#: ../../addon/wppost/wppost.php:205
 msgid "Read the original post and comment stream on Friendica"
 msgstr ""
 
@@ -5783,7 +6016,7 @@ msgstr ""
 msgid "Set colour scheme"
 msgstr ""
 
-#: ../../include/profile_advanced.php:17 ../../boot.php:1102
+#: ../../include/profile_advanced.php:17 ../../boot.php:1107
 msgid "Gender:"
 msgstr ""
 
@@ -5796,7 +6029,7 @@ msgid "j F"
 msgstr ""
 
 #: ../../include/profile_advanced.php:30 ../../include/datetime.php:450
-#: ../../include/items.php:1423
+#: ../../include/items.php:1428
 msgid "Birthday:"
 msgstr ""
 
@@ -5804,7 +6037,7 @@ msgstr ""
 msgid "Age:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:37 ../../boot.php:1105
+#: ../../include/profile_advanced.php:37 ../../boot.php:1110
 msgid "Status:"
 msgstr ""
 
@@ -5813,7 +6046,7 @@ msgstr ""
 msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/profile_advanced.php:48 ../../boot.php:1107
+#: ../../include/profile_advanced.php:48 ../../boot.php:1112
 msgid "Homepage:"
 msgstr ""
 
@@ -6177,12 +6410,12 @@ msgstr ""
 msgid "Finishes:"
 msgstr ""
 
-#: ../../include/delivery.php:455 ../../include/notifier.php:677
+#: ../../include/delivery.php:456 ../../include/notifier.php:678
 msgid "(no subject)"
 msgstr ""
 
-#: ../../include/delivery.php:462 ../../include/enotify.php:26
-#: ../../include/notifier.php:684
+#: ../../include/delivery.php:463 ../../include/enotify.php:26
+#: ../../include/notifier.php:685
 msgid "noreply"
 msgstr ""
 
@@ -6337,28 +6570,23 @@ msgstr ""
 msgid "Item filed"
 msgstr ""
 
-#: ../../include/diaspora.php:590
+#: ../../include/diaspora.php:593
 msgid "Sharing notification from Diaspora network"
 msgstr ""
 
-#: ../../include/diaspora.php:1977
+#: ../../include/diaspora.php:2037
 msgid "Attachments:"
 msgstr ""
 
-#: ../../include/diaspora.php:2168
-#, php-format
-msgid "[Relayed] Comment authored by %s from network %s"
-msgstr ""
-
-#: ../../include/network.php:824
+#: ../../include/network.php:827
 msgid "view full size"
 msgstr ""
 
-#: ../../include/oembed.php:132
+#: ../../include/oembed.php:134
 msgid "Embedded content"
 msgstr ""
 
-#: ../../include/oembed.php:141
+#: ../../include/oembed.php:143
 msgid "Embedding disabled"
 msgstr ""
 
@@ -6397,7 +6625,7 @@ msgstr ""
 msgid "Contacts not in any group"
 msgstr ""
 
-#: ../../include/nav.php:46 ../../boot.php:812
+#: ../../include/nav.php:46 ../../boot.php:817
 msgid "Logout"
 msgstr ""
 
@@ -6405,7 +6633,7 @@ msgstr ""
 msgid "End this session"
 msgstr ""
 
-#: ../../include/nav.php:49 ../../boot.php:1499
+#: ../../include/nav.php:49 ../../boot.php:1504
 msgid "Status"
 msgstr ""
 
@@ -6485,11 +6713,11 @@ msgstr ""
 msgid "Manage other pages"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../boot.php:1060
+#: ../../include/nav.php:138 ../../boot.php:1065
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../boot.php:1060
+#: ../../include/nav.php:138 ../../boot.php:1065
 msgid "Manage/edit profiles"
 msgstr ""
 
@@ -6498,10 +6726,6 @@ msgid "Manage/edit friends and contacts"
 msgstr ""
 
 #: ../../include/nav.php:146
-msgid "Admin"
-msgstr ""
-
-#: ../../include/nav.php:146
 msgid "Site setup and configuration"
 msgstr ""
 
@@ -6915,19 +7139,19 @@ msgid ""
 "notifications from you."
 msgstr ""
 
-#: ../../include/follow.php:164
+#: ../../include/follow.php:169
 msgid "Unable to retrieve contact information."
 msgstr ""
 
-#: ../../include/follow.php:218
+#: ../../include/follow.php:223
 msgid "following"
 msgstr ""
 
-#: ../../include/items.php:2740
+#: ../../include/items.php:2745
 msgid "A new person is sharing with you at "
 msgstr ""
 
-#: ../../include/items.php:2740
+#: ../../include/items.php:2745
 msgid "You have a new follower at "
 msgstr ""
 
@@ -7279,96 +7503,96 @@ msgstr ""
 msgid "permissions"
 msgstr ""
 
-#: ../../boot.php:513
+#: ../../boot.php:518
 msgid "Delete this item?"
 msgstr ""
 
-#: ../../boot.php:516
+#: ../../boot.php:521
 msgid "show fewer"
 msgstr ""
 
-#: ../../boot.php:689
+#: ../../boot.php:694
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:691
+#: ../../boot.php:696
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:791
+#: ../../boot.php:796
 msgid "Create a New Account"
 msgstr ""
 
-#: ../../boot.php:815
+#: ../../boot.php:820
 msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../boot.php:816
+#: ../../boot.php:821
 msgid "Password: "
 msgstr ""
 
-#: ../../boot.php:819
+#: ../../boot.php:824
 msgid "Or login using OpenID: "
 msgstr ""
 
-#: ../../boot.php:825
+#: ../../boot.php:830
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:992
+#: ../../boot.php:997
 msgid "Edit profile"
 msgstr ""
 
-#: ../../boot.php:1052
+#: ../../boot.php:1057
 msgid "Message"
 msgstr ""
 
-#: ../../boot.php:1168 ../../boot.php:1244
+#: ../../boot.php:1173 ../../boot.php:1249
 msgid "g A l F d"
 msgstr ""
 
-#: ../../boot.php:1169 ../../boot.php:1245
+#: ../../boot.php:1174 ../../boot.php:1250
 msgid "F d"
 msgstr ""
 
-#: ../../boot.php:1214 ../../boot.php:1285
+#: ../../boot.php:1219 ../../boot.php:1290
 msgid "[today]"
 msgstr ""
 
-#: ../../boot.php:1226
+#: ../../boot.php:1231
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../boot.php:1227
+#: ../../boot.php:1232
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../boot.php:1278
+#: ../../boot.php:1283
 msgid "[No description]"
 msgstr ""
 
-#: ../../boot.php:1296
+#: ../../boot.php:1301
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../boot.php:1297
+#: ../../boot.php:1302
 msgid "Events this week:"
 msgstr ""
 
-#: ../../boot.php:1502
+#: ../../boot.php:1507
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../boot.php:1508
+#: ../../boot.php:1513
 msgid "Profile Details"
 msgstr ""
 
-#: ../../boot.php:1523
+#: ../../boot.php:1528
 msgid "Events and Calendar"
 msgstr ""
 
-#: ../../boot.php:1529
+#: ../../boot.php:1534
 msgid "Only You Can See This"
 msgstr ""
diff --git a/util/typo.php b/util/typo.php
index 7c275f3ca..bb2fc67c9 100644
--- a/util/typo.php
+++ b/util/typo.php
@@ -30,11 +30,10 @@
 	$dirs = glob('addon/*');
 
 	foreach($dirs as $dir) {
-		$files = glob($dir . '/*.php');
+		$addon = basename($dir);
+		$files = glob($dir . '/' . $addon . '.php');
 		foreach($files as $file) {
 			echo $file . "\n";
-			if(stristr($file,'jappixmini/proxy.php'))
-				continue;
 			include_once($file);
 		}
 	}