version and strings

1 files changed, 868 insertions, 852 deletions

diff --git a/util/hmessages.po b/util/hmessages.po
index 46f81c2be..40152108c 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2015-10-15.1186\n"
+"Project-Id-Version: 2015-10-23.1194\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-16 00:03-0700\n"
+"POT-Creation-Date: 2015-10-23 00:03-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"
@@ -17,72 +17,30 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../include/photos.php:26 ../../include/chat.php:133
-#: ../../include/items.php:4378 ../../include/attach.php:137
-#: ../../include/attach.php:185 ../../include/attach.php:248
-#: ../../include/attach.php:262 ../../include/attach.php:269
-#: ../../include/attach.php:334 ../../include/attach.php:348
-#: ../../include/attach.php:355 ../../include/attach.php:433
-#: ../../include/attach.php:875 ../../include/attach.php:946
-#: ../../include/attach.php:1098 ../../mod/achievements.php:30
-#: ../../mod/fsuggest.php:78 ../../mod/authtest.php:13
-#: ../../mod/bookmarks.php:48 ../../mod/block.php:22 ../../mod/block.php:72
-#: ../../mod/id.php:71 ../../mod/like.php:177 ../../mod/common.php:35
-#: ../../mod/mitem.php:111 ../../mod/connedit.php:348 ../../mod/mood.php:112
-#: ../../mod/filestorage.php:18 ../../mod/filestorage.php:73
-#: ../../mod/filestorage.php:88 ../../mod/filestorage.php:115
-#: ../../mod/layouts.php:69 ../../mod/layouts.php:76 ../../mod/layouts.php:87
-#: ../../mod/poke.php:133 ../../mod/network.php:12 ../../mod/chat.php:91
-#: ../../mod/chat.php:96 ../../mod/rate.php:111 ../../mod/mail.php:118
-#: ../../mod/editpost.php:13 ../../mod/editblock.php:65 ../../mod/item.php:206
-#: ../../mod/item.php:214 ../../mod/item.php:1003 ../../mod/appman.php:66
-#: ../../mod/profile.php:64 ../../mod/profile.php:72 ../../mod/menu.php:74
-#: ../../mod/page.php:31 ../../mod/page.php:86 ../../mod/new_channel.php:68
-#: ../../mod/new_channel.php:99 ../../mod/notifications.php:66
-#: ../../mod/pdledit.php:21 ../../mod/photos.php:70 ../../mod/events.php:256
-#: ../../mod/profile_photo.php:338 ../../mod/profile_photo.php:351
-#: ../../mod/message.php:16 ../../mod/webpages.php:69
-#: ../../mod/register.php:72 ../../mod/blocks.php:69 ../../mod/blocks.php:76
-#: ../../mod/service_limits.php:7 ../../mod/sources.php:66
-#: ../../mod/regmod.php:17 ../../mod/channel.php:100 ../../mod/channel.php:214
-#: ../../mod/channel.php:254 ../../mod/thing.php:271 ../../mod/thing.php:291
-#: ../../mod/thing.php:328 ../../mod/invite.php:13 ../../mod/invite.php:104
-#: ../../mod/viewsrc.php:14 ../../mod/settings.php:565 ../../mod/manage.php:6
-#: ../../mod/api.php:26 ../../mod/api.php:31 ../../mod/connections.php:29
-#: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
-#: ../../mod/editwebpage.php:64 ../../mod/editwebpage.php:86
-#: ../../mod/editwebpage.php:101 ../../mod/editwebpage.php:125
-#: ../../mod/group.php:9 ../../mod/viewconnections.php:22
-#: ../../mod/viewconnections.php:27 ../../mod/locs.php:82
-#: ../../mod/setup.php:227 ../../mod/sharedwithme.php:7
-#: ../../mod/suggest.php:26 ../../mod/profiles.php:188
-#: ../../mod/profiles.php:576 ../../index.php:178 ../../index.php:361
-msgid "Permission denied."
-msgstr ""
-
-#: ../../include/photos.php:109
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
+#: ../../include/bb2diaspora.php:388
+msgid "Attachments:"
 msgstr ""
 
-#: ../../include/photos.php:116
-msgid "Image file is empty."
+#: ../../include/bb2diaspora.php:474 ../../include/event.php:22
+msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
-#: ../../include/photos.php:143 ../../mod/profile_photo.php:222
-msgid "Unable to process image"
+#: ../../include/bb2diaspora.php:476
+msgid "$Projectname event notification:"
 msgstr ""
 
-#: ../../include/photos.php:228
-msgid "Photo storage failed."
+#: ../../include/bb2diaspora.php:480 ../../include/event.php:30
+msgid "Starts:"
 msgstr ""
 
-#: ../../include/photos.php:431 ../../include/conversation.php:1609
-msgid "Photo Albums"
+#: ../../include/bb2diaspora.php:488 ../../include/event.php:40
+msgid "Finishes:"
 msgstr ""
 
-#: ../../include/photos.php:435
-msgid "Upload New Photos"
+#: ../../include/bb2diaspora.php:496 ../../include/event.php:50
+#: ../../include/identity.php:1016 ../../mod/directory.php:302
+#: ../../mod/events.php:701
+msgid "Location:"
 msgstr ""
 
 #: ../../include/Import/import_diaspora.php:17
@@ -98,11 +56,11 @@ msgid "Import completed."
 msgstr ""
 
 #: ../../include/RedDAV/RedBrowser.php:107
-#: ../../include/RedDAV/RedBrowser.php:265
+#: ../../include/RedDAV/RedBrowser.php:239
 msgid "parent"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2490
+#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2509
 msgid "Collection"
 msgstr ""
 
@@ -126,72 +84,62 @@ msgstr ""
 msgid "Schedule Outbox"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:164 ../../include/apps.php:355
-#: ../../include/apps.php:410 ../../include/conversation.php:1023
-#: ../../mod/photos.php:747 ../../mod/photos.php:1186
+#: ../../include/RedDAV/RedBrowser.php:164 ../../include/apps.php:360
+#: ../../include/apps.php:415 ../../include/conversation.php:1023
+#: ../../mod/photos.php:756 ../../mod/photos.php:1195
 msgid "Unknown"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:227
-#, php-format
-msgid "%1$s used"
-msgstr ""
-
-#: ../../include/RedDAV/RedBrowser.php:232
-#, php-format
-msgid "%1$s used of %2$s (%3$s&#37;)"
-msgstr ""
-
-#: ../../include/RedDAV/RedBrowser.php:251 ../../include/apps.php:135
+#: ../../include/RedDAV/RedBrowser.php:226 ../../include/apps.php:135
 #: ../../include/conversation.php:1613 ../../include/nav.php:93
 #: ../../mod/fbrowser.php:114
 msgid "Files"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:253
+#: ../../include/RedDAV/RedBrowser.php:227
 msgid "Total"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:255
+#: ../../include/RedDAV/RedBrowser.php:229
 msgid "Shared"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:256
+#: ../../include/RedDAV/RedBrowser.php:230
 #: ../../include/RedDAV/RedBrowser.php:303 ../../mod/layouts.php:175
 #: ../../mod/menu.php:114 ../../mod/new_channel.php:121
 #: ../../mod/webpages.php:180 ../../mod/blocks.php:152
 msgid "Create"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:257
-#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/photos.php:772
-#: ../../mod/photos.php:1305 ../../mod/profile_photo.php:450
+#: ../../include/RedDAV/RedBrowser.php:231
+#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/photos.php:781
+#: ../../mod/photos.php:1314 ../../mod/profile_photo.php:450
 msgid "Upload"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:261 ../../mod/admin.php:948
+#: ../../include/RedDAV/RedBrowser.php:235 ../../mod/admin.php:948
 #: ../../mod/settings.php:585 ../../mod/settings.php:611
 #: ../../mod/sharedwithme.php:95
 msgid "Name"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:262
+#: ../../include/RedDAV/RedBrowser.php:236
 msgid "Type"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:263 ../../mod/sharedwithme.php:97
+#: ../../include/RedDAV/RedBrowser.php:237 ../../mod/sharedwithme.php:97
 msgid "Size"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/sharedwithme.php:98
+#: ../../include/RedDAV/RedBrowser.php:238 ../../mod/sharedwithme.php:98
 msgid "Last Modified"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:266 ../../include/menu.php:108
+#: ../../include/RedDAV/RedBrowser.php:240 ../../include/menu.php:108
 #: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
-#: ../../include/apps.php:254 ../../include/ItemObject.php:100
-#: ../../mod/layouts.php:183 ../../mod/editpost.php:113
-#: ../../mod/editblock.php:135 ../../mod/menu.php:108
+#: ../../include/apps.php:259 ../../include/ItemObject.php:100
+#: ../../mod/layouts.php:183 ../../mod/editblock.php:135
+#: ../../mod/editpost.php:113 ../../mod/menu.php:108
 #: ../../mod/webpages.php:181 ../../mod/blocks.php:153 ../../mod/thing.php:257
 #: ../../mod/settings.php:645 ../../mod/connections.php:235
 #: ../../mod/connections.php:248 ../../mod/connections.php:267
@@ -199,16 +147,30 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:267 ../../include/apps.php:255
+#: ../../include/RedDAV/RedBrowser.php:241 ../../include/apps.php:260
 #: ../../include/ItemObject.php:120 ../../include/conversation.php:657
-#: ../../mod/connedit.php:547 ../../mod/editblock.php:181
-#: ../../mod/admin.php:783 ../../mod/admin.php:942 ../../mod/photos.php:1117
+#: ../../mod/connedit.php:546 ../../mod/photos.php:1126
+#: ../../mod/editblock.php:181 ../../mod/admin.php:783 ../../mod/admin.php:942
 #: ../../mod/webpages.php:183 ../../mod/blocks.php:155 ../../mod/thing.php:258
 #: ../../mod/settings.php:646 ../../mod/editlayout.php:179
 #: ../../mod/editwebpage.php:223 ../../mod/group.php:173
 msgid "Delete"
 msgstr ""
 
+#: ../../include/RedDAV/RedBrowser.php:282
+#, php-format
+msgid "You are using %1$s of your available file storage."
+msgstr ""
+
+#: ../../include/RedDAV/RedBrowser.php:287
+#, php-format
+msgid "You are using %1$s of %2$s available file storage. (%3$s&#37;)"
+msgstr ""
+
+#: ../../include/RedDAV/RedBrowser.php:299
+msgid "WARNING:"
+msgstr ""
+
 #: ../../include/RedDAV/RedBrowser.php:302
 msgid "Create new folder"
 msgstr ""
@@ -362,6 +324,50 @@ msgstr ""
 msgid "Room not found."
 msgstr ""
 
+#: ../../include/chat.php:133 ../../include/items.php:4376
+#: ../../include/photos.php:26 ../../include/attach.php:137
+#: ../../include/attach.php:185 ../../include/attach.php:248
+#: ../../include/attach.php:262 ../../include/attach.php:269
+#: ../../include/attach.php:334 ../../include/attach.php:348
+#: ../../include/attach.php:355 ../../include/attach.php:433
+#: ../../include/attach.php:875 ../../include/attach.php:946
+#: ../../include/attach.php:1098 ../../mod/achievements.php:30
+#: ../../mod/fsuggest.php:78 ../../mod/authtest.php:13
+#: ../../mod/bookmarks.php:48 ../../mod/block.php:22 ../../mod/block.php:72
+#: ../../mod/id.php:71 ../../mod/like.php:177 ../../mod/common.php:35
+#: ../../mod/mitem.php:111 ../../mod/connedit.php:347 ../../mod/mood.php:112
+#: ../../mod/photos.php:70 ../../mod/filestorage.php:18
+#: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88
+#: ../../mod/filestorage.php:115 ../../mod/layouts.php:69
+#: ../../mod/layouts.php:76 ../../mod/layouts.php:87 ../../mod/poke.php:133
+#: ../../mod/network.php:12 ../../mod/chat.php:94 ../../mod/chat.php:99
+#: ../../mod/rate.php:111 ../../mod/mail.php:118 ../../mod/editblock.php:65
+#: ../../mod/editpost.php:13 ../../mod/appman.php:66 ../../mod/profile.php:64
+#: ../../mod/profile.php:72 ../../mod/menu.php:74 ../../mod/page.php:31
+#: ../../mod/page.php:86 ../../mod/new_channel.php:68
+#: ../../mod/new_channel.php:99 ../../mod/notifications.php:66
+#: ../../mod/pdledit.php:21 ../../mod/events.php:256
+#: ../../mod/profile_photo.php:338 ../../mod/profile_photo.php:351
+#: ../../mod/item.php:205 ../../mod/item.php:213 ../../mod/item.php:1002
+#: ../../mod/message.php:16 ../../mod/webpages.php:69
+#: ../../mod/register.php:72 ../../mod/blocks.php:69 ../../mod/blocks.php:76
+#: ../../mod/service_limits.php:7 ../../mod/sources.php:66
+#: ../../mod/regmod.php:17 ../../mod/channel.php:100 ../../mod/channel.php:214
+#: ../../mod/channel.php:254 ../../mod/thing.php:271 ../../mod/thing.php:291
+#: ../../mod/thing.php:328 ../../mod/invite.php:13 ../../mod/invite.php:104
+#: ../../mod/viewsrc.php:14 ../../mod/settings.php:565 ../../mod/manage.php:6
+#: ../../mod/api.php:26 ../../mod/api.php:31 ../../mod/connections.php:29
+#: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
+#: ../../mod/editwebpage.php:64 ../../mod/editwebpage.php:86
+#: ../../mod/editwebpage.php:101 ../../mod/editwebpage.php:125
+#: ../../mod/group.php:9 ../../mod/viewconnections.php:22
+#: ../../mod/viewconnections.php:27 ../../mod/locs.php:82
+#: ../../mod/setup.php:227 ../../mod/sharedwithme.php:7
+#: ../../mod/suggest.php:26 ../../mod/profiles.php:188
+#: ../../mod/profiles.php:576 ../../index.php:178 ../../index.php:361
+msgid "Permission denied."
+msgstr ""
+
 #: ../../include/chat.php:143
 msgid "Room is full"
 msgstr ""
@@ -563,8 +569,8 @@ msgstr ""
 
 #: ../../include/features.php:58
 msgid ""
-"Include large (640px) photo thumbnails in posts. If not enabled, use small "
-"(320px) photo thumbnails"
+"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
+"(640px) photo thumbnails"
 msgstr ""
 
 #: ../../include/features.php:59 ../../include/widgets.php:545
@@ -722,12 +728,12 @@ msgstr ""
 msgid "Delete this item?"
 msgstr ""
 
-#: ../../include/js_strings.php:6 ../../include/ItemObject.php:683
-#: ../../mod/photos.php:1035 ../../mod/photos.php:1153
+#: ../../include/js_strings.php:6 ../../include/ItemObject.php:681
+#: ../../mod/photos.php:1044 ../../mod/photos.php:1162
 msgid "Comment"
 msgstr ""
 
-#: ../../include/js_strings.php:7 ../../include/ItemObject.php:400
+#: ../../include/js_strings.php:7 ../../include/ItemObject.php:398
 msgid "[+] show all"
 msgstr ""
 
@@ -779,7 +785,7 @@ msgstr ""
 msgid "Rate This Channel (this is public)"
 msgstr ""
 
-#: ../../include/js_strings.php:20 ../../mod/connedit.php:667
+#: ../../include/js_strings.php:20 ../../mod/connedit.php:666
 #: ../../mod/rate.php:157
 msgid "Rating"
 msgstr ""
@@ -788,19 +794,19 @@ msgstr ""
 msgid "Describe (optional)"
 msgstr ""
 
-#: ../../include/js_strings.php:22 ../../include/ItemObject.php:684
+#: ../../include/js_strings.php:22 ../../include/ItemObject.php:682
 #: ../../mod/fsuggest.php:108 ../../mod/mitem.php:231
-#: ../../mod/connedit.php:688 ../../mod/mood.php:135 ../../mod/pconfig.php:108
-#: ../../mod/filestorage.php:156 ../../mod/poke.php:171 ../../mod/chat.php:181
-#: ../../mod/chat.php:209 ../../mod/rate.php:168 ../../mod/mail.php:371
+#: ../../mod/connedit.php:687 ../../mod/mood.php:135 ../../mod/pconfig.php:108
+#: ../../mod/photos.php:634 ../../mod/photos.php:1005
+#: ../../mod/photos.php:1045 ../../mod/photos.php:1163
+#: ../../mod/filestorage.php:156 ../../mod/poke.php:171 ../../mod/chat.php:184
+#: ../../mod/chat.php:213 ../../mod/rate.php:168 ../../mod/mail.php:371
 #: ../../mod/admin.php:411 ../../mod/admin.php:776 ../../mod/admin.php:940
 #: ../../mod/admin.php:1072 ../../mod/admin.php:1266 ../../mod/admin.php:1351
-#: ../../mod/appman.php:99 ../../mod/pdledit.php:58 ../../mod/photos.php:625
-#: ../../mod/photos.php:996 ../../mod/photos.php:1036
-#: ../../mod/photos.php:1154 ../../mod/events.php:534 ../../mod/events.php:710
-#: ../../mod/sources.php:104 ../../mod/sources.php:138
-#: ../../mod/import.php:517 ../../mod/thing.php:313 ../../mod/thing.php:359
-#: ../../mod/invite.php:142 ../../mod/settings.php:583
+#: ../../mod/appman.php:99 ../../mod/pdledit.php:58 ../../mod/events.php:534
+#: ../../mod/events.php:710 ../../mod/sources.php:104
+#: ../../mod/sources.php:138 ../../mod/import.php:517 ../../mod/thing.php:313
+#: ../../mod/thing.php:359 ../../mod/invite.php:142 ../../mod/settings.php:583
 #: ../../mod/settings.php:695 ../../mod/settings.php:723
 #: ../../mod/settings.php:746 ../../mod/settings.php:831
 #: ../../mod/settings.php:1020 ../../mod/xchan.php:11 ../../mod/group.php:81
@@ -1191,69 +1197,69 @@ msgstr ""
 msgid "Permission denied"
 msgstr ""
 
-#: ../../include/items.php:1129 ../../include/items.php:1175
+#: ../../include/items.php:1128 ../../include/items.php:1174
 msgid "(Unknown)"
 msgstr ""
 
-#: ../../include/items.php:1373
+#: ../../include/items.php:1371
 msgid "Visible to anybody on the internet."
 msgstr ""
 
-#: ../../include/items.php:1375
+#: ../../include/items.php:1373
 msgid "Visible to you only."
 msgstr ""
 
-#: ../../include/items.php:1377
+#: ../../include/items.php:1375
 msgid "Visible to anybody in this network."
 msgstr ""
 
-#: ../../include/items.php:1379
+#: ../../include/items.php:1377
 msgid "Visible to anybody authenticated."
 msgstr ""
 
-#: ../../include/items.php:1381
+#: ../../include/items.php:1379
 #, php-format
 msgid "Visible to anybody on %s."
 msgstr ""
 
-#: ../../include/items.php:1383
+#: ../../include/items.php:1381
 msgid "Visible to all connections."
 msgstr ""
 
-#: ../../include/items.php:1385
+#: ../../include/items.php:1383
 msgid "Visible to approved connections."
 msgstr ""
 
-#: ../../include/items.php:1387
+#: ../../include/items.php:1385
 msgid "Visible to specific connections."
 msgstr ""
 
-#: ../../include/items.php:4299 ../../mod/display.php:36
+#: ../../include/items.php:4297 ../../mod/display.php:36
 #: ../../mod/filestorage.php:27 ../../mod/admin.php:127
 #: ../../mod/admin.php:979 ../../mod/admin.php:1179 ../../mod/thing.php:86
 #: ../../mod/viewsrc.php:20
 msgid "Item not found."
 msgstr ""
 
-#: ../../include/items.php:4808 ../../mod/group.php:38 ../../mod/group.php:137
+#: ../../include/items.php:4806 ../../mod/group.php:38 ../../mod/group.php:137
 msgid "Collection not found."
 msgstr ""
 
-#: ../../include/items.php:4824
+#: ../../include/items.php:4822
 msgid "Collection is empty."
 msgstr ""
 
-#: ../../include/items.php:4831
+#: ../../include/items.php:4829
 #, php-format
 msgid "Collection: %s"
 msgstr ""
 
-#: ../../include/items.php:4841 ../../mod/connedit.php:658
+#: ../../include/items.php:4839 ../../mod/connedit.php:657
 #, php-format
 msgid "Connection: %s"
 msgstr ""
 
-#: ../../include/items.php:4843
+#: ../../include/items.php:4841
 msgid "Connection not found."
 msgstr ""
 
@@ -1308,14 +1314,15 @@ msgstr ""
 msgid "Don't show"
 msgstr ""
 
-#: ../../include/acl_selectors.php:247 ../../mod/filestorage.php:147
-#: ../../mod/chat.php:207 ../../mod/photos.php:619 ../../mod/photos.php:989
-#: ../../mod/events.php:708 ../../mod/thing.php:310 ../../mod/thing.php:356
+#: ../../include/acl_selectors.php:247 ../../mod/photos.php:628
+#: ../../mod/photos.php:998 ../../mod/filestorage.php:147
+#: ../../mod/chat.php:211 ../../mod/events.php:708 ../../mod/thing.php:310
+#: ../../mod/thing.php:356
 msgid "Permissions"
 msgstr ""
 
-#: ../../include/acl_selectors.php:248 ../../include/ItemObject.php:371
-#: ../../mod/photos.php:1206
+#: ../../include/acl_selectors.php:248 ../../include/ItemObject.php:369
+#: ../../mod/photos.php:1215
 msgid "Close"
 msgstr ""
 
@@ -1332,6 +1339,31 @@ msgstr ""
 msgid "Cloned channel not found. Import failed."
 msgstr ""
 
+#: ../../include/photos.php:109
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
+msgstr ""
+
+#: ../../include/photos.php:116
+msgid "Image file is empty."
+msgstr ""
+
+#: ../../include/photos.php:143 ../../mod/profile_photo.php:222
+msgid "Unable to process image"
+msgstr ""
+
+#: ../../include/photos.php:232
+msgid "Photo storage failed."
+msgstr ""
+
+#: ../../include/photos.php:452 ../../include/conversation.php:1609
+msgid "Photo Albums"
+msgstr ""
+
+#: ../../include/photos.php:456
+msgid "Upload New Photos"
+msgstr ""
+
 #: ../../include/notify.php:20
 msgid "created a new post"
 msgstr ""
@@ -1350,9 +1382,9 @@ msgstr ""
 msgid "View"
 msgstr ""
 
-#: ../../include/page_widgets.php:40 ../../include/ItemObject.php:693
-#: ../../include/conversation.php:1160 ../../mod/editpost.php:150
-#: ../../mod/editblock.php:171 ../../mod/photos.php:1037
+#: ../../include/page_widgets.php:40 ../../include/ItemObject.php:691
+#: ../../include/conversation.php:1160 ../../mod/photos.php:1046
+#: ../../mod/editblock.php:171 ../../mod/editpost.php:150
 #: ../../mod/events.php:707 ../../mod/webpages.php:188
 #: ../../mod/editwebpage.php:212
 msgid "Preview"
@@ -1381,7 +1413,7 @@ msgid "Edited"
 msgstr ""
 
 #: ../../include/photo/photo_driver.php:705 ../../mod/photos.php:94
-#: ../../mod/photos.php:687 ../../mod/profile_photo.php:146
+#: ../../mod/photos.php:696 ../../mod/profile_photo.php:146
 #: ../../mod/profile_photo.php:236 ../../mod/profile_photo.php:376
 msgid "Profile Photos"
 msgstr ""
@@ -1534,7 +1566,7 @@ msgstr ""
 
 #: ../../include/profile_selectors.php:80 ../../include/identity.php:390
 #: ../../include/identity.php:391 ../../include/identity.php:398
-#: ../../include/widgets.php:429 ../../mod/connedit.php:569
+#: ../../include/widgets.php:429 ../../mod/connedit.php:568
 #: ../../mod/settings.php:337 ../../mod/settings.php:341
 #: ../../mod/settings.php:342 ../../mod/settings.php:345
 #: ../../mod/settings.php:356
@@ -1639,29 +1671,11 @@ msgstr ""
 msgid "Embedding disabled"
 msgstr ""
 
-#: ../../include/event.php:22 ../../include/bb2diaspora.php:459
-msgid "l F d, Y \\@ g:i A"
-msgstr ""
-
-#: ../../include/event.php:30 ../../include/bb2diaspora.php:465
-msgid "Starts:"
-msgstr ""
-
-#: ../../include/event.php:40 ../../include/bb2diaspora.php:473
-msgid "Finishes:"
-msgstr ""
-
-#: ../../include/event.php:50 ../../include/bb2diaspora.php:481
-#: ../../include/identity.php:1016 ../../mod/directory.php:302
-#: ../../mod/events.php:701
-msgid "Location:"
-msgstr ""
-
 #: ../../include/event.php:766
 msgid "This event has been added to your calendar."
 msgstr ""
 
-#: ../../include/event.php:896 ../../include/text.php:1827
+#: ../../include/event.php:896 ../../include/text.php:1846
 #: ../../include/conversation.php:123 ../../mod/like.php:363
 #: ../../mod/tagger.php:47 ../../mod/events.php:245
 msgid "event"
@@ -1806,290 +1820,19 @@ msgstr ""
 msgid "Profile Photo"
 msgstr ""
 
-#: ../../include/apps.php:247 ../../mod/settings.php:84
+#: ../../include/apps.php:252 ../../mod/settings.php:84
 #: ../../mod/settings.php:609
 msgid "Update"
 msgstr ""
 
-#: ../../include/apps.php:247
+#: ../../include/apps.php:252
 msgid "Install"
 msgstr ""
 
-#: ../../include/apps.php:252
+#: ../../include/apps.php:257
 msgid "Purchase"
 msgstr ""
 
-#: ../../include/text.php:391
-msgid "prev"
-msgstr ""
-
-#: ../../include/text.php:393
-msgid "first"
-msgstr ""
-
-#: ../../include/text.php:422
-msgid "last"
-msgstr ""
-
-#: ../../include/text.php:425
-msgid "next"
-msgstr ""
-
-#: ../../include/text.php:435
-msgid "older"
-msgstr ""
-
-#: ../../include/text.php:437
-msgid "newer"
-msgstr ""
-
-#: ../../include/text.php:775
-msgid "No connections"
-msgstr ""
-
-#: ../../include/text.php:787
-#, php-format
-msgid "%d Connection"
-msgid_plural "%d Connections"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/text.php:800 ../../mod/viewconnections.php:101
-msgid "View Connections"
-msgstr ""
-
-#: ../../include/text.php:858 ../../include/text.php:870
-#: ../../include/widgets.php:191 ../../mod/filer.php:49
-#: ../../mod/admin.php:1411 ../../mod/admin.php:1431 ../../mod/rbmark.php:28
-#: ../../mod/rbmark.php:98
-msgid "Save"
-msgstr ""
-
-#: ../../include/text.php:933
-msgid "poke"
-msgstr ""
-
-#: ../../include/text.php:933 ../../include/conversation.php:243
-msgid "poked"
-msgstr ""
-
-#: ../../include/text.php:934
-msgid "ping"
-msgstr ""
-
-#: ../../include/text.php:934
-msgid "pinged"
-msgstr ""
-
-#: ../../include/text.php:935
-msgid "prod"
-msgstr ""
-
-#: ../../include/text.php:935
-msgid "prodded"
-msgstr ""
-
-#: ../../include/text.php:936
-msgid "slap"
-msgstr ""
-
-#: ../../include/text.php:936
-msgid "slapped"
-msgstr ""
-
-#: ../../include/text.php:937
-msgid "finger"
-msgstr ""
-
-#: ../../include/text.php:937
-msgid "fingered"
-msgstr ""
-
-#: ../../include/text.php:938
-msgid "rebuff"
-msgstr ""
-
-#: ../../include/text.php:938
-msgid "rebuffed"
-msgstr ""
-
-#: ../../include/text.php:948
-msgid "happy"
-msgstr ""
-
-#: ../../include/text.php:949
-msgid "sad"
-msgstr ""
-
-#: ../../include/text.php:950
-msgid "mellow"
-msgstr ""
-
-#: ../../include/text.php:951
-msgid "tired"
-msgstr ""
-
-#: ../../include/text.php:952
-msgid "perky"
-msgstr ""
-
-#: ../../include/text.php:953
-msgid "angry"
-msgstr ""
-
-#: ../../include/text.php:954
-msgid "stupified"
-msgstr ""
-
-#: ../../include/text.php:955
-msgid "puzzled"
-msgstr ""
-
-#: ../../include/text.php:956
-msgid "interested"
-msgstr ""
-
-#: ../../include/text.php:957
-msgid "bitter"
-msgstr ""
-
-#: ../../include/text.php:958
-msgid "cheerful"
-msgstr ""
-
-#: ../../include/text.php:959
-msgid "alive"
-msgstr ""
-
-#: ../../include/text.php:960
-msgid "annoyed"
-msgstr ""
-
-#: ../../include/text.php:961
-msgid "anxious"
-msgstr ""
-
-#: ../../include/text.php:962
-msgid "cranky"
-msgstr ""
-
-#: ../../include/text.php:963
-msgid "disturbed"
-msgstr ""
-
-#: ../../include/text.php:964
-msgid "frustrated"
-msgstr ""
-
-#: ../../include/text.php:965
-msgid "depressed"
-msgstr ""
-
-#: ../../include/text.php:966
-msgid "motivated"
-msgstr ""
-
-#: ../../include/text.php:967
-msgid "relaxed"
-msgstr ""
-
-#: ../../include/text.php:968
-msgid "surprised"
-msgstr ""
-
-#: ../../include/text.php:1144
-msgid "May"
-msgstr ""
-
-#: ../../include/text.php:1221 ../../include/text.php:1225
-msgid "Unknown Attachment"
-msgstr ""
-
-#: ../../include/text.php:1227
-msgid "Attachment"
-msgstr ""
-
-#: ../../include/text.php:1227
-msgid "Size Unknown"
-msgstr ""
-
-#: ../../include/text.php:1263
-msgid "remove category"
-msgstr ""
-
-#: ../../include/text.php:1340
-msgid "remove from file"
-msgstr ""
-
-#: ../../include/text.php:1425 ../../include/text.php:1436
-msgid "Click to open/close"
-msgstr ""
-
-#: ../../include/text.php:1601 ../../mod/events.php:497
-msgid "Link to Source"
-msgstr ""
-
-#: ../../include/text.php:1622 ../../include/text.php:1693
-msgid "default"
-msgstr ""
-
-#: ../../include/text.php:1630
-msgid "Page layout"
-msgstr ""
-
-#: ../../include/text.php:1630
-msgid "You can create your own with the layouts tool"
-msgstr ""
-
-#: ../../include/text.php:1671
-msgid "Page content type"
-msgstr ""
-
-#: ../../include/text.php:1705
-msgid "Select an alternate language"
-msgstr ""
-
-#: ../../include/text.php:1824 ../../include/conversation.php:120
-#: ../../mod/like.php:361 ../../mod/tagger.php:43 ../../mod/subthread.php:72
-#: ../../mod/subthread.php:172
-msgid "photo"
-msgstr ""
-
-#: ../../include/text.php:1830 ../../include/conversation.php:148
-#: ../../mod/like.php:361 ../../mod/subthread.php:72
-#: ../../mod/subthread.php:172
-msgid "status"
-msgstr ""
-
-#: ../../include/text.php:1832 ../../include/conversation.php:150
-#: ../../mod/tagger.php:53
-msgid "comment"
-msgstr ""
-
-#: ../../include/text.php:1837
-msgid "activity"
-msgstr ""
-
-#: ../../include/text.php:2132
-msgid "Design Tools"
-msgstr ""
-
-#: ../../include/text.php:2135 ../../mod/blocks.php:147
-msgid "Blocks"
-msgstr ""
-
-#: ../../include/text.php:2136 ../../mod/menu.php:103
-msgid "Menus"
-msgstr ""
-
-#: ../../include/text.php:2137 ../../mod/layouts.php:174
-msgid "Layouts"
-msgstr ""
-
-#: ../../include/text.php:2138
-msgid "Pages"
-msgstr ""
-
 #: ../../include/auth.php:131
 msgid "Logged out."
 msgstr ""
@@ -2280,14 +2023,6 @@ msgstr ""
 msgid "[Hubzilla:Notify]"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:373
-msgid "Attachments:"
-msgstr ""
-
-#: ../../include/bb2diaspora.php:461
-msgid "$Projectname event notification:"
-msgstr ""
-
 #: ../../include/ItemObject.php:89 ../../include/conversation.php:664
 msgid "Private Message"
 msgstr ""
@@ -2325,14 +2060,14 @@ msgid "I abstain"
 msgstr ""
 
 #: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187
-#: ../../include/conversation.php:1681 ../../mod/photos.php:1070
-#: ../../mod/photos.php:1082
+#: ../../include/conversation.php:1681 ../../mod/photos.php:1079
+#: ../../mod/photos.php:1091
 msgid "View all"
 msgstr ""
 
 #: ../../include/ItemObject.php:179 ../../include/identity.php:1276
 #: ../../include/taxonomy.php:403 ../../include/conversation.php:1705
-#: ../../mod/photos.php:1074
+#: ../../mod/photos.php:1083
 msgctxt "noun"
 msgid "Like"
 msgid_plural "Likes"
@@ -2340,7 +2075,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../../include/ItemObject.php:184 ../../include/conversation.php:1708
-#: ../../mod/photos.php:1079
+#: ../../mod/photos.php:1088
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
@@ -2375,7 +2110,7 @@ msgstr ""
 msgid "Add Tag"
 msgstr ""
 
-#: ../../include/ItemObject.php:254 ../../mod/photos.php:1014
+#: ../../include/ItemObject.php:254 ../../mod/photos.php:1023
 msgid "I like this (toggle)"
 msgstr ""
 
@@ -2383,7 +2118,7 @@ msgstr ""
 msgid "like"
 msgstr ""
 
-#: ../../include/ItemObject.php:255 ../../mod/photos.php:1015
+#: ../../include/ItemObject.php:255 ../../mod/photos.php:1024
 msgid "I don't like this (toggle)"
 msgstr ""
 
@@ -2406,127 +2141,398 @@ msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/ItemObject.php:303 ../../include/ItemObject.php:304
+#: ../../include/ItemObject.php:301 ../../include/ItemObject.php:302
 #, php-format
 msgid "View %s's profile - %s"
 msgstr ""
 
-#: ../../include/ItemObject.php:307
+#: ../../include/ItemObject.php:305
 msgid "to"
 msgstr ""
 
-#: ../../include/ItemObject.php:308
+#: ../../include/ItemObject.php:306
 msgid "via"
 msgstr ""
 
-#: ../../include/ItemObject.php:309
+#: ../../include/ItemObject.php:307
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../include/ItemObject.php:310
+#: ../../include/ItemObject.php:308
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../include/ItemObject.php:313
+#: ../../include/ItemObject.php:311
 msgid "Delivery Report"
 msgstr ""
 
-#: ../../include/ItemObject.php:322 ../../include/conversation.php:718
+#: ../../include/ItemObject.php:320 ../../include/conversation.php:718
 #, php-format
 msgid "from %s"
 msgstr ""
 
-#: ../../include/ItemObject.php:325 ../../include/conversation.php:721
+#: ../../include/ItemObject.php:323 ../../include/conversation.php:721
 #, php-format
 msgid "last edited: %s"
 msgstr ""
 
-#: ../../include/ItemObject.php:326 ../../include/conversation.php:722
+#: ../../include/ItemObject.php:324 ../../include/conversation.php:722
 #, php-format
 msgid "Expires: %s"
 msgstr ""
 
-#: ../../include/ItemObject.php:349
+#: ../../include/ItemObject.php:347
 msgid "Save Bookmarks"
 msgstr ""
 
-#: ../../include/ItemObject.php:350
+#: ../../include/ItemObject.php:348
 msgid "Add to Calendar"
 msgstr ""
 
-#: ../../include/ItemObject.php:359
+#: ../../include/ItemObject.php:357
 msgid "Mark all seen"
 msgstr ""
 
-#: ../../include/ItemObject.php:365 ../../mod/photos.php:1200
+#: ../../include/ItemObject.php:363 ../../mod/photos.php:1209
 msgctxt "noun"
 msgid "Likes"
 msgstr ""
 
-#: ../../include/ItemObject.php:366 ../../mod/photos.php:1201
+#: ../../include/ItemObject.php:364 ../../mod/photos.php:1210
 msgctxt "noun"
 msgid "Dislikes"
 msgstr ""
 
-#: ../../include/ItemObject.php:376 ../../include/conversation.php:739
-#: ../../include/conversation.php:1214 ../../mod/editpost.php:130
-#: ../../mod/editblock.php:150 ../../mod/photos.php:1017
+#: ../../include/ItemObject.php:374 ../../include/conversation.php:739
+#: ../../include/conversation.php:1214 ../../mod/photos.php:1026
+#: ../../mod/editblock.php:150 ../../mod/editpost.php:130
 #: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:190
 msgid "Please wait"
 msgstr ""
 
-#: ../../include/ItemObject.php:681 ../../mod/photos.php:1033
-#: ../../mod/photos.php:1151
+#: ../../include/ItemObject.php:679 ../../mod/photos.php:1042
+#: ../../mod/photos.php:1160
 msgid "This is you"
 msgstr ""
 
-#: ../../include/ItemObject.php:685 ../../include/conversation.php:1186
-#: ../../mod/editpost.php:114 ../../mod/editblock.php:136
+#: ../../include/ItemObject.php:683 ../../include/conversation.php:1186
+#: ../../mod/editblock.php:136 ../../mod/editpost.php:114
 #: ../../mod/editlayout.php:135 ../../mod/editwebpage.php:177
 msgid "Bold"
 msgstr ""
 
-#: ../../include/ItemObject.php:686 ../../include/conversation.php:1187
-#: ../../mod/editpost.php:115 ../../mod/editblock.php:137
+#: ../../include/ItemObject.php:684 ../../include/conversation.php:1187
+#: ../../mod/editblock.php:137 ../../mod/editpost.php:115
 #: ../../mod/editlayout.php:136 ../../mod/editwebpage.php:178
 msgid "Italic"
 msgstr ""
 
-#: ../../include/ItemObject.php:687 ../../include/conversation.php:1188
-#: ../../mod/editpost.php:116 ../../mod/editblock.php:138
+#: ../../include/ItemObject.php:685 ../../include/conversation.php:1188
+#: ../../mod/editblock.php:138 ../../mod/editpost.php:116
 #: ../../mod/editlayout.php:137 ../../mod/editwebpage.php:179
 msgid "Underline"
 msgstr ""
 
-#: ../../include/ItemObject.php:688 ../../include/conversation.php:1189
-#: ../../mod/editpost.php:117 ../../mod/editblock.php:139
+#: ../../include/ItemObject.php:686 ../../include/conversation.php:1189
+#: ../../mod/editblock.php:139 ../../mod/editpost.php:117
 #: ../../mod/editlayout.php:138 ../../mod/editwebpage.php:180
 msgid "Quote"
 msgstr ""
 
-#: ../../include/ItemObject.php:689 ../../include/conversation.php:1190
-#: ../../mod/editpost.php:118 ../../mod/editblock.php:140
+#: ../../include/ItemObject.php:687 ../../include/conversation.php:1190
+#: ../../mod/editblock.php:140 ../../mod/editpost.php:118
 #: ../../mod/editlayout.php:139 ../../mod/editwebpage.php:181
 msgid "Code"
 msgstr ""
 
-#: ../../include/ItemObject.php:690
+#: ../../include/ItemObject.php:688
 msgid "Image"
 msgstr ""
 
-#: ../../include/ItemObject.php:691
+#: ../../include/ItemObject.php:689
 msgid "Insert Link"
 msgstr ""
 
-#: ../../include/ItemObject.php:692
+#: ../../include/ItemObject.php:690
 msgid "Video"
 msgstr ""
 
-#: ../../include/ItemObject.php:696 ../../include/conversation.php:1241
+#: ../../include/ItemObject.php:694 ../../include/conversation.php:1241
 #: ../../mod/mail.php:247 ../../mod/mail.php:376 ../../mod/editpost.php:158
 msgid "Encrypt text"
 msgstr ""
 
+#: ../../include/text.php:391
+msgid "prev"
+msgstr ""
+
+#: ../../include/text.php:393
+msgid "first"
+msgstr ""
+
+#: ../../include/text.php:422
+msgid "last"
+msgstr ""
+
+#: ../../include/text.php:425
+msgid "next"
+msgstr ""
+
+#: ../../include/text.php:435
+msgid "older"
+msgstr ""
+
+#: ../../include/text.php:437
+msgid "newer"
+msgstr ""
+
+#: ../../include/text.php:775
+msgid "No connections"
+msgstr ""
+
+#: ../../include/text.php:787
+#, php-format
+msgid "%d Connection"
+msgid_plural "%d Connections"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/text.php:800 ../../mod/viewconnections.php:101
+msgid "View Connections"
+msgstr ""
+
+#: ../../include/text.php:858 ../../include/text.php:870
+#: ../../include/widgets.php:191 ../../mod/filer.php:49
+#: ../../mod/admin.php:1411 ../../mod/admin.php:1431 ../../mod/rbmark.php:28
+#: ../../mod/rbmark.php:98
+msgid "Save"
+msgstr ""
+
+#: ../../include/text.php:933
+msgid "poke"
+msgstr ""
+
+#: ../../include/text.php:933 ../../include/conversation.php:243
+msgid "poked"
+msgstr ""
+
+#: ../../include/text.php:934
+msgid "ping"
+msgstr ""
+
+#: ../../include/text.php:934
+msgid "pinged"
+msgstr ""
+
+#: ../../include/text.php:935
+msgid "prod"
+msgstr ""
+
+#: ../../include/text.php:935
+msgid "prodded"
+msgstr ""
+
+#: ../../include/text.php:936
+msgid "slap"
+msgstr ""
+
+#: ../../include/text.php:936
+msgid "slapped"
+msgstr ""
+
+#: ../../include/text.php:937
+msgid "finger"
+msgstr ""
+
+#: ../../include/text.php:937
+msgid "fingered"
+msgstr ""
+
+#: ../../include/text.php:938
+msgid "rebuff"
+msgstr ""
+
+#: ../../include/text.php:938
+msgid "rebuffed"
+msgstr ""
+
+#: ../../include/text.php:948
+msgid "happy"
+msgstr ""
+
+#: ../../include/text.php:949
+msgid "sad"
+msgstr ""
+
+#: ../../include/text.php:950
+msgid "mellow"
+msgstr ""
+
+#: ../../include/text.php:951
+msgid "tired"
+msgstr ""
+
+#: ../../include/text.php:952
+msgid "perky"
+msgstr ""
+
+#: ../../include/text.php:953
+msgid "angry"
+msgstr ""
+
+#: ../../include/text.php:954
+msgid "stupified"
+msgstr ""
+
+#: ../../include/text.php:955
+msgid "puzzled"
+msgstr ""
+
+#: ../../include/text.php:956
+msgid "interested"
+msgstr ""
+
+#: ../../include/text.php:957
+msgid "bitter"
+msgstr ""
+
+#: ../../include/text.php:958
+msgid "cheerful"
+msgstr ""
+
+#: ../../include/text.php:959
+msgid "alive"
+msgstr ""
+
+#: ../../include/text.php:960
+msgid "annoyed"
+msgstr ""
+
+#: ../../include/text.php:961
+msgid "anxious"
+msgstr ""
+
+#: ../../include/text.php:962
+msgid "cranky"
+msgstr ""
+
+#: ../../include/text.php:963
+msgid "disturbed"
+msgstr ""
+
+#: ../../include/text.php:964
+msgid "frustrated"
+msgstr ""
+
+#: ../../include/text.php:965
+msgid "depressed"
+msgstr ""
+
+#: ../../include/text.php:966
+msgid "motivated"
+msgstr ""
+
+#: ../../include/text.php:967
+msgid "relaxed"
+msgstr ""
+
+#: ../../include/text.php:968
+msgid "surprised"
+msgstr ""
+
+#: ../../include/text.php:1144
+msgid "May"
+msgstr ""
+
+#: ../../include/text.php:1221 ../../include/text.php:1225
+msgid "Unknown Attachment"
+msgstr ""
+
+#: ../../include/text.php:1227
+msgid "Attachment"
+msgstr ""
+
+#: ../../include/text.php:1227
+msgid "Size Unknown"
+msgstr ""
+
+#: ../../include/text.php:1263
+msgid "remove category"
+msgstr ""
+
+#: ../../include/text.php:1340
+msgid "remove from file"
+msgstr ""
+
+#: ../../include/text.php:1441 ../../include/text.php:1452
+msgid "Click to open/close"
+msgstr ""
+
+#: ../../include/text.php:1620 ../../mod/events.php:497
+msgid "Link to Source"
+msgstr ""
+
+#: ../../include/text.php:1641 ../../include/text.php:1712
+msgid "default"
+msgstr ""
+
+#: ../../include/text.php:1649
+msgid "Page layout"
+msgstr ""
+
+#: ../../include/text.php:1649
+msgid "You can create your own with the layouts tool"
+msgstr ""
+
+#: ../../include/text.php:1690
+msgid "Page content type"
+msgstr ""
+
+#: ../../include/text.php:1724
+msgid "Select an alternate language"
+msgstr ""
+
+#: ../../include/text.php:1843 ../../include/conversation.php:120
+#: ../../mod/like.php:361 ../../mod/tagger.php:43 ../../mod/subthread.php:72
+#: ../../mod/subthread.php:172
+msgid "photo"
+msgstr ""
+
+#: ../../include/text.php:1849 ../../include/conversation.php:148
+#: ../../mod/like.php:361 ../../mod/subthread.php:72
+#: ../../mod/subthread.php:172
+msgid "status"
+msgstr ""
+
+#: ../../include/text.php:1851 ../../include/conversation.php:150
+#: ../../mod/tagger.php:53
+msgid "comment"
+msgstr ""
+
+#: ../../include/text.php:1856
+msgid "activity"
+msgstr ""
+
+#: ../../include/text.php:2151
+msgid "Design Tools"
+msgstr ""
+
+#: ../../include/text.php:2154 ../../mod/blocks.php:147
+msgid "Blocks"
+msgstr ""
+
+#: ../../include/text.php:2155 ../../mod/menu.php:103
+msgid "Menus"
+msgstr ""
+
+#: ../../include/text.php:2156 ../../mod/layouts.php:174
+msgid "Layouts"
+msgstr ""
+
+#: ../../include/text.php:2157
+msgid "Pages"
+msgstr ""
+
 #: ../../include/bbcode.php:123 ../../include/bbcode.php:793
 #: ../../include/bbcode.php:796 ../../include/bbcode.php:801
 #: ../../include/bbcode.php:804 ../../include/bbcode.php:807
@@ -2678,7 +2684,7 @@ msgstr ""
 msgid "Channel was deleted and no longer exists."
 msgstr ""
 
-#: ../../include/follow.php:154
+#: ../../include/follow.php:152 ../../include/follow.php:180
 msgid "Protocol disabled."
 msgstr ""
 
@@ -2686,11 +2692,11 @@ msgstr ""
 msgid "Channel discovery failed."
 msgstr ""
 
-#: ../../include/follow.php:186
+#: ../../include/follow.php:196
 msgid "local account not found."
 msgstr ""
 
-#: ../../include/follow.php:210
+#: ../../include/follow.php:220
 msgid "Cannot connect to yourself."
 msgstr ""
 
@@ -2809,6 +2815,23 @@ msgstr ""
 msgid "add"
 msgstr ""
 
+#: ../../include/zot.php:683
+msgid "Invalid data packet"
+msgstr ""
+
+#: ../../include/zot.php:699
+msgid "Unable to verify channel signature"
+msgstr ""
+
+#: ../../include/zot.php:2235
+#, php-format
+msgid "Unable to verify site signature for %s"
+msgstr ""
+
+#: ../../include/zot.php:3555
+msgid "invalid target signature"
+msgstr ""
+
 #: ../../include/message.php:18
 msgid "No recipient provided."
 msgstr ""
@@ -3096,23 +3119,6 @@ msgstr ""
 msgid "dislikes"
 msgstr ""
 
-#: ../../include/zot.php:683
-msgid "Invalid data packet"
-msgstr ""
-
-#: ../../include/zot.php:699
-msgid "Unable to verify channel signature"
-msgstr ""
-
-#: ../../include/zot.php:2235
-#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr ""
-
-#: ../../include/zot.php:3549
-msgid "invalid target signature"
-msgstr ""
-
 #: ../../include/attach.php:243 ../../include/attach.php:329
 msgid "Item was not found."
 msgstr ""
@@ -3205,42 +3211,42 @@ msgctxt "mood"
 msgid "%1$s is %2$s"
 msgstr ""
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:1051
+#: ../../include/conversation.php:574 ../../mod/photos.php:1060
 msgctxt "title"
 msgid "Likes"
 msgstr ""
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:1051
+#: ../../include/conversation.php:574 ../../mod/photos.php:1060
 msgctxt "title"
 msgid "Dislikes"
 msgstr ""
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1052
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
 msgctxt "title"
 msgid "Agree"
 msgstr ""
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1052
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
 msgctxt "title"
 msgid "Disagree"
 msgstr ""
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1052
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
 msgctxt "title"
 msgid "Abstain"
 msgstr ""
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1053
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
 msgctxt "title"
 msgid "Attending"
 msgstr ""
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1053
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
 msgctxt "title"
 msgid "Not attending"
 msgstr ""
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1053
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
 msgctxt "title"
 msgid "Might attend"
 msgstr ""
@@ -3287,7 +3293,7 @@ msgid "View Status"
 msgstr ""
 
 #: ../../include/conversation.php:946 ../../include/nav.php:86
-#: ../../mod/connedit.php:494
+#: ../../mod/connedit.php:493
 msgid "View Profile"
 msgstr ""
 
@@ -3386,8 +3392,8 @@ msgstr ""
 msgid "Expires YYYY-MM-DD HH:MM"
 msgstr ""
 
-#: ../../include/conversation.php:1179 ../../mod/layouts.php:184
-#: ../../mod/photos.php:1016 ../../mod/webpages.php:182
+#: ../../include/conversation.php:1179 ../../mod/photos.php:1025
+#: ../../mod/layouts.php:184 ../../mod/webpages.php:182
 #: ../../mod/blocks.php:154
 msgid "Share"
 msgstr ""
@@ -3400,8 +3406,8 @@ msgstr ""
 msgid "Post as"
 msgstr ""
 
-#: ../../include/conversation.php:1191 ../../mod/editpost.php:119
-#: ../../mod/editblock.php:142 ../../mod/editlayout.php:140
+#: ../../include/conversation.php:1191 ../../mod/editblock.php:142
+#: ../../mod/editpost.php:119 ../../mod/editlayout.php:140
 #: ../../mod/editwebpage.php:182
 msgid "Upload photo"
 msgstr ""
@@ -3411,8 +3417,8 @@ msgid "upload photo"
 msgstr ""
 
 #: ../../include/conversation.php:1193 ../../mod/mail.php:240
-#: ../../mod/mail.php:369 ../../mod/editpost.php:120
-#: ../../mod/editblock.php:143 ../../mod/editlayout.php:141
+#: ../../mod/mail.php:369 ../../mod/editblock.php:143
+#: ../../mod/editpost.php:120 ../../mod/editlayout.php:141
 #: ../../mod/editwebpage.php:183
 msgid "Attach file"
 msgstr ""
@@ -3422,8 +3428,8 @@ msgid "attach file"
 msgstr ""
 
 #: ../../include/conversation.php:1195 ../../mod/mail.php:241
-#: ../../mod/mail.php:370 ../../mod/editpost.php:121
-#: ../../mod/editblock.php:144 ../../mod/editlayout.php:142
+#: ../../mod/mail.php:370 ../../mod/editblock.php:144
+#: ../../mod/editpost.php:121 ../../mod/editlayout.php:142
 #: ../../mod/editwebpage.php:184
 msgid "Insert web link"
 msgstr ""
@@ -3448,8 +3454,8 @@ msgstr ""
 msgid "audio link"
 msgstr ""
 
-#: ../../include/conversation.php:1201 ../../mod/editpost.php:125
-#: ../../mod/editblock.php:148 ../../mod/editlayout.php:146
+#: ../../include/conversation.php:1201 ../../mod/editblock.php:148
+#: ../../mod/editpost.php:125 ../../mod/editlayout.php:146
 #: ../../mod/editwebpage.php:188
 msgid "Set your location"
 msgstr ""
@@ -3462,8 +3468,8 @@ msgstr ""
 msgid "Toggle voting"
 msgstr ""
 
-#: ../../include/conversation.php:1206 ../../mod/editpost.php:126
-#: ../../mod/editblock.php:149 ../../mod/editlayout.php:147
+#: ../../include/conversation.php:1206 ../../mod/editblock.php:149
+#: ../../mod/editpost.php:126 ../../mod/editlayout.php:147
 #: ../../mod/editwebpage.php:189
 msgid "Clear browser location"
 msgstr ""
@@ -3472,19 +3478,19 @@ msgstr ""
 msgid "clear location"
 msgstr ""
 
-#: ../../include/conversation.php:1209 ../../mod/editpost.php:142
-#: ../../mod/editblock.php:162 ../../mod/editwebpage.php:205
+#: ../../include/conversation.php:1209 ../../mod/editblock.php:162
+#: ../../mod/editpost.php:142 ../../mod/editwebpage.php:205
 msgid "Title (optional)"
 msgstr ""
 
-#: ../../include/conversation.php:1213 ../../mod/editpost.php:144
-#: ../../mod/editblock.php:165 ../../mod/editlayout.php:163
+#: ../../include/conversation.php:1213 ../../mod/editblock.php:165
+#: ../../mod/editpost.php:144 ../../mod/editlayout.php:163
 #: ../../mod/editwebpage.php:207
 msgid "Categories (optional, comma-separated list)"
 msgstr ""
 
-#: ../../include/conversation.php:1215 ../../mod/editpost.php:131
-#: ../../mod/editblock.php:151 ../../mod/editlayout.php:149
+#: ../../include/conversation.php:1215 ../../mod/editblock.php:151
+#: ../../mod/editpost.php:131 ../../mod/editlayout.php:149
 #: ../../mod/editwebpage.php:191
 msgid "Permission settings"
 msgstr ""
@@ -3493,21 +3499,21 @@ msgstr ""
 msgid "permissions"
 msgstr ""
 
-#: ../../include/conversation.php:1224 ../../mod/editpost.php:139
-#: ../../mod/editblock.php:159 ../../mod/editlayout.php:156
+#: ../../include/conversation.php:1224 ../../mod/editblock.php:159
+#: ../../mod/editpost.php:139 ../../mod/editlayout.php:156
 #: ../../mod/editwebpage.php:200
 msgid "Public post"
 msgstr ""
 
-#: ../../include/conversation.php:1226 ../../mod/editpost.php:145
-#: ../../mod/editblock.php:166 ../../mod/editlayout.php:164
+#: ../../include/conversation.php:1226 ../../mod/editblock.php:166
+#: ../../mod/editpost.php:145 ../../mod/editlayout.php:164
 #: ../../mod/editwebpage.php:208
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
 #: ../../include/conversation.php:1239 ../../mod/mail.php:245
-#: ../../mod/mail.php:374 ../../mod/editpost.php:156
-#: ../../mod/editblock.php:176 ../../mod/editlayout.php:173
+#: ../../mod/mail.php:374 ../../mod/editblock.php:176
+#: ../../mod/editpost.php:156 ../../mod/editlayout.php:173
 #: ../../mod/editwebpage.php:217
 msgid "Set expiration date"
 msgstr ""
@@ -3713,19 +3719,19 @@ msgstr ""
 msgid "Archives"
 msgstr ""
 
-#: ../../include/widgets.php:427 ../../mod/connedit.php:567
+#: ../../include/widgets.php:427 ../../mod/connedit.php:566
 msgid "Me"
 msgstr ""
 
-#: ../../include/widgets.php:428 ../../mod/connedit.php:568
+#: ../../include/widgets.php:428 ../../mod/connedit.php:567
 msgid "Family"
 msgstr ""
 
-#: ../../include/widgets.php:430 ../../mod/connedit.php:570
+#: ../../include/widgets.php:430 ../../mod/connedit.php:569
 msgid "Acquaintances"
 msgstr ""
 
-#: ../../include/widgets.php:431 ../../mod/connedit.php:571
+#: ../../include/widgets.php:431 ../../mod/connedit.php:570
 #: ../../mod/connections.php:88 ../../mod/connections.php:103
 msgid "All"
 msgstr ""
@@ -3762,7 +3768,7 @@ msgstr ""
 msgid "Export channel"
 msgstr ""
 
-#: ../../include/widgets.php:529 ../../mod/connedit.php:658
+#: ../../include/widgets.php:529 ../../mod/connedit.php:657
 msgid "Connection Default Permissions"
 msgstr ""
 
@@ -4109,11 +4115,12 @@ msgstr ""
 #: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
 #: ../../include/dir_fns.php:130 ../../mod/removeme.php:60
 #: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
-#: ../../mod/mitem.php:229 ../../mod/connedit.php:631
-#: ../../mod/connedit.php:659 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/admin.php:386 ../../mod/menu.php:96
-#: ../../mod/menu.php:153 ../../mod/photos.php:616 ../../mod/settings.php:574
-#: ../../mod/api.php:106 ../../view/theme/redbasic/php/config.php:104
+#: ../../mod/mitem.php:229 ../../mod/connedit.php:630
+#: ../../mod/connedit.php:658 ../../mod/photos.php:625
+#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
+#: ../../mod/admin.php:386 ../../mod/menu.php:96 ../../mod/menu.php:153
+#: ../../mod/settings.php:574 ../../mod/api.php:106
+#: ../../view/theme/redbasic/php/config.php:104
 #: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1507
 msgid "No"
 msgstr ""
@@ -4121,10 +4128,11 @@ msgstr ""
 #: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129
 #: ../../include/dir_fns.php:130 ../../mod/removeme.php:60
 #: ../../mod/mitem.php:154 ../../mod/mitem.php:155 ../../mod/mitem.php:228
-#: ../../mod/mitem.php:229 ../../mod/filestorage.php:151
-#: ../../mod/filestorage.php:159 ../../mod/admin.php:388 ../../mod/menu.php:96
-#: ../../mod/menu.php:153 ../../mod/photos.php:616 ../../mod/settings.php:574
-#: ../../mod/api.php:105 ../../view/theme/redbasic/php/config.php:104
+#: ../../mod/mitem.php:229 ../../mod/photos.php:625
+#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
+#: ../../mod/admin.php:388 ../../mod/menu.php:96 ../../mod/menu.php:153
+#: ../../mod/settings.php:574 ../../mod/api.php:105
+#: ../../view/theme/redbasic/php/config.php:104
 #: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1507
 msgid "Yes"
 msgstr ""
@@ -4158,8 +4166,8 @@ msgstr ""
 msgid "Suggest a friend for %s"
 msgstr ""
 
-#: ../../mod/directory.php:59 ../../mod/display.php:13 ../../mod/search.php:13
-#: ../../mod/photos.php:480 ../../mod/ratings.php:82
+#: ../../mod/directory.php:59 ../../mod/display.php:13
+#: ../../mod/photos.php:489 ../../mod/search.php:13 ../../mod/ratings.php:82
 #: ../../mod/viewconnections.php:17
 msgid "Public access denied."
 msgstr ""
@@ -4704,247 +4712,247 @@ msgstr ""
 msgid "Could not locate selected profile."
 msgstr ""
 
-#: ../../mod/connedit.php:219
+#: ../../mod/connedit.php:218
 msgid "Connection updated."
 msgstr ""
 
-#: ../../mod/connedit.php:221
+#: ../../mod/connedit.php:220
 msgid "Failed to update connection record."
 msgstr ""
 
-#: ../../mod/connedit.php:268
+#: ../../mod/connedit.php:267
 msgid "is now connected to"
 msgstr ""
 
-#: ../../mod/connedit.php:391
+#: ../../mod/connedit.php:390
 msgid "Could not access address book record."
 msgstr ""
 
-#: ../../mod/connedit.php:405
+#: ../../mod/connedit.php:404
 msgid "Refresh failed - channel is currently unavailable."
 msgstr ""
 
-#: ../../mod/connedit.php:414 ../../mod/connedit.php:423
-#: ../../mod/connedit.php:432 ../../mod/connedit.php:441
-#: ../../mod/connedit.php:454
+#: ../../mod/connedit.php:413 ../../mod/connedit.php:422
+#: ../../mod/connedit.php:431 ../../mod/connedit.php:440
+#: ../../mod/connedit.php:453
 msgid "Unable to set address book parameters."
 msgstr ""
 
-#: ../../mod/connedit.php:478
+#: ../../mod/connedit.php:477
 msgid "Connection has been removed."
 msgstr ""
 
-#: ../../mod/connedit.php:497
+#: ../../mod/connedit.php:496
 #, php-format
 msgid "View %s's profile"
 msgstr ""
 
-#: ../../mod/connedit.php:501
+#: ../../mod/connedit.php:500
 msgid "Refresh Permissions"
 msgstr ""
 
-#: ../../mod/connedit.php:504
+#: ../../mod/connedit.php:503
 msgid "Fetch updated permissions"
 msgstr ""
 
-#: ../../mod/connedit.php:508
+#: ../../mod/connedit.php:507
 msgid "Recent Activity"
 msgstr ""
 
-#: ../../mod/connedit.php:511
+#: ../../mod/connedit.php:510
 msgid "View recent posts and comments"
 msgstr ""
 
-#: ../../mod/connedit.php:515 ../../mod/admin.php:785
+#: ../../mod/connedit.php:514 ../../mod/admin.php:785
 msgid "Unblock"
 msgstr ""
 
-#: ../../mod/connedit.php:515 ../../mod/admin.php:784
+#: ../../mod/connedit.php:514 ../../mod/admin.php:784
 msgid "Block"
 msgstr ""
 
-#: ../../mod/connedit.php:518
+#: ../../mod/connedit.php:517
 msgid "Block (or Unblock) all communications with this connection"
 msgstr ""
 
-#: ../../mod/connedit.php:519
+#: ../../mod/connedit.php:518
 msgid "This connection is blocked!"
 msgstr ""
 
-#: ../../mod/connedit.php:523
+#: ../../mod/connedit.php:522
 msgid "Unignore"
 msgstr ""
 
-#: ../../mod/connedit.php:523 ../../mod/notifications.php:51
+#: ../../mod/connedit.php:522 ../../mod/notifications.php:51
 msgid "Ignore"
 msgstr ""
 
-#: ../../mod/connedit.php:526
+#: ../../mod/connedit.php:525
 msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr ""
 
-#: ../../mod/connedit.php:527
+#: ../../mod/connedit.php:526
 msgid "This connection is ignored!"
 msgstr ""
 
-#: ../../mod/connedit.php:531
+#: ../../mod/connedit.php:530
 msgid "Unarchive"
 msgstr ""
 
-#: ../../mod/connedit.php:531
+#: ../../mod/connedit.php:530
 msgid "Archive"
 msgstr ""
 
-#: ../../mod/connedit.php:534
+#: ../../mod/connedit.php:533
 msgid ""
 "Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr ""
 
-#: ../../mod/connedit.php:535
+#: ../../mod/connedit.php:534
 msgid "This connection is archived!"
 msgstr ""
 
-#: ../../mod/connedit.php:539
+#: ../../mod/connedit.php:538
 msgid "Unhide"
 msgstr ""
 
-#: ../../mod/connedit.php:539
+#: ../../mod/connedit.php:538
 msgid "Hide"
 msgstr ""
 
-#: ../../mod/connedit.php:542
+#: ../../mod/connedit.php:541
 msgid "Hide or Unhide this connection from your other connections"
 msgstr ""
 
-#: ../../mod/connedit.php:543
+#: ../../mod/connedit.php:542
 msgid "This connection is hidden!"
 msgstr ""
 
-#: ../../mod/connedit.php:550
+#: ../../mod/connedit.php:549
 msgid "Delete this connection"
 msgstr ""
 
-#: ../../mod/connedit.php:631
+#: ../../mod/connedit.php:630
 msgid "Approve this connection"
 msgstr ""
 
-#: ../../mod/connedit.php:631
+#: ../../mod/connedit.php:630
 msgid "Accept connection to allow communication"
 msgstr ""
 
-#: ../../mod/connedit.php:636
+#: ../../mod/connedit.php:635
 msgid "Set Affinity"
 msgstr ""
 
-#: ../../mod/connedit.php:639
+#: ../../mod/connedit.php:638
 msgid "Set Profile"
 msgstr ""
 
-#: ../../mod/connedit.php:642
+#: ../../mod/connedit.php:641
 msgid "Set Affinity & Profile"
 msgstr ""
 
-#: ../../mod/connedit.php:659
+#: ../../mod/connedit.php:658
 msgid "Apply these permissions automatically"
 msgstr ""
 
-#: ../../mod/connedit.php:661
+#: ../../mod/connedit.php:660
 msgid "This connection's address is"
 msgstr ""
 
-#: ../../mod/connedit.php:664
+#: ../../mod/connedit.php:663
 msgid ""
 "The permissions indicated on this page will be applied to all new "
 "connections."
 msgstr ""
 
-#: ../../mod/connedit.php:666
+#: ../../mod/connedit.php:665
 msgid "Slide to adjust your degree of friendship"
 msgstr ""
 
-#: ../../mod/connedit.php:668
+#: ../../mod/connedit.php:667
 msgid "Slide to adjust your rating"
 msgstr ""
 
-#: ../../mod/connedit.php:669 ../../mod/connedit.php:674
+#: ../../mod/connedit.php:668 ../../mod/connedit.php:673
 msgid "Optionally explain your rating"
 msgstr ""
 
-#: ../../mod/connedit.php:671
+#: ../../mod/connedit.php:670
 msgid "Custom Filter"
 msgstr ""
 
-#: ../../mod/connedit.php:672
+#: ../../mod/connedit.php:671
 msgid "Only import posts with this text"
 msgstr ""
 
-#: ../../mod/connedit.php:672 ../../mod/connedit.php:673
+#: ../../mod/connedit.php:671 ../../mod/connedit.php:672
 msgid ""
 "words one per line or #tags or /patterns/, leave blank to import all posts"
 msgstr ""
 
-#: ../../mod/connedit.php:673
+#: ../../mod/connedit.php:672
 msgid "Do not import posts with this text"
 msgstr ""
 
-#: ../../mod/connedit.php:675
+#: ../../mod/connedit.php:674
 msgid "This information is public!"
 msgstr ""
 
-#: ../../mod/connedit.php:680
+#: ../../mod/connedit.php:679
 msgid "Connection Pending Approval"
 msgstr ""
 
-#: ../../mod/connedit.php:681
+#: ../../mod/connedit.php:680
 msgid "Connection Request"
 msgstr ""
 
-#: ../../mod/connedit.php:682
+#: ../../mod/connedit.php:681
 #, php-format
 msgid ""
 "(%s) would like to connect with you. Please approve this connection to allow "
 "communication."
 msgstr ""
 
-#: ../../mod/connedit.php:683 ../../mod/admin.php:781
+#: ../../mod/connedit.php:682 ../../mod/admin.php:781
 msgid "Approve"
 msgstr ""
 
-#: ../../mod/connedit.php:684
+#: ../../mod/connedit.php:683
 msgid "Approve Later"
 msgstr ""
 
-#: ../../mod/connedit.php:687
+#: ../../mod/connedit.php:686
 msgid "inherited"
 msgstr ""
 
-#: ../../mod/connedit.php:689
+#: ../../mod/connedit.php:688
 #, php-format
 msgid ""
 "Please choose the profile you would like to display to %s when viewing your "
 "profile securely."
 msgstr ""
 
-#: ../../mod/connedit.php:691
+#: ../../mod/connedit.php:690
 msgid "Their Settings"
 msgstr ""
 
-#: ../../mod/connedit.php:692
+#: ../../mod/connedit.php:691
 msgid "My Settings"
 msgstr ""
 
-#: ../../mod/connedit.php:694
+#: ../../mod/connedit.php:693
 msgid "Individual Permissions"
 msgstr ""
 
-#: ../../mod/connedit.php:695
+#: ../../mod/connedit.php:694
 msgid ""
 "Some permissions may be inherited from your channel's <a href=\"settings"
 "\"><strong>privacy settings</strong></a>, which have higher priority than "
 "individual settings. You can <strong>not</strong> change those settings here."
 msgstr ""
 
-#: ../../mod/connedit.php:696
+#: ../../mod/connedit.php:695
 msgid ""
 "Some permissions may be inherited from your channel's <a href=\"settings"
 "\"><strong>privacy settings</strong></a>, which have higher priority than "
@@ -4952,7 +4960,7 @@ msgid ""
 "any impact unless the inherited setting changes."
 msgstr ""
 
-#: ../../mod/connedit.php:697
+#: ../../mod/connedit.php:696
 msgid "Last update:"
 msgstr ""
 
@@ -4979,49 +4987,163 @@ msgid ""
 "to correctly use this feature."
 msgstr ""
 
-#: ../../mod/pubsites.php:16
-msgid "Public Sites"
+#: ../../mod/photos.php:79
+msgid "Page owner information could not be retrieved."
 msgstr ""
 
-#: ../../mod/pubsites.php:19
-msgid ""
-"The listed sites allow public registration for the $Projectname network. All "
-"sites in the network are interlinked so membership on any of them conveys "
-"membership in the network as a whole. Some sites may require subscription or "
-"provide tiered service plans. The provider links <strong>may</strong> "
-"provide additional details."
+#: ../../mod/photos.php:100
+msgid "Album not found."
 msgstr ""
 
-#: ../../mod/pubsites.php:25
-msgid "Rate this hub"
+#: ../../mod/photos.php:127
+msgid "Delete Album"
 msgstr ""
 
-#: ../../mod/pubsites.php:26
-msgid "Site URL"
+#: ../../mod/photos.php:171 ../../mod/photos.php:1006
+msgid "Delete Photo"
 msgstr ""
 
-#: ../../mod/pubsites.php:26
-msgid "Access Type"
+#: ../../mod/photos.php:500
+msgid "No photos selected"
 msgstr ""
 
-#: ../../mod/pubsites.php:26
-msgid "Registration Policy"
+#: ../../mod/photos.php:549
+msgid "Access to this item is restricted."
 msgstr ""
 
-#: ../../mod/pubsites.php:26 ../../mod/profiles.php:454
-msgid "Location"
+#: ../../mod/photos.php:588
+#, php-format
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr ""
 
-#: ../../mod/pubsites.php:26
-msgid "View hub ratings"
+#: ../../mod/photos.php:591
+#, php-format
+msgid "%1$.2f MB photo storage used."
 msgstr ""
 
-#: ../../mod/pubsites.php:30
-msgid "Rate"
+#: ../../mod/photos.php:619
+msgid "Upload Photos"
 msgstr ""
 
-#: ../../mod/pubsites.php:31
-msgid "View ratings"
+#: ../../mod/photos.php:623
+msgid "Enter an album name"
+msgstr ""
+
+#: ../../mod/photos.php:624
+msgid "or select an existing album (doubleclick)"
+msgstr ""
+
+#: ../../mod/photos.php:625
+msgid "Create a status post for this upload"
+msgstr ""
+
+#: ../../mod/photos.php:652
+msgid "Album name could not be decoded"
+msgstr ""
+
+#: ../../mod/photos.php:696 ../../mod/photos.php:1233
+#: ../../mod/photos.php:1250
+msgid "Contact Photos"
+msgstr ""
+
+#: ../../mod/photos.php:724
+msgid "Show Newest First"
+msgstr ""
+
+#: ../../mod/photos.php:726
+msgid "Show Oldest First"
+msgstr ""
+
+#: ../../mod/photos.php:750 ../../mod/photos.php:1283
+msgid "View Photo"
+msgstr ""
+
+#: ../../mod/photos.php:779
+msgid "Edit Album"
+msgstr ""
+
+#: ../../mod/photos.php:824
+msgid "Permission denied. Access to this item may be restricted."
+msgstr ""
+
+#: ../../mod/photos.php:826
+msgid "Photo not available"
+msgstr ""
+
+#: ../../mod/photos.php:884
+msgid "Use as profile photo"
+msgstr ""
+
+#: ../../mod/photos.php:891
+msgid "Private Photo"
+msgstr ""
+
+#: ../../mod/photos.php:902 ../../mod/events.php:528
+msgid "Previous"
+msgstr ""
+
+#: ../../mod/photos.php:906
+msgid "View Full Size"
+msgstr ""
+
+#: ../../mod/photos.php:911 ../../mod/events.php:529 ../../mod/setup.php:285
+msgid "Next"
+msgstr ""
+
+#: ../../mod/photos.php:951 ../../mod/tagrm.php:133
+msgid "Remove"
+msgstr ""
+
+#: ../../mod/photos.php:985
+msgid "Edit photo"
+msgstr ""
+
+#: ../../mod/photos.php:987
+msgid "Rotate CW (right)"
+msgstr ""
+
+#: ../../mod/photos.php:988
+msgid "Rotate CCW (left)"
+msgstr ""
+
+#: ../../mod/photos.php:991
+msgid "Enter a new album name"
+msgstr ""
+
+#: ../../mod/photos.php:992
+msgid "or select an existing one (doubleclick)"
+msgstr ""
+
+#: ../../mod/photos.php:995
+msgid "Caption"
+msgstr ""
+
+#: ../../mod/photos.php:997
+msgid "Add a Tag"
+msgstr ""
+
+#: ../../mod/photos.php:1001
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+msgstr ""
+
+#: ../../mod/photos.php:1004
+msgid "Flag as adult in album view"
+msgstr ""
+
+#: ../../mod/photos.php:1196
+msgid "In This Photo:"
+msgstr ""
+
+#: ../../mod/photos.php:1201
+msgid "Map"
+msgstr ""
+
+#: ../../mod/photos.php:1289
+msgid "View Album"
+msgstr ""
+
+#: ../../mod/photos.php:1312
+msgid "Recent Photos"
 msgstr ""
 
 #: ../../mod/filestorage.php:82
@@ -5145,39 +5267,43 @@ msgstr ""
 msgid "You must be logged in to see this page."
 msgstr ""
 
-#: ../../mod/chat.php:171
+#: ../../mod/chat.php:174
 msgid "Room not found"
 msgstr ""
 
-#: ../../mod/chat.php:182
+#: ../../mod/chat.php:185
 msgid "Leave Room"
 msgstr ""
 
-#: ../../mod/chat.php:183
+#: ../../mod/chat.php:186
 msgid "Delete This Room"
 msgstr ""
 
-#: ../../mod/chat.php:184
+#: ../../mod/chat.php:187
 msgid "I am away right now"
 msgstr ""
 
-#: ../../mod/chat.php:185
+#: ../../mod/chat.php:188
 msgid "I am online"
 msgstr ""
 
-#: ../../mod/chat.php:187
+#: ../../mod/chat.php:190
 msgid "Bookmark this room"
 msgstr ""
 
-#: ../../mod/chat.php:205 ../../mod/chat.php:227
+#: ../../mod/chat.php:208 ../../mod/chat.php:231
 msgid "New Chatroom"
 msgstr ""
 
-#: ../../mod/chat.php:206
+#: ../../mod/chat.php:209
 msgid "Chatroom Name"
 msgstr ""
 
-#: ../../mod/chat.php:223
+#: ../../mod/chat.php:210
+msgid "Expiration of chats (minutes)"
+msgstr ""
+
+#: ../../mod/chat.php:227
 #, php-format
 msgid "%1$s's Chatrooms"
 msgstr ""
@@ -5296,39 +5422,6 @@ msgstr ""
 msgid "Your message for %s (%s):"
 msgstr ""
 
-#: ../../mod/editpost.php:20 ../../mod/editblock.php:78
-#: ../../mod/editblock.php:94 ../../mod/editlayout.php:76
-#: ../../mod/editwebpage.php:77
-msgid "Item not found"
-msgstr ""
-
-#: ../../mod/editpost.php:31
-msgid "Item is not editable"
-msgstr ""
-
-#: ../../mod/editpost.php:55
-msgid "Delete item?"
-msgstr ""
-
-#: ../../mod/editpost.php:122 ../../mod/editblock.php:145
-#: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:185
-msgid "Insert YouTube video"
-msgstr ""
-
-#: ../../mod/editpost.php:123 ../../mod/editblock.php:146
-#: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:186
-msgid "Insert Vorbis [.ogg] video"
-msgstr ""
-
-#: ../../mod/editpost.php:124 ../../mod/editblock.php:147
-#: ../../mod/editlayout.php:145 ../../mod/editwebpage.php:187
-msgid "Insert Vorbis [.ogg] audio"
-msgstr ""
-
-#: ../../mod/editpost.php:165 ../../mod/rpost.php:128
-msgid "Edit post"
-msgstr ""
-
 #: ../../mod/dreport.php:23
 msgid "Invalid message"
 msgstr ""
@@ -5386,51 +5479,49 @@ msgstr ""
 msgid "mail delivered"
 msgstr ""
 
-#: ../../mod/editblock.php:118
-msgid "Delete block?"
-msgstr ""
-
-#: ../../mod/editblock.php:180
-msgid "Edit Block"
+#: ../../mod/editblock.php:78 ../../mod/editblock.php:94
+#: ../../mod/editpost.php:20 ../../mod/editlayout.php:76
+#: ../../mod/editwebpage.php:77
+msgid "Item not found"
 msgstr ""
 
-#: ../../mod/home.php:57 ../../mod/home.php:63 ../../mod/siteinfo.php:157
-msgid "$Projectname"
+#: ../../mod/editblock.php:118
+msgid "Delete block?"
 msgstr ""
 
-#: ../../mod/home.php:73
-#, php-format
-msgid "Welcome to %s"
+#: ../../mod/editblock.php:145 ../../mod/editpost.php:122
+#: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:185
+msgid "Insert YouTube video"
 msgstr ""
 
-#: ../../mod/item.php:174
-msgid "Unable to locate original post."
+#: ../../mod/editblock.php:146 ../../mod/editpost.php:123
+#: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:186
+msgid "Insert Vorbis [.ogg] video"
 msgstr ""
 
-#: ../../mod/item.php:418
-msgid "Empty post discarded."
+#: ../../mod/editblock.php:147 ../../mod/editpost.php:124
+#: ../../mod/editlayout.php:145 ../../mod/editwebpage.php:187
+msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../mod/item.php:458
-msgid "Executable content type not permitted to this channel."
+#: ../../mod/editblock.php:180
+msgid "Edit Block"
 msgstr ""
 
-#: ../../mod/item.php:907
-msgid "System error. Post not saved."
+#: ../../mod/dirsearch.php:29
+msgid "This directory server requires an access token"
 msgstr ""
 
-#: ../../mod/item.php:1174
-msgid "Unable to obtain post information from database."
+#: ../../mod/editpost.php:31
+msgid "Item is not editable"
 msgstr ""
 
-#: ../../mod/item.php:1181
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
+#: ../../mod/editpost.php:55
+msgid "Delete item?"
 msgstr ""
 
-#: ../../mod/item.php:1188
-#, php-format
-msgid "You have reached your limit of %1$.0f webpages."
+#: ../../mod/editpost.php:165 ../../mod/rpost.php:128
+msgid "Edit post"
 msgstr ""
 
 #: ../../mod/oexchange.php:23
@@ -6495,163 +6586,13 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
-#: ../../mod/photos.php:79
-msgid "Page owner information could not be retrieved."
-msgstr ""
-
-#: ../../mod/photos.php:100
-msgid "Album not found."
-msgstr ""
-
-#: ../../mod/photos.php:127
-msgid "Delete Album"
-msgstr ""
-
-#: ../../mod/photos.php:171 ../../mod/photos.php:997
-msgid "Delete Photo"
-msgstr ""
-
-#: ../../mod/photos.php:491
-msgid "No photos selected"
-msgstr ""
-
-#: ../../mod/photos.php:540
-msgid "Access to this item is restricted."
-msgstr ""
-
-#: ../../mod/photos.php:579
-#, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
+#: ../../mod/home.php:57 ../../mod/home.php:65 ../../mod/siteinfo.php:157
+msgid "$Projectname"
 msgstr ""
 
-#: ../../mod/photos.php:582
+#: ../../mod/home.php:75
 #, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr ""
-
-#: ../../mod/photos.php:610
-msgid "Upload Photos"
-msgstr ""
-
-#: ../../mod/photos.php:614
-msgid "Enter an album name"
-msgstr ""
-
-#: ../../mod/photos.php:615
-msgid "or select an existing album (doubleclick)"
-msgstr ""
-
-#: ../../mod/photos.php:616
-msgid "Create a status post for this upload"
-msgstr ""
-
-#: ../../mod/photos.php:643
-msgid "Album name could not be decoded"
-msgstr ""
-
-#: ../../mod/photos.php:687 ../../mod/photos.php:1224
-#: ../../mod/photos.php:1241
-msgid "Contact Photos"
-msgstr ""
-
-#: ../../mod/photos.php:715
-msgid "Show Newest First"
-msgstr ""
-
-#: ../../mod/photos.php:717
-msgid "Show Oldest First"
-msgstr ""
-
-#: ../../mod/photos.php:741 ../../mod/photos.php:1274
-msgid "View Photo"
-msgstr ""
-
-#: ../../mod/photos.php:770
-msgid "Edit Album"
-msgstr ""
-
-#: ../../mod/photos.php:815
-msgid "Permission denied. Access to this item may be restricted."
-msgstr ""
-
-#: ../../mod/photos.php:817
-msgid "Photo not available"
-msgstr ""
-
-#: ../../mod/photos.php:875
-msgid "Use as profile photo"
-msgstr ""
-
-#: ../../mod/photos.php:882
-msgid "Private Photo"
-msgstr ""
-
-#: ../../mod/photos.php:893 ../../mod/events.php:528
-msgid "Previous"
-msgstr ""
-
-#: ../../mod/photos.php:897
-msgid "View Full Size"
-msgstr ""
-
-#: ../../mod/photos.php:902 ../../mod/events.php:529 ../../mod/setup.php:285
-msgid "Next"
-msgstr ""
-
-#: ../../mod/photos.php:942 ../../mod/tagrm.php:133
-msgid "Remove"
-msgstr ""
-
-#: ../../mod/photos.php:976
-msgid "Edit photo"
-msgstr ""
-
-#: ../../mod/photos.php:978
-msgid "Rotate CW (right)"
-msgstr ""
-
-#: ../../mod/photos.php:979
-msgid "Rotate CCW (left)"
-msgstr ""
-
-#: ../../mod/photos.php:982
-msgid "Enter a new album name"
-msgstr ""
-
-#: ../../mod/photos.php:983
-msgid "or select an existing one (doubleclick)"
-msgstr ""
-
-#: ../../mod/photos.php:986
-msgid "Caption"
-msgstr ""
-
-#: ../../mod/photos.php:988
-msgid "Add a Tag"
-msgstr ""
-
-#: ../../mod/photos.php:992
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
-msgstr ""
-
-#: ../../mod/photos.php:995
-msgid "Flag as adult in album view"
-msgstr ""
-
-#: ../../mod/photos.php:1187
-msgid "In This Photo:"
-msgstr ""
-
-#: ../../mod/photos.php:1192
-msgid "Map"
-msgstr ""
-
-#: ../../mod/photos.php:1280
-msgid "View Album"
-msgstr ""
-
-#: ../../mod/photos.php:1303
-msgid "Recent Photos"
+msgid "Welcome to %s"
 msgstr ""
 
 #: ../../mod/dav.php:121
@@ -6916,6 +6857,36 @@ msgstr ""
 msgid "Description: "
 msgstr ""
 
+#: ../../mod/item.php:173
+msgid "Unable to locate original post."
+msgstr ""
+
+#: ../../mod/item.php:417
+msgid "Empty post discarded."
+msgstr ""
+
+#: ../../mod/item.php:457
+msgid "Executable content type not permitted to this channel."
+msgstr ""
+
+#: ../../mod/item.php:906
+msgid "System error. Post not saved."
+msgstr ""
+
+#: ../../mod/item.php:1173
+msgid "Unable to obtain post information from database."
+msgstr ""
+
+#: ../../mod/item.php:1180
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
+msgstr ""
+
+#: ../../mod/item.php:1187
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
+msgstr ""
+
 #: ../../mod/webpages.php:191
 msgid "Page Title"
 msgstr ""
@@ -7042,8 +7013,53 @@ msgstr ""
 msgid "Item not available."
 msgstr ""
 
-#: ../../mod/dirsearch.php:29
-msgid "This directory server requires an access token"
+#: ../../mod/pubsites.php:16
+msgid "Public Sites"
+msgstr ""
+
+#: ../../mod/pubsites.php:19
+msgid ""
+"The listed sites allow public registration for the $Projectname network. All "
+"sites in the network are interlinked so membership on any of them conveys "
+"membership in the network as a whole. Some sites may require subscription or "
+"provide tiered service plans. The provider links <strong>may</strong> "
+"provide additional details."
+msgstr ""
+
+#: ../../mod/pubsites.php:25
+msgid "Rate this hub"
+msgstr ""
+
+#: ../../mod/pubsites.php:26
+msgid "Site URL"
+msgstr ""
+
+#: ../../mod/pubsites.php:26
+msgid "Access Type"
+msgstr ""
+
+#: ../../mod/pubsites.php:26
+msgid "Registration Policy"
+msgstr ""
+
+#: ../../mod/pubsites.php:26 ../../mod/profiles.php:454
+msgid "Location"
+msgstr ""
+
+#: ../../mod/pubsites.php:26
+msgid "Project"
+msgstr ""
+
+#: ../../mod/pubsites.php:26
+msgid "View hub ratings"
+msgstr ""
+
+#: ../../mod/pubsites.php:30
+msgid "Rate"
+msgstr ""
+
+#: ../../mod/pubsites.php:31
+msgid "View ratings"
 msgstr ""
 
 #: ../../mod/sources.php:32
@@ -8354,7 +8370,7 @@ msgid "Database Server Name"
 msgstr ""
 
 #: ../../mod/setup.php:315
-msgid "Default is localhost"
+msgid "Default is 127.0.0.1"
 msgstr ""
 
 #: ../../mod/setup.php:316