Merge pull request #7 from redmatrix/master

updating from original codebase
author: mrjive <mrjive@mrjive.it> 2015-10-26 21:55:47 +0100
committer: mrjive <mrjive@mrjive.it> 2015-10-26 21:55:47 +0100
commit: a4c3058f845a1c38d06b2201a10700c5f878366d (patch)
tree: bab86468397e523457ba25199cb9a67265980e00 /util
parent: 32522b61f235266384c81c0669fceaf58afeb4fe (diff)
parent: 6cb7afcbc0447b60de0128f9a912e10ae125ba45 (diff)
download: volse-hubzilla-a4c3058f845a1c38d06b2201a10700c5f878366d.tar.gz
volse-hubzilla-a4c3058f845a1c38d06b2201a10700c5f878366d.tar.bz2
volse-hubzilla-a4c3058f845a1c38d06b2201a10700c5f878366d.zip
2 files changed, 2041 insertions, 1917 deletions
diff --git a/util/hmessages.po b/util/hmessages.po
index 338635b74..40152108c 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2015-09-23.1164\n"
+"Project-Id-Version: 2015-10-23.1194\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-26 22:48-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,6 +17,32 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ../../include/bb2diaspora.php:388
+msgid "Attachments:"
+msgstr ""
+
+#: ../../include/bb2diaspora.php:474 ../../include/event.php:22
+msgid "l F d, Y \\@ g:i A"
+msgstr ""
+
+#: ../../include/bb2diaspora.php:476
+msgid "$Projectname event notification:"
+msgstr ""
+
+#: ../../include/bb2diaspora.php:480 ../../include/event.php:30
+msgid "Starts:"
+msgstr ""
+
+#: ../../include/bb2diaspora.php:488 ../../include/event.php:40
+msgid "Finishes:"
+msgstr ""
+
+#: ../../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
 msgid "No username found in import file."
 msgstr ""
@@ -25,16 +51,16 @@ msgstr ""
 msgid "Unable to create a unique channel address. Import failed."
 msgstr ""
 
-#: ../../include/Import/import_diaspora.php:143 ../../mod/import.php:480
+#: ../../include/Import/import_diaspora.php:143 ../../mod/import.php:486
 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:2497
+#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2509
 msgid "Collection"
 msgstr ""
 
@@ -58,72 +84,62 @@ msgstr ""
 msgid "Schedule Outbox"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:164 ../../include/conversation.php:1021
-#: ../../include/apps.php:355 ../../include/apps.php:410
-#: ../../mod/photos.php:720 ../../mod/photos.php:1159
+#: ../../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/conversation.php:1611
-#: ../../include/apps.php:135 ../../include/nav.php:93
+#: ../../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:745
-#: ../../mod/photos.php:1278 ../../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
@@ -131,16 +147,30 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:267 ../../include/conversation.php:662
-#: ../../include/apps.php:255 ../../include/ItemObject.php:120
-#: ../../mod/connedit.php:547 ../../mod/editblock.php:181
-#: ../../mod/admin.php:783 ../../mod/admin.php:942 ../../mod/photos.php:1090
+#: ../../include/RedDAV/RedBrowser.php:241 ../../include/apps.php:260
+#: ../../include/ItemObject.php:120 ../../include/conversation.php:657
+#: ../../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 ""
@@ -294,39 +324,39 @@ msgstr ""
 msgid "Room not found."
 msgstr ""
 
-#: ../../include/chat.php:133 ../../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:840
-#: ../../include/attach.php:911 ../../include/attach.php:1064
-#: ../../include/items.php:4342 ../../mod/achievements.php:30
+#: ../../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: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/message.php:16 ../../mod/channel.php:100
-#: ../../mod/channel.php:215 ../../mod/channel.php:255
-#: ../../mod/editpost.php:13 ../../mod/editblock.php:65 ../../mod/item.php:206
-#: ../../mod/item.php:214 ../../mod/item.php:992 ../../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/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/photos.php:70 ../../mod/rate.php:110
-#: ../../mod/events.php:256 ../../mod/profile_photo.php:338
-#: ../../mod/profile_photo.php:351 ../../mod/mail.php:114
-#: ../../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/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/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
@@ -355,7 +385,7 @@ msgstr ""
 msgid "Required"
 msgstr ""
 
-#: ../../include/datetime.php:262 ../../boot.php:2306
+#: ../../include/datetime.php:262 ../../boot.php:2312
 msgid "never"
 msgstr ""
 
@@ -539,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
@@ -698,12 +728,12 @@ msgstr ""
 msgid "Delete this item?"
 msgstr ""
 
-#: ../../include/js_strings.php:6 ../../include/ItemObject.php:673
-#: ../../mod/photos.php:1008 ../../mod/photos.php:1126
+#: ../../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:390
+#: ../../include/js_strings.php:7 ../../include/ItemObject.php:398
 msgid "[+] show all"
 msgstr ""
 
@@ -755,8 +785,8 @@ msgstr ""
 msgid "Rate This Channel (this is public)"
 msgstr ""
 
-#: ../../include/js_strings.php:20 ../../mod/connedit.php:667
-#: ../../mod/rate.php:156
+#: ../../include/js_strings.php:20 ../../mod/connedit.php:666
+#: ../../mod/rate.php:157
 msgid "Rating"
 msgstr ""
 
@@ -764,17 +794,18 @@ msgstr ""
 msgid "Describe (optional)"
 msgstr ""
 
-#: ../../include/js_strings.php:22 ../../include/ItemObject.php:674
+#: ../../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/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:598 ../../mod/photos.php:969 ../../mod/photos.php:1009
-#: ../../mod/photos.php:1127 ../../mod/rate.php:167 ../../mod/events.php:534
-#: ../../mod/events.php:710 ../../mod/mail.php:364 ../../mod/sources.php:104
-#: ../../mod/sources.php:138 ../../mod/import.php:511 ../../mod/thing.php:313
+#: ../../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/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
@@ -1083,7 +1114,7 @@ msgstr ""
 
 #: ../../include/contact_selectors.php:79 ../../mod/id.php:15
 #: ../../mod/id.php:16 ../../mod/admin.php:779 ../../mod/admin.php:788
-#: ../../boot.php:1499
+#: ../../boot.php:1505
 msgid "Email"
 msgstr ""
 
@@ -1134,8 +1165,8 @@ msgstr ""
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: ../../include/Contact.php:101 ../../include/conversation.php:947
-#: ../../include/identity.php:941 ../../include/widgets.php:136
+#: ../../include/Contact.php:101 ../../include/identity.php:965
+#: ../../include/conversation.php:949 ../../include/widgets.php:136
 #: ../../include/widgets.php:174 ../../mod/directory.php:316
 #: ../../mod/match.php:64 ../../mod/suggest.php:52
 msgid "Connect"
@@ -1159,678 +1190,659 @@ msgstr ""
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: ../../include/conversation.php:120 ../../include/text.php:1832
-#: ../../mod/like.php:361 ../../mod/tagger.php:43 ../../mod/subthread.php:72
-#: ../../mod/subthread.php:172
-msgid "photo"
+#: ../../include/items.php:423 ../../mod/like.php:280 ../../mod/dreport.php:6
+#: ../../mod/dreport.php:45 ../../mod/subthread.php:49 ../../mod/group.php:68
+#: ../../mod/profperm.php:23 ../../mod/import_items.php:114
+#: ../../index.php:360
+msgid "Permission denied"
 msgstr ""
 
-#: ../../include/conversation.php:123 ../../include/text.php:1835
-#: ../../include/event.php:896 ../../mod/like.php:363 ../../mod/tagger.php:47
-#: ../../mod/events.php:245
-msgid "event"
+#: ../../include/items.php:1128 ../../include/items.php:1174
+msgid "(Unknown)"
 msgstr ""
 
-#: ../../include/conversation.php:126 ../../mod/like.php:113
-msgid "channel"
+#: ../../include/items.php:1371
+msgid "Visible to anybody on the internet."
 msgstr ""
 
-#: ../../include/conversation.php:148 ../../include/text.php:1838
-#: ../../mod/like.php:361 ../../mod/subthread.php:72
-#: ../../mod/subthread.php:172
-msgid "status"
+#: ../../include/items.php:1373
+msgid "Visible to you only."
 msgstr ""
 
-#: ../../include/conversation.php:150 ../../include/text.php:1840
-#: ../../mod/tagger.php:53
-msgid "comment"
+#: ../../include/items.php:1375
+msgid "Visible to anybody in this network."
 msgstr ""
 
-#: ../../include/conversation.php:164 ../../mod/like.php:410
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
+#: ../../include/items.php:1377
+msgid "Visible to anybody authenticated."
 msgstr ""
 
-#: ../../include/conversation.php:167 ../../mod/like.php:412
+#: ../../include/items.php:1379
 #, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
+msgid "Visible to anybody on %s."
 msgstr ""
 
-#: ../../include/conversation.php:204
-#, php-format
-msgid "%1$s is now connected with %2$s"
+#: ../../include/items.php:1381
+msgid "Visible to all connections."
 msgstr ""
 
-#: ../../include/conversation.php:239
-#, php-format
-msgid "%1$s poked %2$s"
+#: ../../include/items.php:1383
+msgid "Visible to approved connections."
 msgstr ""
 
-#: ../../include/conversation.php:243 ../../include/text.php:933
-msgid "poked"
+#: ../../include/items.php:1385
+msgid "Visible to specific connections."
 msgstr ""
 
-#: ../../include/conversation.php:260 ../../mod/mood.php:63
-#, php-format
-msgctxt "mood"
-msgid "%1$s is %2$s"
+#: ../../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/conversation.php:574 ../../mod/photos.php:1024
-msgctxt "title"
-msgid "Likes"
+#: ../../include/items.php:4806 ../../mod/group.php:38 ../../mod/group.php:137
+msgid "Collection not found."
 msgstr ""
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:1024
-msgctxt "title"
-msgid "Dislikes"
+#: ../../include/items.php:4822
+msgid "Collection is empty."
 msgstr ""
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1025
-msgctxt "title"
-msgid "Agree"
+#: ../../include/items.php:4829
+#, php-format
+msgid "Collection: %s"
 msgstr ""
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1025
-msgctxt "title"
-msgid "Disagree"
+#: ../../include/items.php:4839 ../../mod/connedit.php:657
+#, php-format
+msgid "Connection: %s"
 msgstr ""
 
-#: ../../include/conversation.php:575 ../../mod/photos.php:1025
-msgctxt "title"
-msgid "Abstain"
+#: ../../include/items.php:4841
+msgid "Connection not found."
 msgstr ""
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1026
-msgctxt "title"
-msgid "Attending"
+#: ../../include/api.php:1321
+msgid "Public Timeline"
 msgstr ""
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1026
-msgctxt "title"
-msgid "Not attending"
+#: ../../include/network.php:635
+msgid "view full size"
 msgstr ""
 
-#: ../../include/conversation.php:576 ../../mod/photos.php:1026
-msgctxt "title"
-msgid "Might attend"
+#: ../../include/network.php:1613 ../../include/enotify.php:57
+msgid "$Projectname Notification"
 msgstr ""
 
-#: ../../include/conversation.php:661 ../../include/ItemObject.php:126
-msgid "Select"
+#: ../../include/network.php:1614 ../../include/enotify.php:58
+msgid "$projectname"
 msgstr ""
 
-#: ../../include/conversation.php:669 ../../include/ItemObject.php:89
-msgid "Private Message"
+#: ../../include/network.php:1616 ../../include/enotify.php:60
+msgid "Thank You,"
 msgstr ""
 
-#: ../../include/conversation.php:676 ../../include/ItemObject.php:227
-msgid "Message signature validated"
+#: ../../include/network.php:1618 ../../include/enotify.php:62
+#, php-format
+msgid "%s Administrator"
 msgstr ""
 
-#: ../../include/conversation.php:677 ../../include/ItemObject.php:228
-msgid "Message signature incorrect"
+#: ../../include/network.php:1660 ../../include/account.php:316
+#: ../../include/account.php:343 ../../include/account.php:403
+msgid "Administrator"
+msgstr ""
+
+#: ../../include/network.php:1674
+msgid "No Subject"
 msgstr ""
 
-#: ../../include/conversation.php:694
+#: ../../include/bookmarks.php:35
 #, php-format
-msgid "View %s's profile @ %s"
+msgid "%1$s's bookmarks"
 msgstr ""
 
-#: ../../include/conversation.php:709
-msgid "Categories:"
+#: ../../include/acl_selectors.php:239
+msgid "Visible to your default audience"
 msgstr ""
 
-#: ../../include/conversation.php:710
-msgid "Filed under:"
+#: ../../include/acl_selectors.php:240
+msgid "Show"
 msgstr ""
 
-#: ../../include/conversation.php:718 ../../include/ItemObject.php:314
-#, php-format
-msgid "from %s"
+#: ../../include/acl_selectors.php:241
+msgid "Don't show"
 msgstr ""
 
-#: ../../include/conversation.php:721 ../../include/ItemObject.php:317
-#, php-format
-msgid "last edited: %s"
+#: ../../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/conversation.php:722 ../../include/ItemObject.php:318
-#, php-format
-msgid "Expires: %s"
+#: ../../include/acl_selectors.php:248 ../../include/ItemObject.php:369
+#: ../../mod/photos.php:1215
+msgid "Close"
 msgstr ""
 
-#: ../../include/conversation.php:737
-msgid "View in context"
+#: ../../include/import.php:23
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
 msgstr ""
 
-#: ../../include/conversation.php:739 ../../include/conversation.php:1212
-#: ../../include/ItemObject.php:366 ../../mod/editpost.php:130
-#: ../../mod/editblock.php:150 ../../mod/photos.php:990 ../../mod/mail.php:237
-#: ../../mod/mail.php:365 ../../mod/editlayout.php:148
-#: ../../mod/editwebpage.php:190
-msgid "Please wait"
+#: ../../include/import.php:70
+msgid "Channel clone failed. Import failed."
 msgstr ""
 
-#: ../../include/conversation.php:848
-msgid "remove"
+#: ../../include/import.php:80 ../../mod/import.php:138
+msgid "Cloned channel not found. Import failed."
 msgstr ""
 
-#: ../../include/conversation.php:852 ../../include/nav.php:241
-msgid "Loading..."
+#: ../../include/photos.php:109
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
 msgstr ""
 
-#: ../../include/conversation.php:853
-msgid "Delete Selected Items"
+#: ../../include/photos.php:116
+msgid "Image file is empty."
 msgstr ""
 
-#: ../../include/conversation.php:941
-msgid "View Source"
+#: ../../include/photos.php:143 ../../mod/profile_photo.php:222
+msgid "Unable to process image"
 msgstr ""
 
-#: ../../include/conversation.php:942
-msgid "Follow Thread"
+#: ../../include/photos.php:232
+msgid "Photo storage failed."
 msgstr ""
 
-#: ../../include/conversation.php:943
-msgid "View Status"
+#: ../../include/photos.php:452 ../../include/conversation.php:1609
+msgid "Photo Albums"
 msgstr ""
 
-#: ../../include/conversation.php:944 ../../include/nav.php:86
-#: ../../mod/connedit.php:494
-msgid "View Profile"
+#: ../../include/photos.php:456
+msgid "Upload New Photos"
 msgstr ""
 
-#: ../../include/conversation.php:945
-msgid "View Photos"
+#: ../../include/notify.php:20
+msgid "created a new post"
 msgstr ""
 
-#: ../../include/conversation.php:946
-msgid "Activity/Posts"
+#: ../../include/notify.php:21
+#, php-format
+msgid "commented on %s's post"
 msgstr ""
 
-#: ../../include/conversation.php:948
-msgid "Edit Connection"
+#: ../../include/page_widgets.php:6
+msgid "New Page"
 msgstr ""
 
-#: ../../include/conversation.php:949
-msgid "Send PM"
+#: ../../include/page_widgets.php:39 ../../mod/layouts.php:188
+#: ../../mod/webpages.php:187 ../../mod/blocks.php:159
+msgid "View"
 msgstr ""
 
-#: ../../include/conversation.php:950 ../../include/apps.php:145
-msgid "Poke"
+#: ../../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"
 msgstr ""
 
-#: ../../include/conversation.php:1064
-#, php-format
-msgid "%s likes this."
+#: ../../include/page_widgets.php:41 ../../mod/webpages.php:189
+msgid "Actions"
 msgstr ""
 
-#: ../../include/conversation.php:1064
-#, php-format
-msgid "%s doesn't like this."
+#: ../../include/page_widgets.php:42 ../../mod/webpages.php:190
+msgid "Page Link"
 msgstr ""
 
-#: ../../include/conversation.php:1068
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this."
-msgid_plural "<span  %1$s>%2$d people</span> like this."
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/page_widgets.php:43
+msgid "Title"
+msgstr ""
 
-#: ../../include/conversation.php:1070
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this."
-msgid_plural "<span  %1$s>%2$d people</span> don't like this."
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/page_widgets.php:44 ../../mod/layouts.php:181
+#: ../../mod/menu.php:110 ../../mod/webpages.php:192 ../../mod/blocks.php:150
+msgid "Created"
+msgstr ""
 
-#: ../../include/conversation.php:1076
-msgid "and"
+#: ../../include/page_widgets.php:45 ../../mod/layouts.php:182
+#: ../../mod/menu.php:111 ../../mod/webpages.php:193 ../../mod/blocks.php:151
+msgid "Edited"
 msgstr ""
 
-#: ../../include/conversation.php:1079
-#, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/photo/photo_driver.php:705 ../../mod/photos.php:94
+#: ../../mod/photos.php:696 ../../mod/profile_photo.php:146
+#: ../../mod/profile_photo.php:236 ../../mod/profile_photo.php:376
+msgid "Profile Photos"
+msgstr ""
 
-#: ../../include/conversation.php:1080
-#, php-format
-msgid "%s like this."
+#: ../../include/profile_selectors.php:6
+#: ../../include/profile_selectors.php:23 ../../mod/id.php:103
+msgid "Male"
 msgstr ""
 
-#: ../../include/conversation.php:1080
-#, php-format
-msgid "%s don't like this."
+#: ../../include/profile_selectors.php:6
+#: ../../include/profile_selectors.php:23 ../../mod/id.php:105
+msgid "Female"
 msgstr ""
 
-#: ../../include/conversation.php:1143
-msgid "Visible to <strong>everybody</strong>"
+#: ../../include/profile_selectors.php:6
+msgid "Currently Male"
 msgstr ""
 
-#: ../../include/conversation.php:1144 ../../mod/mail.php:170
-#: ../../mod/mail.php:299
-msgid "Please enter a link URL:"
+#: ../../include/profile_selectors.php:6
+msgid "Currently Female"
 msgstr ""
 
-#: ../../include/conversation.php:1145
-msgid "Please enter a video link/URL:"
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Male"
 msgstr ""
 
-#: ../../include/conversation.php:1146
-msgid "Please enter an audio link/URL:"
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Female"
 msgstr ""
 
-#: ../../include/conversation.php:1147
-msgid "Tag term:"
+#: ../../include/profile_selectors.php:6
+msgid "Transgender"
 msgstr ""
 
-#: ../../include/conversation.php:1148 ../../mod/filer.php:48
-msgid "Save to Folder:"
+#: ../../include/profile_selectors.php:6
+msgid "Intersex"
 msgstr ""
 
-#: ../../include/conversation.php:1149
-msgid "Where are you right now?"
+#: ../../include/profile_selectors.php:6
+msgid "Transsexual"
 msgstr ""
 
-#: ../../include/conversation.php:1150 ../../mod/editpost.php:54
-#: ../../mod/mail.php:171 ../../mod/mail.php:300
-msgid "Expires YYYY-MM-DD HH:MM"
+#: ../../include/profile_selectors.php:6
+msgid "Hermaphrodite"
 msgstr ""
 
-#: ../../include/conversation.php:1158 ../../include/page_widgets.php:40
-#: ../../include/ItemObject.php:683 ../../mod/editpost.php:150
-#: ../../mod/editblock.php:171 ../../mod/photos.php:1010
-#: ../../mod/events.php:707 ../../mod/webpages.php:188
-#: ../../mod/editwebpage.php:212
-msgid "Preview"
+#: ../../include/profile_selectors.php:6
+msgid "Neuter"
 msgstr ""
 
-#: ../../include/conversation.php:1177 ../../mod/layouts.php:184
-#: ../../mod/photos.php:989 ../../mod/webpages.php:182
-#: ../../mod/blocks.php:154
-msgid "Share"
+#: ../../include/profile_selectors.php:6
+msgid "Non-specific"
 msgstr ""
 
-#: ../../include/conversation.php:1179
-msgid "Page link name"
+#: ../../include/profile_selectors.php:6
+msgid "Undecided"
 msgstr ""
 
-#: ../../include/conversation.php:1182
-msgid "Post as"
+#: ../../include/profile_selectors.php:42
+#: ../../include/profile_selectors.php:61
+msgid "Males"
 msgstr ""
 
-#: ../../include/conversation.php:1184 ../../include/ItemObject.php:675
-#: ../../mod/editpost.php:114 ../../mod/editblock.php:136
-#: ../../mod/editlayout.php:135 ../../mod/editwebpage.php:177
-msgid "Bold"
+#: ../../include/profile_selectors.php:42
+#: ../../include/profile_selectors.php:61
+msgid "Females"
 msgstr ""
 
-#: ../../include/conversation.php:1185 ../../include/ItemObject.php:676
-#: ../../mod/editpost.php:115 ../../mod/editblock.php:137
-#: ../../mod/editlayout.php:136 ../../mod/editwebpage.php:178
-msgid "Italic"
+#: ../../include/profile_selectors.php:42
+msgid "Gay"
 msgstr ""
 
-#: ../../include/conversation.php:1186 ../../include/ItemObject.php:677
-#: ../../mod/editpost.php:116 ../../mod/editblock.php:138
-#: ../../mod/editlayout.php:137 ../../mod/editwebpage.php:179
-msgid "Underline"
+#: ../../include/profile_selectors.php:42
+msgid "Lesbian"
 msgstr ""
 
-#: ../../include/conversation.php:1187 ../../include/ItemObject.php:678
-#: ../../mod/editpost.php:117 ../../mod/editblock.php:139
-#: ../../mod/editlayout.php:138 ../../mod/editwebpage.php:180
-msgid "Quote"
+#: ../../include/profile_selectors.php:42
+msgid "No Preference"
 msgstr ""
 
-#: ../../include/conversation.php:1188 ../../include/ItemObject.php:679
-#: ../../mod/editpost.php:118 ../../mod/editblock.php:140
-#: ../../mod/editlayout.php:139 ../../mod/editwebpage.php:181
-msgid "Code"
+#: ../../include/profile_selectors.php:42
+msgid "Bisexual"
 msgstr ""
 
-#: ../../include/conversation.php:1189 ../../mod/editpost.php:119
-#: ../../mod/editblock.php:142 ../../mod/mail.php:234 ../../mod/mail.php:361
-#: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:182
-msgid "Upload photo"
+#: ../../include/profile_selectors.php:42
+msgid "Autosexual"
 msgstr ""
 
-#: ../../include/conversation.php:1190
-msgid "upload photo"
+#: ../../include/profile_selectors.php:42
+msgid "Abstinent"
 msgstr ""
 
-#: ../../include/conversation.php:1191 ../../mod/editpost.php:120
-#: ../../mod/editblock.php:143 ../../mod/mail.php:235 ../../mod/mail.php:362
-#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:183
-msgid "Attach file"
+#: ../../include/profile_selectors.php:42
+msgid "Virgin"
 msgstr ""
 
-#: ../../include/conversation.php:1192
-msgid "attach file"
+#: ../../include/profile_selectors.php:42
+msgid "Deviant"
 msgstr ""
 
-#: ../../include/conversation.php:1193 ../../mod/editpost.php:121
-#: ../../mod/editblock.php:144 ../../mod/mail.php:236 ../../mod/mail.php:363
-#: ../../mod/editlayout.php:142 ../../mod/editwebpage.php:184
-msgid "Insert web link"
+#: ../../include/profile_selectors.php:42
+msgid "Fetish"
 msgstr ""
 
-#: ../../include/conversation.php:1194
-msgid "web link"
+#: ../../include/profile_selectors.php:42
+msgid "Oodles"
 msgstr ""
 
-#: ../../include/conversation.php:1195
-msgid "Insert video link"
+#: ../../include/profile_selectors.php:42
+msgid "Nonsexual"
 msgstr ""
 
-#: ../../include/conversation.php:1196
-msgid "video link"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Single"
 msgstr ""
 
-#: ../../include/conversation.php:1197
-msgid "Insert audio link"
+#: ../../include/profile_selectors.php:80
+msgid "Lonely"
 msgstr ""
 
-#: ../../include/conversation.php:1198
-msgid "audio link"
+#: ../../include/profile_selectors.php:80
+msgid "Available"
 msgstr ""
 
-#: ../../include/conversation.php:1199 ../../mod/editpost.php:125
-#: ../../mod/editblock.php:148 ../../mod/editlayout.php:146
-#: ../../mod/editwebpage.php:188
-msgid "Set your location"
+#: ../../include/profile_selectors.php:80
+msgid "Unavailable"
 msgstr ""
 
-#: ../../include/conversation.php:1200
-msgid "set location"
+#: ../../include/profile_selectors.php:80
+msgid "Has crush"
 msgstr ""
 
-#: ../../include/conversation.php:1201 ../../mod/editpost.php:127
-msgid "Toggle voting"
+#: ../../include/profile_selectors.php:80
+msgid "Infatuated"
 msgstr ""
 
-#: ../../include/conversation.php:1204 ../../mod/editpost.php:126
-#: ../../mod/editblock.php:149 ../../mod/editlayout.php:147
-#: ../../mod/editwebpage.php:189
-msgid "Clear browser location"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Dating"
 msgstr ""
 
-#: ../../include/conversation.php:1205
-msgid "clear location"
+#: ../../include/profile_selectors.php:80
+msgid "Unfaithful"
 msgstr ""
 
-#: ../../include/conversation.php:1207 ../../mod/editpost.php:142
-#: ../../mod/editblock.php:162 ../../mod/editwebpage.php:205
-msgid "Title (optional)"
+#: ../../include/profile_selectors.php:80
+msgid "Sex Addict"
 msgstr ""
 
-#: ../../include/conversation.php:1211 ../../mod/editpost.php:144
-#: ../../mod/editblock.php:165 ../../mod/editlayout.php:163
-#: ../../mod/editwebpage.php:207
-msgid "Categories (optional, comma-separated list)"
+#: ../../include/profile_selectors.php:80 ../../include/identity.php:390
+#: ../../include/identity.php:391 ../../include/identity.php:398
+#: ../../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
+msgid "Friends"
 msgstr ""
 
-#: ../../include/conversation.php:1213 ../../mod/editpost.php:131
-#: ../../mod/editblock.php:151 ../../mod/editlayout.php:149
-#: ../../mod/editwebpage.php:191
-msgid "Permission settings"
+#: ../../include/profile_selectors.php:80
+msgid "Friends/Benefits"
 msgstr ""
 
-#: ../../include/conversation.php:1214
-msgid "permissions"
+#: ../../include/profile_selectors.php:80
+msgid "Casual"
 msgstr ""
 
-#: ../../include/conversation.php:1222 ../../mod/editpost.php:139
-#: ../../mod/editblock.php:159 ../../mod/editlayout.php:156
-#: ../../mod/editwebpage.php:200
-msgid "Public post"
+#: ../../include/profile_selectors.php:80
+msgid "Engaged"
 msgstr ""
 
-#: ../../include/conversation.php:1224 ../../mod/editpost.php:145
-#: ../../mod/editblock.php:166 ../../mod/editlayout.php:164
-#: ../../mod/editwebpage.php:208
-msgid "Example: bob@example.com, mary@example.com"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Married"
 msgstr ""
 
-#: ../../include/conversation.php:1237 ../../mod/editpost.php:156
-#: ../../mod/editblock.php:176 ../../mod/mail.php:241 ../../mod/mail.php:368
-#: ../../mod/editlayout.php:173 ../../mod/editwebpage.php:217
-msgid "Set expiration date"
+#: ../../include/profile_selectors.php:80
+msgid "Imaginarily married"
 msgstr ""
 
-#: ../../include/conversation.php:1239 ../../include/ItemObject.php:686
-#: ../../mod/editpost.php:158 ../../mod/mail.php:243 ../../mod/mail.php:370
-msgid "Encrypt text"
+#: ../../include/profile_selectors.php:80
+msgid "Partners"
 msgstr ""
 
-#: ../../include/conversation.php:1241 ../../mod/editpost.php:160
-#: ../../mod/events.php:691
-msgid "OK"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Cohabiting"
 msgstr ""
 
-#: ../../include/conversation.php:1242 ../../mod/fbrowser.php:82
-#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:161
-#: ../../mod/events.php:690 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
-#: ../../mod/settings.php:584 ../../mod/settings.php:610
-msgid "Cancel"
+#: ../../include/profile_selectors.php:80
+msgid "Common law"
 msgstr ""
 
-#: ../../include/conversation.php:1485
-msgid "Discover"
+#: ../../include/profile_selectors.php:80
+msgid "Happy"
 msgstr ""
 
-#: ../../include/conversation.php:1488
-msgid "Imported public streams"
+#: ../../include/profile_selectors.php:80
+msgid "Not looking"
 msgstr ""
 
-#: ../../include/conversation.php:1493
-msgid "Commented Order"
+#: ../../include/profile_selectors.php:80
+msgid "Swinger"
 msgstr ""
 
-#: ../../include/conversation.php:1496
-msgid "Sort by Comment Date"
+#: ../../include/profile_selectors.php:80
+msgid "Betrayed"
 msgstr ""
 
-#: ../../include/conversation.php:1500
-msgid "Posted Order"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Separated"
 msgstr ""
 
-#: ../../include/conversation.php:1503
-msgid "Sort by Post Date"
+#: ../../include/profile_selectors.php:80
+msgid "Unstable"
 msgstr ""
 
-#: ../../include/conversation.php:1508 ../../include/widgets.php:94
-msgid "Personal"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Divorced"
 msgstr ""
 
-#: ../../include/conversation.php:1511
-msgid "Posts that mention or involve you"
+#: ../../include/profile_selectors.php:80
+msgid "Imaginarily divorced"
 msgstr ""
 
-#: ../../include/conversation.php:1517 ../../mod/menu.php:112
-#: ../../mod/connections.php:72 ../../mod/connections.php:82
-msgid "New"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Widowed"
 msgstr ""
 
-#: ../../include/conversation.php:1520
-msgid "Activity Stream - by date"
+#: ../../include/profile_selectors.php:80
+msgid "Uncertain"
 msgstr ""
 
-#: ../../include/conversation.php:1526
-msgid "Starred"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "It's complicated"
 msgstr ""
 
-#: ../../include/conversation.php:1529
-msgid "Favourite Posts"
+#: ../../include/profile_selectors.php:80
+msgid "Don't care"
 msgstr ""
 
-#: ../../include/conversation.php:1536
-msgid "Spam"
+#: ../../include/profile_selectors.php:80
+msgid "Ask me"
 msgstr ""
 
-#: ../../include/conversation.php:1539
-msgid "Posts flagged as SPAM"
+#: ../../include/oembed.php:213
+msgid "Embedded content"
 msgstr ""
 
-#: ../../include/conversation.php:1583 ../../mod/admin.php:947
-msgid "Channel"
+#: ../../include/oembed.php:222
+msgid "Embedding disabled"
 msgstr ""
 
-#: ../../include/conversation.php:1586
-msgid "Status Messages and Posts"
+#: ../../include/event.php:766
+msgid "This event has been added to your calendar."
 msgstr ""
 
-#: ../../include/conversation.php:1595
-msgid "About"
+#: ../../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"
 msgstr ""
 
-#: ../../include/conversation.php:1598
-msgid "Profile Details"
+#: ../../include/event.php:953
+msgid "Not specified"
 msgstr ""
 
-#: ../../include/conversation.php:1604 ../../include/apps.php:139
-#: ../../include/nav.php:92 ../../mod/fbrowser.php:25
-msgid "Photos"
+#: ../../include/event.php:954
+msgid "Needs Action"
 msgstr ""
 
-#: ../../include/conversation.php:1607 ../../include/photos.php:422
-msgid "Photo Albums"
+#: ../../include/event.php:955
+msgid "Completed"
 msgstr ""
 
-#: ../../include/conversation.php:1614
-msgid "Files and Storage"
+#: ../../include/event.php:956
+msgid "In Process"
 msgstr ""
 
-#: ../../include/conversation.php:1624 ../../include/conversation.php:1627
-msgid "Chatrooms"
+#: ../../include/event.php:957
+msgid "Cancelled"
+msgstr ""
+
+#: ../../include/apps.php:128
+msgid "Site Admin"
 msgstr ""
 
-#: ../../include/conversation.php:1637 ../../include/apps.php:129
+#: ../../include/apps.php:129 ../../include/conversation.php:1639
 #: ../../include/nav.php:103
 msgid "Bookmarks"
 msgstr ""
 
-#: ../../include/conversation.php:1640
-msgid "Saved Bookmarks"
+#: ../../include/apps.php:130
+msgid "Address Book"
+msgstr ""
+
+#: ../../include/apps.php:131 ../../include/nav.php:111 ../../boot.php:1503
+msgid "Login"
+msgstr ""
+
+#: ../../include/apps.php:132 ../../include/nav.php:200
+#: ../../mod/manage.php:160
+msgid "Channel Manager"
 msgstr ""
 
-#: ../../include/conversation.php:1647 ../../include/apps.php:136
+#: ../../include/apps.php:133 ../../include/nav.php:174
+msgid "Grid"
+msgstr ""
+
+#: ../../include/apps.php:134 ../../include/widgets.php:553
+#: ../../include/nav.php:202 ../../mod/admin.php:1033 ../../mod/admin.php:1233
+msgid "Settings"
+msgstr ""
+
+#: ../../include/apps.php:136 ../../include/conversation.php:1649
 #: ../../include/nav.php:107 ../../mod/webpages.php:178
 msgid "Webpages"
 msgstr ""
 
-#: ../../include/conversation.php:1650
-msgid "Manage Webpages"
+#: ../../include/apps.php:137 ../../include/nav.php:177
+msgid "Channel Home"
 msgstr ""
 
-#: ../../include/conversation.php:1679 ../../include/ItemObject.php:175
-#: ../../include/ItemObject.php:187 ../../mod/photos.php:1043
-#: ../../mod/photos.php:1055
-msgid "View all"
+#: ../../include/apps.php:138 ../../include/identity.php:1250
+#: ../../include/identity.php:1367 ../../mod/profperm.php:112
+msgid "Profile"
 msgstr ""
 
-#: ../../include/conversation.php:1703 ../../include/taxonomy.php:403
-#: ../../include/identity.php:1252 ../../include/ItemObject.php:179
-#: ../../mod/photos.php:1047
-msgctxt "noun"
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/apps.php:139 ../../include/conversation.php:1606
+#: ../../include/nav.php:92 ../../mod/fbrowser.php:25
+msgid "Photos"
+msgstr ""
 
-#: ../../include/conversation.php:1706 ../../include/ItemObject.php:184
-#: ../../mod/photos.php:1052
-msgctxt "noun"
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/apps.php:140 ../../include/nav.php:196
+#: ../../mod/events.php:526
+msgid "Events"
+msgstr ""
 
-#: ../../include/conversation.php:1709
-msgctxt "noun"
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/apps.php:141 ../../include/nav.php:162
+msgid "Directory"
+msgstr ""
 
-#: ../../include/conversation.php:1712
-msgctxt "noun"
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/apps.php:142 ../../include/nav.php:154 ../../mod/help.php:202
+#: ../../mod/help.php:207 ../../mod/layouts.php:176
+msgid "Help"
+msgstr ""
 
-#: ../../include/conversation.php:1715
-msgctxt "noun"
-msgid "Undecided"
-msgid_plural "Undecided"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/apps.php:143 ../../include/nav.php:188
+msgid "Mail"
+msgstr ""
 
-#: ../../include/conversation.php:1718
-msgctxt "noun"
-msgid "Agree"
-msgid_plural "Agrees"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/apps.php:144 ../../mod/mood.php:131
+msgid "Mood"
+msgstr ""
 
-#: ../../include/conversation.php:1721
-msgctxt "noun"
-msgid "Disagree"
-msgid_plural "Disagrees"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/apps.php:145 ../../include/conversation.php:952
+msgid "Poke"
+msgstr ""
 
-#: ../../include/conversation.php:1724
-msgctxt "noun"
-msgid "Abstain"
-msgid_plural "Abstains"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/apps.php:146 ../../include/nav.php:97
+msgid "Chat"
+msgstr ""
 
-#: ../../include/api.php:1290
-msgid "Public Timeline"
+#: ../../include/apps.php:147 ../../include/text.php:857
+#: ../../include/text.php:869 ../../include/nav.php:159
+#: ../../mod/search.php:38
+msgid "Search"
 msgstr ""
 
-#: ../../include/photos.php:109
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
+#: ../../include/apps.php:148
+msgid "Probe"
 msgstr ""
 
-#: ../../include/photos.php:116
-msgid "Image file is empty."
+#: ../../include/apps.php:149
+msgid "Suggest"
 msgstr ""
 
-#: ../../include/photos.php:143 ../../mod/profile_photo.php:222
-msgid "Unable to process image"
+#: ../../include/apps.php:150
+msgid "Random Channel"
 msgstr ""
 
-#: ../../include/photos.php:219
-msgid "Photo storage failed."
+#: ../../include/apps.php:151
+msgid "Invite"
 msgstr ""
 
-#: ../../include/photos.php:426
-msgid "Upload New Photos"
+#: ../../include/apps.php:152
+msgid "Features"
 msgstr ""
 
-#: ../../include/enotify.php:57 ../../include/network.php:1613
-msgid "$Projectname Notification"
+#: ../../include/apps.php:153 ../../mod/id.php:28
+msgid "Language"
 msgstr ""
 
-#: ../../include/enotify.php:58 ../../include/network.php:1614
-msgid "$projectname"
+#: ../../include/apps.php:154
+msgid "Post"
 msgstr ""
 
-#: ../../include/enotify.php:60 ../../include/network.php:1616
-msgid "Thank You,"
+#: ../../include/apps.php:155 ../../mod/id.php:17 ../../mod/id.php:18
+#: ../../mod/id.php:19
+msgid "Profile Photo"
 msgstr ""
 
-#: ../../include/enotify.php:62 ../../include/network.php:1618
-#, php-format
-msgid "%s Administrator"
+#: ../../include/apps.php:252 ../../mod/settings.php:84
+#: ../../mod/settings.php:609
+msgid "Update"
+msgstr ""
+
+#: ../../include/apps.php:252
+msgid "Install"
+msgstr ""
+
+#: ../../include/apps.php:257
+msgid "Purchase"
+msgstr ""
+
+#: ../../include/auth.php:131
+msgid "Logged out."
+msgstr ""
+
+#: ../../include/auth.php:272
+msgid "Failed authentication"
+msgstr ""
+
+#: ../../include/auth.php:286 ../../mod/openid.php:189
+msgid "Login failed."
 msgstr ""
 
 #: ../../include/enotify.php:96
@@ -1840,7 +1852,7 @@ msgstr ""
 
 #: ../../include/enotify.php:100
 #, php-format
-msgid "[Red:Notify] New mail received at %s"
+msgid "[Hubzilla:Notify] New mail received at %s"
 msgstr ""
 
 #: ../../include/enotify.php:102
@@ -1879,7 +1891,7 @@ msgstr ""
 
 #: ../../include/enotify.php:186
 #, php-format
-msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
+msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s"
 msgstr ""
 
 #: ../../include/enotify.php:187
@@ -1896,7 +1908,7 @@ msgstr ""
 
 #: ../../include/enotify.php:196
 #, php-format
-msgid "[Red:Notify] %s posted to your profile wall"
+msgid "[Hubzilla:Notify] %s posted to your profile wall"
 msgstr ""
 
 #: ../../include/enotify.php:198
@@ -1911,7 +1923,7 @@ msgstr ""
 
 #: ../../include/enotify.php:224
 #, php-format
-msgid "[Red:Notify] %s tagged you"
+msgid "[Hubzilla:Notify] %s tagged you"
 msgstr ""
 
 #: ../../include/enotify.php:225
@@ -1926,7 +1938,7 @@ msgstr ""
 
 #: ../../include/enotify.php:238
 #, php-format
-msgid "[Red:Notify] %1$s poked you"
+msgid "[Hubzilla:Notify] %1$s poked you"
 msgstr ""
 
 #: ../../include/enotify.php:239
@@ -1941,7 +1953,7 @@ msgstr ""
 
 #: ../../include/enotify.php:256
 #, php-format
-msgid "[Red:Notify] %s tagged your post"
+msgid "[Hubzilla:Notify] %s tagged your post"
 msgstr ""
 
 #: ../../include/enotify.php:257
@@ -1955,7 +1967,7 @@ msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
 msgstr ""
 
 #: ../../include/enotify.php:270
-msgid "[Red:Notify] Introduction received"
+msgid "[Hubzilla:Notify] Introduction received"
 msgstr ""
 
 #: ../../include/enotify.php:271
@@ -1980,7 +1992,7 @@ msgid "Please visit %s to approve or reject the connection request."
 msgstr ""
 
 #: ../../include/enotify.php:285
-msgid "[Red:Notify] Friend suggestion received"
+msgid "[Hubzilla:Notify] Friend suggestion received"
 msgstr ""
 
 #: ../../include/enotify.php:286
@@ -2007,26 +2019,247 @@ msgstr ""
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: ../../include/enotify.php:508
-msgid "[Red:Notify]"
+#: ../../include/enotify.php:511
+msgid "[Hubzilla:Notify]"
 msgstr ""
 
-#: ../../include/network.php:635
-msgid "view full size"
+#: ../../include/ItemObject.php:89 ../../include/conversation.php:664
+msgid "Private Message"
 msgstr ""
 
-#: ../../include/network.php:1660 ../../include/account.php:314
-#: ../../include/account.php:341 ../../include/account.php:401
-msgid "Administrator"
+#: ../../include/ItemObject.php:126 ../../include/conversation.php:656
+msgid "Select"
 msgstr ""
 
-#: ../../include/network.php:1674
-msgid "No Subject"
+#: ../../include/ItemObject.php:130
+msgid "Save to Folder"
 msgstr ""
 
-#: ../../include/bookmarks.php:35
+#: ../../include/ItemObject.php:151
+msgid "I will attend"
+msgstr ""
+
+#: ../../include/ItemObject.php:151
+msgid "I will not attend"
+msgstr ""
+
+#: ../../include/ItemObject.php:151
+msgid "I might attend"
+msgstr ""
+
+#: ../../include/ItemObject.php:161
+msgid "I agree"
+msgstr ""
+
+#: ../../include/ItemObject.php:161
+msgid "I disagree"
+msgstr ""
+
+#: ../../include/ItemObject.php:161
+msgid "I abstain"
+msgstr ""
+
+#: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187
+#: ../../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:1083
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/ItemObject.php:184 ../../include/conversation.php:1708
+#: ../../mod/photos.php:1088
+msgctxt "noun"
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/ItemObject.php:212
+msgid "Add Star"
+msgstr ""
+
+#: ../../include/ItemObject.php:213
+msgid "Remove Star"
+msgstr ""
+
+#: ../../include/ItemObject.php:214
+msgid "Toggle Star Status"
+msgstr ""
+
+#: ../../include/ItemObject.php:218
+msgid "starred"
+msgstr ""
+
+#: ../../include/ItemObject.php:227 ../../include/conversation.php:671
+msgid "Message signature validated"
+msgstr ""
+
+#: ../../include/ItemObject.php:228 ../../include/conversation.php:672
+msgid "Message signature incorrect"
+msgstr ""
+
+#: ../../include/ItemObject.php:236
+msgid "Add Tag"
+msgstr ""
+
+#: ../../include/ItemObject.php:254 ../../mod/photos.php:1023
+msgid "I like this (toggle)"
+msgstr ""
+
+#: ../../include/ItemObject.php:254 ../../include/taxonomy.php:317
+msgid "like"
+msgstr ""
+
+#: ../../include/ItemObject.php:255 ../../mod/photos.php:1024
+msgid "I don't like this (toggle)"
+msgstr ""
+
+#: ../../include/ItemObject.php:255 ../../include/taxonomy.php:318
+msgid "dislike"
+msgstr ""
+
+#: ../../include/ItemObject.php:259
+msgid "Share This"
+msgstr ""
+
+#: ../../include/ItemObject.php:259
+msgid "share"
+msgstr ""
+
+#: ../../include/ItemObject.php:276
 #, php-format
-msgid "%1$s's bookmarks"
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/ItemObject.php:301 ../../include/ItemObject.php:302
+#, php-format
+msgid "View %s's profile - %s"
+msgstr ""
+
+#: ../../include/ItemObject.php:305
+msgid "to"
+msgstr ""
+
+#: ../../include/ItemObject.php:306
+msgid "via"
+msgstr ""
+
+#: ../../include/ItemObject.php:307
+msgid "Wall-to-Wall"
+msgstr ""
+
+#: ../../include/ItemObject.php:308
+msgid "via Wall-To-Wall:"
+msgstr ""
+
+#: ../../include/ItemObject.php:311
+msgid "Delivery Report"
+msgstr ""
+
+#: ../../include/ItemObject.php:320 ../../include/conversation.php:718
+#, php-format
+msgid "from %s"
+msgstr ""
+
+#: ../../include/ItemObject.php:323 ../../include/conversation.php:721
+#, php-format
+msgid "last edited: %s"
+msgstr ""
+
+#: ../../include/ItemObject.php:324 ../../include/conversation.php:722
+#, php-format
+msgid "Expires: %s"
+msgstr ""
+
+#: ../../include/ItemObject.php:347
+msgid "Save Bookmarks"
+msgstr ""
+
+#: ../../include/ItemObject.php:348
+msgid "Add to Calendar"
+msgstr ""
+
+#: ../../include/ItemObject.php:357
+msgid "Mark all seen"
+msgstr ""
+
+#: ../../include/ItemObject.php:363 ../../mod/photos.php:1209
+msgctxt "noun"
+msgid "Likes"
+msgstr ""
+
+#: ../../include/ItemObject.php:364 ../../mod/photos.php:1210
+msgctxt "noun"
+msgid "Dislikes"
+msgstr ""
+
+#: ../../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:679 ../../mod/photos.php:1042
+#: ../../mod/photos.php:1160
+msgid "This is you"
+msgstr ""
+
+#: ../../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: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: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: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: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:688
+msgid "Image"
+msgstr ""
+
+#: ../../include/ItemObject.php:689
+msgid "Insert Link"
+msgstr ""
+
+#: ../../include/ItemObject.php:690
+msgid "Video"
+msgstr ""
+
+#: ../../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
@@ -2068,12 +2301,6 @@ msgstr[1] ""
 msgid "View Connections"
 msgstr ""
 
-#: ../../include/text.php:857 ../../include/text.php:869
-#: ../../include/apps.php:147 ../../include/nav.php:159
-#: ../../mod/search.php:38
-msgid "Search"
-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
@@ -2085,6 +2312,10 @@ msgstr ""
 msgid "poke"
 msgstr ""
 
+#: ../../include/text.php:933 ../../include/conversation.php:243
+msgid "poked"
+msgstr ""
+
 #: ../../include/text.php:934
 msgid "ping"
 msgstr ""
@@ -2213,638 +2444,93 @@ msgstr ""
 msgid "May"
 msgstr ""
 
-#: ../../include/text.php:1247
-msgid "unknown.???"
+#: ../../include/text.php:1221 ../../include/text.php:1225
+msgid "Unknown Attachment"
+msgstr ""
+
+#: ../../include/text.php:1227
+msgid "Attachment"
 msgstr ""
 
-#: ../../include/text.php:1248
-msgid "bytes"
+#: ../../include/text.php:1227
+msgid "Size Unknown"
 msgstr ""
 
-#: ../../include/text.php:1284
+#: ../../include/text.php:1263
 msgid "remove category"
 msgstr ""
 
-#: ../../include/text.php:1359
+#: ../../include/text.php:1340
 msgid "remove from file"
 msgstr ""
 
-#: ../../include/text.php:1443 ../../include/text.php:1454
+#: ../../include/text.php:1441 ../../include/text.php:1452
 msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/text.php:1609 ../../mod/events.php:497
+#: ../../include/text.php:1620 ../../mod/events.php:497
 msgid "Link to Source"
 msgstr ""
 
-#: ../../include/text.php:1630 ../../include/text.php:1701
+#: ../../include/text.php:1641 ../../include/text.php:1712
 msgid "default"
 msgstr ""
 
-#: ../../include/text.php:1638
+#: ../../include/text.php:1649
 msgid "Page layout"
 msgstr ""
 
-#: ../../include/text.php:1638
+#: ../../include/text.php:1649
 msgid "You can create your own with the layouts tool"
 msgstr ""
 
-#: ../../include/text.php:1679
+#: ../../include/text.php:1690
 msgid "Page content type"
 msgstr ""
 
-#: ../../include/text.php:1713
+#: ../../include/text.php:1724
 msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/text.php:1845
-msgid "activity"
-msgstr ""
-
-#: ../../include/text.php:2140
-msgid "Design Tools"
-msgstr ""
-
-#: ../../include/text.php:2143 ../../mod/blocks.php:147
-msgid "Blocks"
-msgstr ""
-
-#: ../../include/text.php:2144 ../../mod/menu.php:103
-msgid "Menus"
-msgstr ""
-
-#: ../../include/text.php:2145 ../../mod/layouts.php:174
-msgid "Layouts"
-msgstr ""
-
-#: ../../include/text.php:2146
-msgid "Pages"
-msgstr ""
-
-#: ../../include/acl_selectors.php:239
-msgid "Visible to your default audience"
-msgstr ""
-
-#: ../../include/acl_selectors.php:240
-msgid "Show"
-msgstr ""
-
-#: ../../include/acl_selectors.php:241
-msgid "Don't show"
-msgstr ""
-
-#: ../../include/acl_selectors.php:247 ../../mod/filestorage.php:147
-#: ../../mod/chat.php:207 ../../mod/photos.php:592 ../../mod/photos.php:962
-#: ../../mod/events.php:708 ../../mod/thing.php:310 ../../mod/thing.php:356
-msgid "Permissions"
-msgstr ""
-
-#: ../../include/acl_selectors.php:248 ../../include/ItemObject.php:361
-#: ../../mod/photos.php:1179
-msgid "Close"
-msgstr ""
-
-#: ../../include/attach.php:243 ../../include/attach.php:329
-msgid "Item was not found."
-msgstr ""
-
-#: ../../include/attach.php:471
-msgid "No source file."
-msgstr ""
-
-#: ../../include/attach.php:489
-msgid "Cannot locate file to replace"
-msgstr ""
-
-#: ../../include/attach.php:507
-msgid "Cannot locate file to revise/update"
-msgstr ""
-
-#: ../../include/attach.php:632
-#, php-format
-msgid "File exceeds size limit of %d"
-msgstr ""
-
-#: ../../include/attach.php:645
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
-msgstr ""
-
-#: ../../include/attach.php:793
-msgid "File upload failed. Possible system limit or action terminated."
-msgstr ""
-
-#: ../../include/attach.php:806
-msgid "Stored file could not be verified. Upload failed."
-msgstr ""
-
-#: ../../include/attach.php:854 ../../include/attach.php:870
-msgid "Path not available."
-msgstr ""
-
-#: ../../include/attach.php:916 ../../include/attach.php:1069
-msgid "Empty pathname"
-msgstr ""
-
-#: ../../include/attach.php:942
-msgid "duplicate filename or path"
-msgstr ""
-
-#: ../../include/attach.php:965
-msgid "Path not found."
-msgstr ""
-
-#: ../../include/attach.php:1023
-msgid "mkdir failed."
-msgstr ""
-
-#: ../../include/attach.php:1027
-msgid "database storage failed."
-msgstr ""
-
-#: ../../include/attach.php:1075
-msgid "Empty path"
-msgstr ""
-
-#: ../../include/import.php:23
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
-msgstr ""
-
-#: ../../include/import.php:70
-msgid "Channel clone failed. Import failed."
-msgstr ""
-
-#: ../../include/import.php:80 ../../mod/import.php:138
-msgid "Cloned channel not found. Import failed."
-msgstr ""
-
-#: ../../include/notify.php:20
-msgid "created a new post"
-msgstr ""
-
-#: ../../include/notify.php:21
-#, php-format
-msgid "commented on %s's post"
-msgstr ""
-
-#: ../../include/page_widgets.php:6
-msgid "New Page"
-msgstr ""
-
-#: ../../include/page_widgets.php:39 ../../mod/layouts.php:188
-#: ../../mod/webpages.php:187 ../../mod/blocks.php:159
-msgid "View"
-msgstr ""
-
-#: ../../include/page_widgets.php:41 ../../mod/webpages.php:189
-msgid "Actions"
-msgstr ""
-
-#: ../../include/page_widgets.php:42 ../../mod/webpages.php:190
-msgid "Page Link"
-msgstr ""
-
-#: ../../include/page_widgets.php:43
-msgid "Title"
-msgstr ""
-
-#: ../../include/page_widgets.php:44 ../../mod/layouts.php:181
-#: ../../mod/menu.php:110 ../../mod/webpages.php:192 ../../mod/blocks.php:150
-msgid "Created"
-msgstr ""
-
-#: ../../include/page_widgets.php:45 ../../mod/layouts.php:182
-#: ../../mod/menu.php:111 ../../mod/webpages.php:193 ../../mod/blocks.php:151
-msgid "Edited"
-msgstr ""
-
-#: ../../include/photo/photo_driver.php:705 ../../mod/photos.php:94
-#: ../../mod/photos.php:660 ../../mod/profile_photo.php:146
-#: ../../mod/profile_photo.php:236 ../../mod/profile_photo.php:376
-msgid "Profile Photos"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23 ../../mod/id.php:103
-msgid "Male"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23 ../../mod/id.php:105
-msgid "Female"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Currently Male"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Currently Female"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Male"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Female"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Transgender"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Intersex"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Transsexual"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Hermaphrodite"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Neuter"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Non-specific"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Undecided"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-#: ../../include/profile_selectors.php:61
-msgid "Males"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-#: ../../include/profile_selectors.php:61
-msgid "Females"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Gay"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Lesbian"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "No Preference"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Bisexual"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Autosexual"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Abstinent"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Virgin"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Deviant"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Fetish"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Oodles"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Nonsexual"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Single"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Lonely"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Available"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Unavailable"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Has crush"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Infatuated"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Dating"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Unfaithful"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Sex Addict"
-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
-#: ../../mod/settings.php:337 ../../mod/settings.php:341
-#: ../../mod/settings.php:342 ../../mod/settings.php:345
-#: ../../mod/settings.php:356
-msgid "Friends"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Friends/Benefits"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Casual"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Engaged"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Married"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Imaginarily married"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Partners"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Cohabiting"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Common law"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Happy"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Not looking"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Swinger"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Betrayed"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Separated"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Unstable"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Divorced"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Imaginarily divorced"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Widowed"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Uncertain"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "It's complicated"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Don't care"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Ask me"
-msgstr ""
-
-#: ../../include/oembed.php:213
-msgid "Embedded content"
-msgstr ""
-
-#: ../../include/oembed.php:222
-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:992 ../../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:953
-msgid "Not specified"
-msgstr ""
-
-#: ../../include/event.php:954
-msgid "Needs Action"
-msgstr ""
-
-#: ../../include/event.php:955
-msgid "Completed"
-msgstr ""
-
-#: ../../include/event.php:956
-msgid "In Process"
-msgstr ""
-
-#: ../../include/event.php:957
-msgid "Cancelled"
-msgstr ""
-
-#: ../../include/apps.php:128
-msgid "Site Admin"
-msgstr ""
-
-#: ../../include/apps.php:130
-msgid "Address Book"
-msgstr ""
-
-#: ../../include/apps.php:131 ../../include/nav.php:111 ../../boot.php:1497
-msgid "Login"
-msgstr ""
-
-#: ../../include/apps.php:132 ../../include/nav.php:200
-#: ../../mod/manage.php:160
-msgid "Channel Manager"
-msgstr ""
-
-#: ../../include/apps.php:133
-msgid "Matrix"
-msgstr ""
-
-#: ../../include/apps.php:134 ../../include/widgets.php:553
-#: ../../include/nav.php:202 ../../mod/admin.php:1033 ../../mod/admin.php:1233
-msgid "Settings"
-msgstr ""
-
-#: ../../include/apps.php:137 ../../include/nav.php:177
-msgid "Channel Home"
-msgstr ""
-
-#: ../../include/apps.php:138 ../../include/identity.php:1226
-#: ../../include/identity.php:1343 ../../mod/profperm.php:112
-msgid "Profile"
-msgstr ""
-
-#: ../../include/apps.php:140 ../../include/nav.php:196
-#: ../../mod/events.php:526
-msgid "Events"
-msgstr ""
-
-#: ../../include/apps.php:141 ../../include/nav.php:162
-msgid "Directory"
-msgstr ""
-
-#: ../../include/apps.php:142 ../../include/nav.php:154 ../../mod/help.php:202
-#: ../../mod/help.php:207 ../../mod/layouts.php:176
-msgid "Help"
-msgstr ""
-
-#: ../../include/apps.php:143 ../../include/nav.php:188
-msgid "Mail"
-msgstr ""
-
-#: ../../include/apps.php:144 ../../mod/mood.php:131
-msgid "Mood"
-msgstr ""
-
-#: ../../include/apps.php:146 ../../include/nav.php:97
-msgid "Chat"
-msgstr ""
-
-#: ../../include/apps.php:148
-msgid "Probe"
-msgstr ""
-
-#: ../../include/apps.php:149
-msgid "Suggest"
-msgstr ""
-
-#: ../../include/apps.php:150
-msgid "Random Channel"
-msgstr ""
-
-#: ../../include/apps.php:151
-msgid "Invite"
-msgstr ""
-
-#: ../../include/apps.php:152
-msgid "Features"
-msgstr ""
-
-#: ../../include/apps.php:153 ../../mod/id.php:28
-msgid "Language"
-msgstr ""
-
-#: ../../include/apps.php:154
-msgid "Post"
-msgstr ""
-
-#: ../../include/apps.php:155 ../../mod/id.php:17 ../../mod/id.php:18
-#: ../../mod/id.php:19
-msgid "Profile Photo"
+#: ../../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/apps.php:247 ../../mod/settings.php:84
-#: ../../mod/settings.php:609
-msgid "Update"
+#: ../../include/text.php:1849 ../../include/conversation.php:148
+#: ../../mod/like.php:361 ../../mod/subthread.php:72
+#: ../../mod/subthread.php:172
+msgid "status"
 msgstr ""
 
-#: ../../include/apps.php:247
-msgid "Install"
+#: ../../include/text.php:1851 ../../include/conversation.php:150
+#: ../../mod/tagger.php:53
+msgid "comment"
 msgstr ""
 
-#: ../../include/apps.php:252
-msgid "Purchase"
+#: ../../include/text.php:1856
+msgid "activity"
 msgstr ""
 
-#: ../../include/auth.php:131
-msgid "Logged out."
+#: ../../include/text.php:2151
+msgid "Design Tools"
 msgstr ""
 
-#: ../../include/auth.php:272
-msgid "Failed authentication"
+#: ../../include/text.php:2154 ../../mod/blocks.php:147
+msgid "Blocks"
 msgstr ""
 
-#: ../../include/auth.php:286 ../../mod/openid.php:189
-msgid "Login failed."
+#: ../../include/text.php:2155 ../../mod/menu.php:103
+msgid "Menus"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:373
-msgid "Attachments:"
+#: ../../include/text.php:2156 ../../mod/layouts.php:174
+msgid "Layouts"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:461
-msgid "$Projectname event notification:"
+#: ../../include/text.php:2157
+msgid "Pages"
 msgstr ""
 
 #: ../../include/bbcode.php:123 ../../include/bbcode.php:793
@@ -2938,47 +2624,47 @@ msgstr ""
 msgid "Failed to store account information."
 msgstr ""
 
-#: ../../include/account.php:246
+#: ../../include/account.php:248
 #, php-format
 msgid "Registration confirmation for %s"
 msgstr ""
 
-#: ../../include/account.php:312
+#: ../../include/account.php:314
 #, php-format
 msgid "Registration request at %s"
 msgstr ""
 
-#: ../../include/account.php:336
+#: ../../include/account.php:338
 msgid "your registration password"
 msgstr ""
 
-#: ../../include/account.php:339 ../../include/account.php:399
+#: ../../include/account.php:341 ../../include/account.php:401
 #, php-format
 msgid "Registration details for %s"
 msgstr ""
 
-#: ../../include/account.php:408
+#: ../../include/account.php:410
 msgid "Account approved."
 msgstr ""
 
-#: ../../include/account.php:447
+#: ../../include/account.php:449
 #, php-format
 msgid "Registration revoked for %s"
 msgstr ""
 
-#: ../../include/account.php:492
+#: ../../include/account.php:494
 msgid "Account verified. Please login."
 msgstr ""
 
-#: ../../include/account.php:705 ../../include/account.php:707
+#: ../../include/account.php:707 ../../include/account.php:709
 msgid "Click here to upgrade."
 msgstr ""
 
-#: ../../include/account.php:713
+#: ../../include/account.php:715
 msgid "This action exceeds the limits set by your subscription plan."
 msgstr ""
 
-#: ../../include/account.php:718
+#: ../../include/account.php:720
 msgid "This action is not available under your subscription plan."
 msgstr ""
 
@@ -2998,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 ""
 
@@ -3006,15 +2692,15 @@ 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 ""
 
-#: ../../include/security.php:345
+#: ../../include/security.php:381
 msgid ""
 "The form security token was not correct. This probably happened because the "
 "form has been opened for too long (>3 hours) before submitting it."
@@ -3129,83 +2815,37 @@ msgstr ""
 msgid "add"
 msgstr ""
 
-#: ../../include/taxonomy.php:229 ../../include/taxonomy.php:250
-msgid "Tags"
-msgstr ""
-
-#: ../../include/taxonomy.php:294
-msgid "Keywords"
-msgstr ""
-
-#: ../../include/taxonomy.php:315
-msgid "have"
-msgstr ""
-
-#: ../../include/taxonomy.php:315
-msgid "has"
-msgstr ""
-
-#: ../../include/taxonomy.php:316
-msgid "want"
-msgstr ""
-
-#: ../../include/taxonomy.php:316
-msgid "wants"
-msgstr ""
-
-#: ../../include/taxonomy.php:317 ../../include/ItemObject.php:254
-msgid "like"
-msgstr ""
-
-#: ../../include/taxonomy.php:317
-msgid "likes"
-msgstr ""
-
-#: ../../include/taxonomy.php:318 ../../include/ItemObject.php:255
-msgid "dislike"
+#: ../../include/zot.php:683
+msgid "Invalid data packet"
 msgstr ""
 
-#: ../../include/taxonomy.php:318
-msgid "dislikes"
+#: ../../include/zot.php:699
+msgid "Unable to verify channel signature"
 msgstr ""
 
-#: ../../include/dir_fns.php:126
-msgid "Directory Options"
+#: ../../include/zot.php:2235
+#, php-format
+msgid "Unable to verify site signature for %s"
 msgstr ""
 
-#: ../../include/dir_fns.php:128
-msgid "Safe Mode"
+#: ../../include/zot.php:3555
+msgid "invalid target signature"
 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:589 ../../mod/settings.php:574
-#: ../../mod/api.php:106 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1501
-msgid "No"
+#: ../../include/message.php:18
+msgid "No recipient provided."
 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:589 ../../mod/settings.php:574
-#: ../../mod/api.php:105 ../../view/theme/redbasic/php/config.php:104
-#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1501
-msgid "Yes"
+#: ../../include/message.php:23
+msgid "[no subject]"
 msgstr ""
 
-#: ../../include/dir_fns.php:129
-msgid "Public Forums Only"
+#: ../../include/message.php:43
+msgid "Unable to determine sender."
 msgstr ""
 
-#: ../../include/dir_fns.php:130
-msgid "This Website Only"
+#: ../../include/message.php:218
+msgid "Stored post could not be verified."
 msgstr ""
 
 #: ../../include/identity.php:32
@@ -3245,11 +2885,11 @@ msgstr ""
 msgid "Default Profile"
 msgstr ""
 
-#: ../../include/identity.php:745
+#: ../../include/identity.php:769
 msgid "Requested channel is not available."
 msgstr ""
 
-#: ../../include/identity.php:791 ../../mod/achievements.php:11
+#: ../../include/identity.php:815 ../../mod/achievements.php:11
 #: ../../mod/filestorage.php:54 ../../mod/hcard.php:8 ../../mod/layouts.php:29
 #: ../../mod/editblock.php:29 ../../mod/profile.php:16
 #: ../../mod/webpages.php:29 ../../mod/blocks.php:29
@@ -3258,418 +2898,769 @@ msgstr ""
 msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../include/identity.php:954 ../../mod/profiles.php:774
+#: ../../include/identity.php:978 ../../mod/profiles.php:774
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../include/identity.php:960
+#: ../../include/identity.php:984
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/identity.php:960
+#: ../../include/identity.php:984
 msgid "Manage/edit profiles"
 msgstr ""
 
-#: ../../include/identity.php:961 ../../mod/profiles.php:775
+#: ../../include/identity.php:985 ../../mod/profiles.php:775
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../include/identity.php:964 ../../include/nav.php:90
+#: ../../include/identity.php:988 ../../include/nav.php:90
 msgid "Edit Profile"
 msgstr ""
 
-#: ../../include/identity.php:976 ../../mod/profiles.php:786
+#: ../../include/identity.php:1000 ../../mod/profiles.php:786
 msgid "Profile Image"
 msgstr ""
 
-#: ../../include/identity.php:979
+#: ../../include/identity.php:1003
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../include/identity.php:980 ../../mod/profiles.php:669
+#: ../../include/identity.php:1004 ../../mod/profiles.php:669
 #: ../../mod/profiles.php:790
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../include/identity.php:996 ../../include/identity.php:1236
+#: ../../include/identity.php:1020 ../../include/identity.php:1260
 msgid "Gender:"
 msgstr ""
 
-#: ../../include/identity.php:997 ../../include/identity.php:1280
+#: ../../include/identity.php:1021 ../../include/identity.php:1304
 msgid "Status:"
 msgstr ""
 
-#: ../../include/identity.php:998 ../../include/identity.php:1291
+#: ../../include/identity.php:1022 ../../include/identity.php:1315
 msgid "Homepage:"
 msgstr ""
 
-#: ../../include/identity.php:999
+#: ../../include/identity.php:1023
 msgid "Online Now"
 msgstr ""
 
-#: ../../include/identity.php:1083 ../../include/identity.php:1161
+#: ../../include/identity.php:1107 ../../include/identity.php:1185
 #: ../../mod/ping.php:318
 msgid "g A l F d"
 msgstr ""
 
-#: ../../include/identity.php:1084 ../../include/identity.php:1162
+#: ../../include/identity.php:1108 ../../include/identity.php:1186
 msgid "F d"
 msgstr ""
 
-#: ../../include/identity.php:1129 ../../include/identity.php:1201
+#: ../../include/identity.php:1153 ../../include/identity.php:1225
 #: ../../mod/ping.php:341
 msgid "[today]"
 msgstr ""
 
-#: ../../include/identity.php:1140
+#: ../../include/identity.php:1164
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../include/identity.php:1141
+#: ../../include/identity.php:1165
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../include/identity.php:1194
+#: ../../include/identity.php:1218
 msgid "[No description]"
 msgstr ""
 
-#: ../../include/identity.php:1212
+#: ../../include/identity.php:1236
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../include/identity.php:1213
+#: ../../include/identity.php:1237
 msgid "Events this week:"
 msgstr ""
 
-#: ../../include/identity.php:1234 ../../mod/settings.php:1026
+#: ../../include/identity.php:1258 ../../mod/settings.php:1026
 msgid "Full Name:"
 msgstr ""
 
-#: ../../include/identity.php:1241
+#: ../../include/identity.php:1265
 msgid "Like this channel"
 msgstr ""
 
-#: ../../include/identity.php:1265
+#: ../../include/identity.php:1289
 msgid "j F, Y"
 msgstr ""
 
-#: ../../include/identity.php:1266
+#: ../../include/identity.php:1290
 msgid "j F"
 msgstr ""
 
-#: ../../include/identity.php:1273
+#: ../../include/identity.php:1297
 msgid "Birthday:"
 msgstr ""
 
-#: ../../include/identity.php:1277 ../../mod/directory.php:297
+#: ../../include/identity.php:1301 ../../mod/directory.php:297
 msgid "Age:"
 msgstr ""
 
-#: ../../include/identity.php:1286
+#: ../../include/identity.php:1310
 #, php-format
 msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/identity.php:1289 ../../mod/profiles.php:691
+#: ../../include/identity.php:1313 ../../mod/profiles.php:691
 msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../include/identity.php:1293 ../../mod/directory.php:313
+#: ../../include/identity.php:1317 ../../mod/directory.php:313
 #: ../../mod/profiles.php:693
 msgid "Hometown:"
 msgstr ""
 
-#: ../../include/identity.php:1295
+#: ../../include/identity.php:1319
 msgid "Tags:"
 msgstr ""
 
-#: ../../include/identity.php:1297 ../../mod/profiles.php:694
+#: ../../include/identity.php:1321 ../../mod/profiles.php:694
 msgid "Political Views:"
 msgstr ""
 
-#: ../../include/identity.php:1299
+#: ../../include/identity.php:1323
 msgid "Religion:"
 msgstr ""
 
-#: ../../include/identity.php:1301 ../../mod/directory.php:315
+#: ../../include/identity.php:1325 ../../mod/directory.php:315
 msgid "About:"
 msgstr ""
 
-#: ../../include/identity.php:1303
+#: ../../include/identity.php:1327
 msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/identity.php:1305 ../../mod/profiles.php:697
+#: ../../include/identity.php:1329 ../../mod/profiles.php:697
 msgid "Likes:"
 msgstr ""
 
-#: ../../include/identity.php:1307 ../../mod/profiles.php:698
+#: ../../include/identity.php:1331 ../../mod/profiles.php:698
 msgid "Dislikes:"
 msgstr ""
 
-#: ../../include/identity.php:1309
+#: ../../include/identity.php:1333
 msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../include/identity.php:1311
+#: ../../include/identity.php:1335
 msgid "My other channels:"
 msgstr ""
 
-#: ../../include/identity.php:1313
+#: ../../include/identity.php:1337
 msgid "Musical interests:"
 msgstr ""
 
-#: ../../include/identity.php:1315
+#: ../../include/identity.php:1339
 msgid "Books, literature:"
 msgstr ""
 
-#: ../../include/identity.php:1317
+#: ../../include/identity.php:1341
 msgid "Television:"
 msgstr ""
 
-#: ../../include/identity.php:1319
+#: ../../include/identity.php:1343
 msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../include/identity.php:1321
+#: ../../include/identity.php:1345
 msgid "Love/Romance:"
 msgstr ""
 
-#: ../../include/identity.php:1323
+#: ../../include/identity.php:1347
 msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/identity.php:1325
+#: ../../include/identity.php:1349
 msgid "School/education:"
 msgstr ""
 
-#: ../../include/identity.php:1345
+#: ../../include/identity.php:1369
 msgid "Like this thing"
 msgstr ""
 
-#: ../../include/message.php:18
-msgid "No recipient provided."
+#: ../../include/taxonomy.php:229 ../../include/taxonomy.php:250
+msgid "Tags"
 msgstr ""
 
-#: ../../include/message.php:23
-msgid "[no subject]"
+#: ../../include/taxonomy.php:294
+msgid "Keywords"
 msgstr ""
 
-#: ../../include/message.php:45
-msgid "Unable to determine sender."
+#: ../../include/taxonomy.php:315
+msgid "have"
 msgstr ""
 
-#: ../../include/message.php:203
-msgid "Stored post could not be verified."
+#: ../../include/taxonomy.php:315
+msgid "has"
 msgstr ""
 
-#: ../../include/ItemObject.php:130
-msgid "Save to Folder"
+#: ../../include/taxonomy.php:316
+msgid "want"
 msgstr ""
 
-#: ../../include/ItemObject.php:151
-msgid "I will attend"
+#: ../../include/taxonomy.php:316
+msgid "wants"
 msgstr ""
 
-#: ../../include/ItemObject.php:151
-msgid "I will not attend"
+#: ../../include/taxonomy.php:317
+msgid "likes"
 msgstr ""
 
-#: ../../include/ItemObject.php:151
-msgid "I might attend"
+#: ../../include/taxonomy.php:318
+msgid "dislikes"
 msgstr ""
 
-#: ../../include/ItemObject.php:161
-msgid "I agree"
+#: ../../include/attach.php:243 ../../include/attach.php:329
+msgid "Item was not found."
 msgstr ""
 
-#: ../../include/ItemObject.php:161
-msgid "I disagree"
+#: ../../include/attach.php:493
+msgid "No source file."
 msgstr ""
 
-#: ../../include/ItemObject.php:161
-msgid "I abstain"
+#: ../../include/attach.php:511
+msgid "Cannot locate file to replace"
 msgstr ""
 
-#: ../../include/ItemObject.php:212
-msgid "Add Star"
+#: ../../include/attach.php:529
+msgid "Cannot locate file to revise/update"
 msgstr ""
 
-#: ../../include/ItemObject.php:213
-msgid "Remove Star"
+#: ../../include/attach.php:664
+#, php-format
+msgid "File exceeds size limit of %d"
 msgstr ""
 
-#: ../../include/ItemObject.php:214
-msgid "Toggle Star Status"
+#: ../../include/attach.php:678
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
 msgstr ""
 
-#: ../../include/ItemObject.php:218
-msgid "starred"
+#: ../../include/attach.php:828
+msgid "File upload failed. Possible system limit or action terminated."
 msgstr ""
 
-#: ../../include/ItemObject.php:236
-msgid "Add Tag"
+#: ../../include/attach.php:841
+msgid "Stored file could not be verified. Upload failed."
 msgstr ""
 
-#: ../../include/ItemObject.php:254 ../../mod/photos.php:987
-msgid "I like this (toggle)"
+#: ../../include/attach.php:889 ../../include/attach.php:905
+msgid "Path not available."
 msgstr ""
 
-#: ../../include/ItemObject.php:255 ../../mod/photos.php:988
-msgid "I don't like this (toggle)"
+#: ../../include/attach.php:951 ../../include/attach.php:1103
+msgid "Empty pathname"
 msgstr ""
 
-#: ../../include/ItemObject.php:259
-msgid "Share This"
+#: ../../include/attach.php:977
+msgid "duplicate filename or path"
 msgstr ""
 
-#: ../../include/ItemObject.php:259
-msgid "share"
+#: ../../include/attach.php:999
+msgid "Path not found."
 msgstr ""
 
-#: ../../include/ItemObject.php:276
+#: ../../include/attach.php:1057
+msgid "mkdir failed."
+msgstr ""
+
+#: ../../include/attach.php:1061
+msgid "database storage failed."
+msgstr ""
+
+#: ../../include/attach.php:1109
+msgid "Empty path"
+msgstr ""
+
+#: ../../include/conversation.php:126 ../../mod/like.php:113
+msgid "channel"
+msgstr ""
+
+#: ../../include/conversation.php:164 ../../mod/like.php:410
 #, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] ""
-msgstr[1] ""
+msgid "%1$s likes %2$s's %3$s"
+msgstr ""
 
-#: ../../include/ItemObject.php:295 ../../include/ItemObject.php:296
+#: ../../include/conversation.php:167 ../../mod/like.php:412
 #, php-format
-msgid "View %s's profile - %s"
+msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: ../../include/ItemObject.php:299
-msgid "to"
+#: ../../include/conversation.php:204
+#, php-format
+msgid "%1$s is now connected with %2$s"
 msgstr ""
 
-#: ../../include/ItemObject.php:300
-msgid "via"
+#: ../../include/conversation.php:239
+#, php-format
+msgid "%1$s poked %2$s"
 msgstr ""
 
-#: ../../include/ItemObject.php:301
-msgid "Wall-to-Wall"
+#: ../../include/conversation.php:260 ../../mod/mood.php:63
+#, php-format
+msgctxt "mood"
+msgid "%1$s is %2$s"
 msgstr ""
 
-#: ../../include/ItemObject.php:302
-msgid "via Wall-To-Wall:"
+#: ../../include/conversation.php:574 ../../mod/photos.php:1060
+msgctxt "title"
+msgid "Likes"
 msgstr ""
 
-#: ../../include/ItemObject.php:305
-msgid "Delivery Report"
+#: ../../include/conversation.php:574 ../../mod/photos.php:1060
+msgctxt "title"
+msgid "Dislikes"
 msgstr ""
 
-#: ../../include/ItemObject.php:339
-msgid "Save Bookmarks"
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
+msgctxt "title"
+msgid "Agree"
 msgstr ""
 
-#: ../../include/ItemObject.php:340
-msgid "Add to Calendar"
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
+msgctxt "title"
+msgid "Disagree"
 msgstr ""
 
-#: ../../include/ItemObject.php:349
-msgid "Mark all seen"
+#: ../../include/conversation.php:575 ../../mod/photos.php:1061
+msgctxt "title"
+msgid "Abstain"
 msgstr ""
 
-#: ../../include/ItemObject.php:355 ../../mod/photos.php:1173
-msgctxt "noun"
-msgid "Likes"
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
+msgctxt "title"
+msgid "Attending"
 msgstr ""
 
-#: ../../include/ItemObject.php:356 ../../mod/photos.php:1174
-msgctxt "noun"
-msgid "Dislikes"
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
+msgctxt "title"
+msgid "Not attending"
 msgstr ""
 
-#: ../../include/ItemObject.php:671 ../../mod/photos.php:1006
-#: ../../mod/photos.php:1124
-msgid "This is you"
+#: ../../include/conversation.php:576 ../../mod/photos.php:1062
+msgctxt "title"
+msgid "Might attend"
 msgstr ""
 
-#: ../../include/ItemObject.php:680
-msgid "Image"
+#: ../../include/conversation.php:692
+#, php-format
+msgid "View %s's profile @ %s"
 msgstr ""
 
-#: ../../include/ItemObject.php:681
-msgid "Insert Link"
+#: ../../include/conversation.php:709
+msgid "Categories:"
 msgstr ""
 
-#: ../../include/ItemObject.php:682
-msgid "Video"
+#: ../../include/conversation.php:710
+msgid "Filed under:"
 msgstr ""
 
-#: ../../include/items.php:423 ../../mod/like.php:280 ../../mod/dreport.php:6
-#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/profperm.php:23
-#: ../../mod/import_items.php:114 ../../index.php:360
-msgid "Permission denied"
+#: ../../include/conversation.php:737
+msgid "View in context"
 msgstr ""
 
-#: ../../include/items.php:1128 ../../include/items.php:1174
-msgid "(Unknown)"
+#: ../../include/conversation.php:850
+msgid "remove"
 msgstr ""
 
-#: ../../include/items.php:1371
-msgid "Visible to anybody on the internet."
+#: ../../include/conversation.php:854 ../../include/nav.php:241
+msgid "Loading..."
 msgstr ""
 
-#: ../../include/items.php:1373
-msgid "Visible to you only."
+#: ../../include/conversation.php:855
+msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/items.php:1375
-msgid "Visible to anybody in this network."
+#: ../../include/conversation.php:943
+msgid "View Source"
 msgstr ""
 
-#: ../../include/items.php:1377
-msgid "Visible to anybody authenticated."
+#: ../../include/conversation.php:944
+msgid "Follow Thread"
 msgstr ""
 
-#: ../../include/items.php:1379
-#, php-format
-msgid "Visible to anybody on %s."
+#: ../../include/conversation.php:945
+msgid "View Status"
 msgstr ""
 
-#: ../../include/items.php:1381
-msgid "Visible to all connections."
+#: ../../include/conversation.php:946 ../../include/nav.php:86
+#: ../../mod/connedit.php:493
+msgid "View Profile"
 msgstr ""
 
-#: ../../include/items.php:1383
-msgid "Visible to approved connections."
+#: ../../include/conversation.php:947
+msgid "View Photos"
 msgstr ""
 
-#: ../../include/items.php:1385
-msgid "Visible to specific connections."
+#: ../../include/conversation.php:948
+msgid "Activity/Posts"
 msgstr ""
 
-#: ../../include/items.php:4263 ../../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."
+#: ../../include/conversation.php:950
+msgid "Edit Connection"
 msgstr ""
 
-#: ../../include/items.php:4772 ../../mod/group.php:38 ../../mod/group.php:137
-msgid "Collection not found."
+#: ../../include/conversation.php:951
+msgid "Send PM"
 msgstr ""
 
-#: ../../include/items.php:4788
-msgid "Collection is empty."
+#: ../../include/conversation.php:1066
+#, php-format
+msgid "%s likes this."
 msgstr ""
 
-#: ../../include/items.php:4795
+#: ../../include/conversation.php:1066
 #, php-format
-msgid "Collection: %s"
+msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/items.php:4805 ../../mod/connedit.php:658
+#: ../../include/conversation.php:1070
 #, php-format
-msgid "Connection: %s"
+msgid "<span  %1$s>%2$d people</span> like this."
+msgid_plural "<span  %1$s>%2$d people</span> like this."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1072
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this."
+msgid_plural "<span  %1$s>%2$d people</span> don't like this."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1078
+msgid "and"
 msgstr ""
 
-#: ../../include/items.php:4807
-msgid "Connection not found."
+#: ../../include/conversation.php:1081
+#, php-format
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1082
+#, php-format
+msgid "%s like this."
+msgstr ""
+
+#: ../../include/conversation.php:1082
+#, php-format
+msgid "%s don't like this."
 msgstr ""
 
+#: ../../include/conversation.php:1145
+msgid "Visible to <strong>everybody</strong>"
+msgstr ""
+
+#: ../../include/conversation.php:1146 ../../mod/mail.php:194
+#: ../../mod/mail.php:308
+msgid "Please enter a link URL:"
+msgstr ""
+
+#: ../../include/conversation.php:1147
+msgid "Please enter a video link/URL:"
+msgstr ""
+
+#: ../../include/conversation.php:1148
+msgid "Please enter an audio link/URL:"
+msgstr ""
+
+#: ../../include/conversation.php:1149
+msgid "Tag term:"
+msgstr ""
+
+#: ../../include/conversation.php:1150 ../../mod/filer.php:48
+msgid "Save to Folder:"
+msgstr ""
+
+#: ../../include/conversation.php:1151
+msgid "Where are you right now?"
+msgstr ""
+
+#: ../../include/conversation.php:1152 ../../mod/mail.php:195
+#: ../../mod/mail.php:309 ../../mod/editpost.php:54
+msgid "Expires YYYY-MM-DD HH:MM"
+msgstr ""
+
+#: ../../include/conversation.php:1179 ../../mod/photos.php:1025
+#: ../../mod/layouts.php:184 ../../mod/webpages.php:182
+#: ../../mod/blocks.php:154
+msgid "Share"
+msgstr ""
+
+#: ../../include/conversation.php:1181
+msgid "Page link name"
+msgstr ""
+
+#: ../../include/conversation.php:1184
+msgid "Post as"
+msgstr ""
+
+#: ../../include/conversation.php:1191 ../../mod/editblock.php:142
+#: ../../mod/editpost.php:119 ../../mod/editlayout.php:140
+#: ../../mod/editwebpage.php:182
+msgid "Upload photo"
+msgstr ""
+
+#: ../../include/conversation.php:1192
+msgid "upload photo"
+msgstr ""
+
+#: ../../include/conversation.php:1193 ../../mod/mail.php:240
+#: ../../mod/mail.php:369 ../../mod/editblock.php:143
+#: ../../mod/editpost.php:120 ../../mod/editlayout.php:141
+#: ../../mod/editwebpage.php:183
+msgid "Attach file"
+msgstr ""
+
+#: ../../include/conversation.php:1194
+msgid "attach file"
+msgstr ""
+
+#: ../../include/conversation.php:1195 ../../mod/mail.php:241
+#: ../../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 ""
+
+#: ../../include/conversation.php:1196
+msgid "web link"
+msgstr ""
+
+#: ../../include/conversation.php:1197
+msgid "Insert video link"
+msgstr ""
+
+#: ../../include/conversation.php:1198
+msgid "video link"
+msgstr ""
+
+#: ../../include/conversation.php:1199
+msgid "Insert audio link"
+msgstr ""
+
+#: ../../include/conversation.php:1200
+msgid "audio link"
+msgstr ""
+
+#: ../../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 ""
+
+#: ../../include/conversation.php:1202
+msgid "set location"
+msgstr ""
+
+#: ../../include/conversation.php:1203 ../../mod/editpost.php:127
+msgid "Toggle voting"
+msgstr ""
+
+#: ../../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 ""
+
+#: ../../include/conversation.php:1207
+msgid "clear location"
+msgstr ""
+
+#: ../../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/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/editblock.php:151
+#: ../../mod/editpost.php:131 ../../mod/editlayout.php:149
+#: ../../mod/editwebpage.php:191
+msgid "Permission settings"
+msgstr ""
+
+#: ../../include/conversation.php:1216
+msgid "permissions"
+msgstr ""
+
+#: ../../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/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/editblock.php:176
+#: ../../mod/editpost.php:156 ../../mod/editlayout.php:173
+#: ../../mod/editwebpage.php:217
+msgid "Set expiration date"
+msgstr ""
+
+#: ../../include/conversation.php:1243 ../../mod/editpost.php:160
+#: ../../mod/events.php:691
+msgid "OK"
+msgstr ""
+
+#: ../../include/conversation.php:1244 ../../mod/fbrowser.php:82
+#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:161
+#: ../../mod/events.php:690 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
+#: ../../mod/settings.php:584 ../../mod/settings.php:610
+msgid "Cancel"
+msgstr ""
+
+#: ../../include/conversation.php:1487
+msgid "Discover"
+msgstr ""
+
+#: ../../include/conversation.php:1490
+msgid "Imported public streams"
+msgstr ""
+
+#: ../../include/conversation.php:1495
+msgid "Commented Order"
+msgstr ""
+
+#: ../../include/conversation.php:1498
+msgid "Sort by Comment Date"
+msgstr ""
+
+#: ../../include/conversation.php:1502
+msgid "Posted Order"
+msgstr ""
+
+#: ../../include/conversation.php:1505
+msgid "Sort by Post Date"
+msgstr ""
+
+#: ../../include/conversation.php:1510 ../../include/widgets.php:94
+msgid "Personal"
+msgstr ""
+
+#: ../../include/conversation.php:1513
+msgid "Posts that mention or involve you"
+msgstr ""
+
+#: ../../include/conversation.php:1519 ../../mod/menu.php:112
+#: ../../mod/connections.php:72 ../../mod/connections.php:82
+msgid "New"
+msgstr ""
+
+#: ../../include/conversation.php:1522
+msgid "Activity Stream - by date"
+msgstr ""
+
+#: ../../include/conversation.php:1528
+msgid "Starred"
+msgstr ""
+
+#: ../../include/conversation.php:1531
+msgid "Favourite Posts"
+msgstr ""
+
+#: ../../include/conversation.php:1538
+msgid "Spam"
+msgstr ""
+
+#: ../../include/conversation.php:1541
+msgid "Posts flagged as SPAM"
+msgstr ""
+
+#: ../../include/conversation.php:1585 ../../mod/admin.php:947
+msgid "Channel"
+msgstr ""
+
+#: ../../include/conversation.php:1588
+msgid "Status Messages and Posts"
+msgstr ""
+
+#: ../../include/conversation.php:1597
+msgid "About"
+msgstr ""
+
+#: ../../include/conversation.php:1600
+msgid "Profile Details"
+msgstr ""
+
+#: ../../include/conversation.php:1616
+msgid "Files and Storage"
+msgstr ""
+
+#: ../../include/conversation.php:1626 ../../include/conversation.php:1629
+msgid "Chatrooms"
+msgstr ""
+
+#: ../../include/conversation.php:1642
+msgid "Saved Bookmarks"
+msgstr ""
+
+#: ../../include/conversation.php:1652
+msgid "Manage Webpages"
+msgstr ""
+
+#: ../../include/conversation.php:1711
+msgctxt "noun"
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1714
+msgctxt "noun"
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1717
+msgctxt "noun"
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1720
+msgctxt "noun"
+msgid "Agree"
+msgid_plural "Agrees"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1723
+msgctxt "noun"
+msgid "Disagree"
+msgid_plural "Disagrees"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1726
+msgctxt "noun"
+msgid "Abstain"
+msgid_plural "Abstains"
+msgstr[0] ""
+msgstr[1] ""
+
 #: ../../include/widgets.php:91 ../../include/nav.php:157
 #: ../../mod/apps.php:36
 msgid "Apps"
@@ -3728,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 ""
@@ -3777,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 ""
 
@@ -3790,174 +3781,153 @@ msgid "Private Mail Menu"
 msgstr ""
 
 #: ../../include/widgets.php:569
-msgid "Check Mail"
-msgstr ""
-
-#: ../../include/widgets.php:575
 msgid "Combined View"
 msgstr ""
 
-#: ../../include/widgets.php:580 ../../include/nav.php:191
+#: ../../include/widgets.php:574 ../../include/nav.php:191
 msgid "Inbox"
 msgstr ""
 
-#: ../../include/widgets.php:585 ../../include/nav.php:192
+#: ../../include/widgets.php:579 ../../include/nav.php:192
 msgid "Outbox"
 msgstr ""
 
-#: ../../include/widgets.php:590 ../../include/nav.php:193
+#: ../../include/widgets.php:584 ../../include/nav.php:193
 msgid "New Message"
 msgstr ""
 
-#: ../../include/widgets.php:609 ../../include/widgets.php:621
+#: ../../include/widgets.php:603 ../../include/widgets.php:615
 msgid "Conversations"
 msgstr ""
 
-#: ../../include/widgets.php:613
+#: ../../include/widgets.php:607
 msgid "Received Messages"
 msgstr ""
 
-#: ../../include/widgets.php:617
+#: ../../include/widgets.php:611
 msgid "Sent Messages"
 msgstr ""
 
-#: ../../include/widgets.php:631
+#: ../../include/widgets.php:625
 msgid "No messages."
 msgstr ""
 
-#: ../../include/widgets.php:648
+#: ../../include/widgets.php:643
 msgid "Delete conversation"
 msgstr ""
 
-#: ../../include/widgets.php:650
+#: ../../include/widgets.php:645
 msgid "D, d M Y - g:i A"
 msgstr ""
 
-#: ../../include/widgets.php:738
+#: ../../include/widgets.php:734
 msgid "Chat Rooms"
 msgstr ""
 
-#: ../../include/widgets.php:758
+#: ../../include/widgets.php:754
 msgid "Bookmarked Chatrooms"
 msgstr ""
 
-#: ../../include/widgets.php:778
+#: ../../include/widgets.php:774
 msgid "Suggested Chatrooms"
 msgstr ""
 
-#: ../../include/widgets.php:905 ../../include/widgets.php:963
+#: ../../include/widgets.php:901 ../../include/widgets.php:959
 msgid "photo/image"
 msgstr ""
 
-#: ../../include/widgets.php:1058 ../../include/widgets.php:1060
+#: ../../include/widgets.php:1054 ../../include/widgets.php:1056
 msgid "Rate Me"
 msgstr ""
 
-#: ../../include/widgets.php:1064
+#: ../../include/widgets.php:1060
 msgid "View Ratings"
 msgstr ""
 
-#: ../../include/widgets.php:1075
+#: ../../include/widgets.php:1071
 msgid "Public Hubs"
 msgstr ""
 
-#: ../../include/widgets.php:1123
+#: ../../include/widgets.php:1119
 msgid "Forums"
 msgstr ""
 
-#: ../../include/widgets.php:1150
+#: ../../include/widgets.php:1146
 msgid "Tasks"
 msgstr ""
 
-#: ../../include/widgets.php:1159
+#: ../../include/widgets.php:1155
 msgid "Documentation"
 msgstr ""
 
-#: ../../include/widgets.php:1161
+#: ../../include/widgets.php:1157
 msgid "Project/Site Information"
 msgstr ""
 
-#: ../../include/widgets.php:1162
+#: ../../include/widgets.php:1158
 msgid "For Members"
 msgstr ""
 
-#: ../../include/widgets.php:1163
+#: ../../include/widgets.php:1159
 msgid "For Administrators"
 msgstr ""
 
-#: ../../include/widgets.php:1164
+#: ../../include/widgets.php:1160
 msgid "For Developers"
 msgstr ""
 
-#: ../../include/widgets.php:1189 ../../mod/admin.php:410
+#: ../../include/widgets.php:1185 ../../mod/admin.php:410
 msgid "Site"
 msgstr ""
 
-#: ../../include/widgets.php:1190
+#: ../../include/widgets.php:1186
 msgid "Accounts"
 msgstr ""
 
-#: ../../include/widgets.php:1191 ../../mod/admin.php:939
+#: ../../include/widgets.php:1187 ../../mod/admin.php:939
 msgid "Channels"
 msgstr ""
 
-#: ../../include/widgets.php:1192 ../../mod/admin.php:1031
+#: ../../include/widgets.php:1188 ../../mod/admin.php:1031
 #: ../../mod/admin.php:1071
 msgid "Plugins"
 msgstr ""
 
-#: ../../include/widgets.php:1193 ../../mod/admin.php:1231
+#: ../../include/widgets.php:1189 ../../mod/admin.php:1231
 #: ../../mod/admin.php:1265
 msgid "Themes"
 msgstr ""
 
-#: ../../include/widgets.php:1194
+#: ../../include/widgets.php:1190
 msgid "Inspect queue"
 msgstr ""
 
-#: ../../include/widgets.php:1195
+#: ../../include/widgets.php:1191
 msgid "Profile Config"
 msgstr ""
 
-#: ../../include/widgets.php:1196
+#: ../../include/widgets.php:1192
 msgid "DB updates"
 msgstr ""
 
-#: ../../include/widgets.php:1214 ../../include/widgets.php:1220
+#: ../../include/widgets.php:1210 ../../include/widgets.php:1216
 #: ../../mod/admin.php:1350
 msgid "Logs"
 msgstr ""
 
-#: ../../include/widgets.php:1218 ../../include/nav.php:210
+#: ../../include/widgets.php:1214 ../../include/nav.php:210
 msgid "Admin"
 msgstr ""
 
-#: ../../include/widgets.php:1219
+#: ../../include/widgets.php:1215
 msgid "Plugin Features"
 msgstr ""
 
-#: ../../include/widgets.php:1221
+#: ../../include/widgets.php:1217
 msgid "User registrations waiting for confirmation"
 msgstr ""
 
-#: ../../include/zot.php:677
-msgid "Invalid data packet"
-msgstr ""
-
-#: ../../include/zot.php:693
-msgid "Unable to verify channel signature"
-msgstr ""
-
-#: ../../include/zot.php:2213
-#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr ""
-
-#: ../../include/zot.php:3511
-msgid "invalid target signature"
-msgstr ""
-
-#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1496
+#: ../../include/nav.php:82 ../../include/nav.php:114 ../../boot.php:1502
 msgid "Logout"
 msgstr ""
 
@@ -4030,7 +4000,7 @@ msgstr ""
 msgid "Home Page"
 msgstr ""
 
-#: ../../include/nav.php:149 ../../mod/register.php:224 ../../boot.php:1473
+#: ../../include/nav.php:149 ../../mod/register.php:224 ../../boot.php:1479
 msgid "Register"
 msgstr ""
 
@@ -4055,10 +4025,6 @@ msgid "Channel Directory"
 msgstr ""
 
 #: ../../include/nav.php:174
-msgid "Grid"
-msgstr ""
-
-#: ../../include/nav.php:174
 msgid "Your grid"
 msgstr ""
 
@@ -4138,6 +4104,47 @@ msgstr ""
 msgid "Please wait..."
 msgstr ""
 
+#: ../../include/dir_fns.php:126
+msgid "Directory Options"
+msgstr ""
+
+#: ../../include/dir_fns.php:128
+msgid "Safe Mode"
+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: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 ""
+
+#: ../../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/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 ""
+
+#: ../../include/dir_fns.php:129
+msgid "Public Forums Only"
+msgstr ""
+
+#: ../../include/dir_fns.php:130
+msgid "This Website Only"
+msgstr ""
+
 #: ../../mod/achievements.php:34
 msgid "Some blurb about what to do when you're new here"
 msgstr ""
@@ -4159,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:453 ../../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 ""
@@ -4705,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 "
@@ -4953,7 +4960,7 @@ msgid ""
 "any impact unless the inherited setting changes."
 msgstr ""
 
-#: ../../mod/connedit.php:697
+#: ../../mod/connedit.php:696
 msgid "Last update:"
 msgstr ""
 
@@ -4980,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
@@ -5069,6 +5190,10 @@ msgstr ""
 msgid "Notify your contacts about this file"
 msgstr ""
 
+#: ../../mod/regdir.php:45 ../../mod/dirsearch.php:21
+msgid "This site is not a directory server"
+msgstr ""
+
 #: ../../mod/layouts.php:121 ../../mod/layouts.php:179
 #: ../../mod/editlayout.php:161
 msgid "Layout Name"
@@ -5142,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 ""
@@ -5189,133 +5318,210 @@ msgstr ""
 msgid "Search results for: %s"
 msgstr ""
 
-#: ../../mod/message.php:34
+#: ../../mod/rate.php:158
+msgid "Website:"
+msgstr ""
+
+#: ../../mod/rate.php:161
+#, php-format
+msgid "Remote Channel [%s] (not yet known on this site)"
+msgstr ""
+
+#: ../../mod/rate.php:162
+msgid "Rating (this information is public)"
+msgstr ""
+
+#: ../../mod/rate.php:163
+msgid "Optionally explain your rating (this information is public)"
+msgstr ""
+
+#: ../../mod/mail.php:33
+msgid "Unable to lookup recipient."
+msgstr ""
+
+#: ../../mod/mail.php:41
+msgid "Unable to communicate with requested channel."
+msgstr ""
+
+#: ../../mod/mail.php:48
+msgid "Cannot verify requested channel."
+msgstr ""
+
+#: ../../mod/mail.php:74
+msgid "Selected channel has private message restrictions. Send failed."
+msgstr ""
+
+#: ../../mod/mail.php:132
+msgid "Messages"
+msgstr ""
+
+#: ../../mod/mail.php:167
+msgid "Message recalled."
+msgstr ""
+
+#: ../../mod/mail.php:180
 msgid "Conversation removed."
 msgstr ""
 
-#: ../../mod/channel.php:97
-msgid "Insufficient permissions.  Request redirected to profile page."
+#: ../../mod/mail.php:223
+msgid "Requested channel is not in this network"
 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"
+#: ../../mod/mail.php:231
+msgid "Send Private Message"
 msgstr ""
 
-#: ../../mod/editpost.php:31
-msgid "Item is not editable"
+#: ../../mod/mail.php:232 ../../mod/mail.php:361
+msgid "To:"
 msgstr ""
 
-#: ../../mod/editpost.php:55
-msgid "Delete item?"
+#: ../../mod/mail.php:235 ../../mod/mail.php:363
+msgid "Subject:"
 msgstr ""
 
-#: ../../mod/editpost.php:122 ../../mod/editblock.php:145
-#: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:185
-msgid "Insert YouTube video"
+#: ../../mod/mail.php:238 ../../mod/invite.php:131
+msgid "Your message:"
 msgstr ""
 
-#: ../../mod/editpost.php:123 ../../mod/editblock.php:146
-#: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:186
-msgid "Insert Vorbis [.ogg] video"
+#: ../../mod/mail.php:242
+msgid "Send"
 msgstr ""
 
-#: ../../mod/editpost.php:124 ../../mod/editblock.php:147
-#: ../../mod/editlayout.php:145 ../../mod/editwebpage.php:187
-msgid "Insert Vorbis [.ogg] audio"
+#: ../../mod/mail.php:333
+msgid "Delete message"
 msgstr ""
 
-#: ../../mod/editpost.php:165 ../../mod/rpost.php:128
-msgid "Edit post"
+#: ../../mod/mail.php:334
+msgid "Delivery report"
+msgstr ""
+
+#: ../../mod/mail.php:335
+msgid "Recall message"
 msgstr ""
 
-#: ../../mod/dreport.php:15
+#: ../../mod/mail.php:337
+msgid "Message has been recalled."
+msgstr ""
+
+#: ../../mod/mail.php:354
+msgid "Delete Conversation"
+msgstr ""
+
+#: ../../mod/mail.php:356
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
+msgstr ""
+
+#: ../../mod/mail.php:360
+msgid "Send Reply"
+msgstr ""
+
+#: ../../mod/mail.php:365
+#, php-format
+msgid "Your message for %s (%s):"
+msgstr ""
+
+#: ../../mod/dreport.php:23
 msgid "Invalid message"
 msgstr ""
 
-#: ../../mod/dreport.php:25
+#: ../../mod/dreport.php:55
 msgid "no results"
 msgstr ""
 
-#: ../../mod/dreport.php:30
+#: ../../mod/dreport.php:60
 #, php-format
 msgid "Delivery report for %1$s"
 msgstr ""
 
-#: ../../mod/dreport.php:39
+#: ../../mod/dreport.php:74
 msgid "channel sync processed"
 msgstr ""
 
-#: ../../mod/dreport.php:43
+#: ../../mod/dreport.php:78
 msgid "queued"
 msgstr ""
 
-#: ../../mod/dreport.php:47
+#: ../../mod/dreport.php:82
 msgid "posted"
 msgstr ""
 
-#: ../../mod/dreport.php:51
+#: ../../mod/dreport.php:86
 msgid "accepted for delivery"
 msgstr ""
 
-#: ../../mod/dreport.php:55
+#: ../../mod/dreport.php:90
 msgid "updated"
 msgstr ""
 
-#: ../../mod/dreport.php:58
+#: ../../mod/dreport.php:93
 msgid "update ignored"
 msgstr ""
 
-#: ../../mod/dreport.php:61
+#: ../../mod/dreport.php:96
 msgid "permission denied"
 msgstr ""
 
-#: ../../mod/editblock.php:118
-msgid "Delete block?"
+#: ../../mod/dreport.php:100
+msgid "recipient not found"
 msgstr ""
 
-#: ../../mod/editblock.php:180
-msgid "Edit Block"
+#: ../../mod/dreport.php:103
+msgid "mail recalled"
 msgstr ""
 
-#: ../../mod/home.php:57 ../../mod/home.php:63 ../../mod/siteinfo.php:157
-msgid "$Projectname"
+#: ../../mod/dreport.php:106
+msgid "duplicate mail received"
 msgstr ""
 
-#: ../../mod/home.php:73
-#, php-format
-msgid "Welcome to %s"
+#: ../../mod/dreport.php:109
+msgid "mail delivered"
 msgstr ""
 
-#: ../../mod/item.php:174
-msgid "Unable to locate original post."
+#: ../../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/item.php:407
-msgid "Empty post discarded."
+#: ../../mod/editblock.php:118
+msgid "Delete block?"
 msgstr ""
 
-#: ../../mod/item.php:447
-msgid "Executable content type not permitted to this channel."
+#: ../../mod/editblock.php:145 ../../mod/editpost.php:122
+#: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:185
+msgid "Insert YouTube video"
 msgstr ""
 
-#: ../../mod/item.php:896
-msgid "System error. Post not saved."
+#: ../../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:1163
-msgid "Unable to obtain post information from database."
+#: ../../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:1170
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
+#: ../../mod/editblock.php:180
+msgid "Edit Block"
 msgstr ""
 
-#: ../../mod/item.php:1177
-#, php-format
-msgid "You have reached your limit of %1$.0f webpages."
+#: ../../mod/dirsearch.php:29
+msgid "This directory server requires an access token"
+msgstr ""
+
+#: ../../mod/editpost.php:31
+msgid "Item is not editable"
+msgstr ""
+
+#: ../../mod/editpost.php:55
+msgid "Delete item?"
+msgstr ""
+
+#: ../../mod/editpost.php:165 ../../mod/rpost.php:128
+msgid "Edit post"
 msgstr ""
 
 #: ../../mod/oexchange.php:23
@@ -6331,7 +6537,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:86 ../../boot.php:1505
+#: ../../mod/lostpass.php:86 ../../boot.php:1511
 msgid "Password Reset"
 msgstr ""
 
@@ -6380,186 +6586,19 @@ 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:170 ../../mod/photos.php:970
-msgid "Delete Photo"
-msgstr ""
-
-#: ../../mod/photos.php:464
-msgid "No photos selected"
-msgstr ""
-
-#: ../../mod/photos.php:513
-msgid "Access to this item is restricted."
-msgstr ""
-
-#: ../../mod/photos.php:552
-#, 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:555
+#: ../../mod/home.php:75
 #, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr ""
-
-#: ../../mod/photos.php:583
-msgid "Upload Photos"
-msgstr ""
-
-#: ../../mod/photos.php:587
-msgid "Enter an album name"
-msgstr ""
-
-#: ../../mod/photos.php:588
-msgid "or select an existing album (doubleclick)"
-msgstr ""
-
-#: ../../mod/photos.php:589
-msgid "Create a status post for this upload"
-msgstr ""
-
-#: ../../mod/photos.php:616
-msgid "Album name could not be decoded"
-msgstr ""
-
-#: ../../mod/photos.php:660 ../../mod/photos.php:1197
-#: ../../mod/photos.php:1214
-msgid "Contact Photos"
-msgstr ""
-
-#: ../../mod/photos.php:688
-msgid "Show Newest First"
-msgstr ""
-
-#: ../../mod/photos.php:690
-msgid "Show Oldest First"
-msgstr ""
-
-#: ../../mod/photos.php:714 ../../mod/photos.php:1247
-msgid "View Photo"
-msgstr ""
-
-#: ../../mod/photos.php:743
-msgid "Edit Album"
-msgstr ""
-
-#: ../../mod/photos.php:788
-msgid "Permission denied. Access to this item may be restricted."
-msgstr ""
-
-#: ../../mod/photos.php:790
-msgid "Photo not available"
-msgstr ""
-
-#: ../../mod/photos.php:848
-msgid "Use as profile photo"
-msgstr ""
-
-#: ../../mod/photos.php:855
-msgid "Private Photo"
-msgstr ""
-
-#: ../../mod/photos.php:866 ../../mod/events.php:528
-msgid "Previous"
-msgstr ""
-
-#: ../../mod/photos.php:870
-msgid "View Full Size"
-msgstr ""
-
-#: ../../mod/photos.php:875 ../../mod/events.php:529 ../../mod/setup.php:285
-msgid "Next"
-msgstr ""
-
-#: ../../mod/photos.php:915 ../../mod/tagrm.php:133
-msgid "Remove"
-msgstr ""
-
-#: ../../mod/photos.php:949
-msgid "Edit photo"
-msgstr ""
-
-#: ../../mod/photos.php:951
-msgid "Rotate CW (right)"
-msgstr ""
-
-#: ../../mod/photos.php:952
-msgid "Rotate CCW (left)"
-msgstr ""
-
-#: ../../mod/photos.php:955
-msgid "Enter a new album name"
-msgstr ""
-
-#: ../../mod/photos.php:956
-msgid "or select an existing one (doubleclick)"
-msgstr ""
-
-#: ../../mod/photos.php:959
-msgid "Caption"
-msgstr ""
-
-#: ../../mod/photos.php:961
-msgid "Add a Tag"
-msgstr ""
-
-#: ../../mod/photos.php:965
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
-msgstr ""
-
-#: ../../mod/photos.php:968
-msgid "Flag as adult in album view"
-msgstr ""
-
-#: ../../mod/photos.php:1160
-msgid "In This Photo:"
-msgstr ""
-
-#: ../../mod/photos.php:1165
-msgid "Map"
-msgstr ""
-
-#: ../../mod/photos.php:1253
-msgid "View Album"
-msgstr ""
-
-#: ../../mod/photos.php:1276
-msgid "Recent Photos"
+msgid "Welcome to %s"
 msgstr ""
 
 #: ../../mod/dav.php:121
 msgid "$Projectname channel"
 msgstr ""
 
-#: ../../mod/rate.php:157
-msgid "Website:"
-msgstr ""
-
-#: ../../mod/rate.php:160
-#, php-format
-msgid "Remote Channel [%s] (not yet known on this site)"
-msgstr ""
-
-#: ../../mod/rate.php:161
-msgid "Rating (this information is public)"
-msgstr ""
-
-#: ../../mod/rate.php:162
-msgid "Optionally explain your rating (this information is public)"
-msgstr ""
-
 #: ../../mod/events.php:21
 msgid "Calendar entries imported."
 msgstr ""
@@ -6818,82 +6857,34 @@ msgstr ""
 msgid "Description: "
 msgstr ""
 
-#: ../../mod/regdir.php:45 ../../mod/dirsearch.php:21
-msgid "This site is not a directory server"
-msgstr ""
-
-#: ../../mod/mail.php:33
-msgid "Unable to lookup recipient."
-msgstr ""
-
-#: ../../mod/mail.php:41
-msgid "Unable to communicate with requested channel."
-msgstr ""
-
-#: ../../mod/mail.php:48
-msgid "Cannot verify requested channel."
-msgstr ""
-
-#: ../../mod/mail.php:74
-msgid "Selected channel has private message restrictions. Send failed."
-msgstr ""
-
-#: ../../mod/mail.php:128
-msgid "Messages"
-msgstr ""
-
-#: ../../mod/mail.php:138
-msgid "Message deleted."
-msgstr ""
-
-#: ../../mod/mail.php:154
-msgid "Message recalled."
-msgstr ""
-
-#: ../../mod/mail.php:221
-msgid "Send Private Message"
-msgstr ""
-
-#: ../../mod/mail.php:222 ../../mod/mail.php:352
-msgid "To:"
-msgstr ""
-
-#: ../../mod/mail.php:227 ../../mod/mail.php:341 ../../mod/mail.php:354
-msgid "Subject:"
-msgstr ""
-
-#: ../../mod/mail.php:231 ../../mod/mail.php:357 ../../mod/invite.php:131
-msgid "Your message:"
-msgstr ""
-
-#: ../../mod/mail.php:238
-msgid "Send"
+#: ../../mod/item.php:173
+msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../mod/mail.php:322
-msgid "Delete message"
+#: ../../mod/item.php:417
+msgid "Empty post discarded."
 msgstr ""
 
-#: ../../mod/mail.php:323
-msgid "Recall message"
+#: ../../mod/item.php:457
+msgid "Executable content type not permitted to this channel."
 msgstr ""
 
-#: ../../mod/mail.php:325
-msgid "Message has been recalled."
+#: ../../mod/item.php:906
+msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/mail.php:345
-msgid "Delete Conversation"
+#: ../../mod/item.php:1173
+msgid "Unable to obtain post information from database."
 msgstr ""
 
-#: ../../mod/mail.php:347
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
+#: ../../mod/item.php:1180
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
 msgstr ""
 
-#: ../../mod/mail.php:351
-msgid "Send Reply"
+#: ../../mod/item.php:1187
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
 msgstr ""
 
 #: ../../mod/webpages.php:191
@@ -7022,6 +7013,55 @@ msgstr ""
 msgid "Item not available."
 msgstr ""
 
+#: ../../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
 msgid "Failed to create source. No channel selected."
 msgstr ""
@@ -7126,8 +7166,8 @@ msgstr ""
 msgid "Authenticate"
 msgstr ""
 
-#: ../../mod/dirsearch.php:29
-msgid "This directory server requires an access token"
+#: ../../mod/channel.php:97
+msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr ""
 
 #: ../../mod/siteinfo.php:111
@@ -7167,7 +7207,7 @@ msgstr ""
 
 #: ../../mod/siteinfo.php:168
 msgid ""
-"Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more "
+"Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more "
 "about $Projectname."
 msgstr ""
 
@@ -7214,42 +7254,42 @@ msgstr ""
 msgid "No channel. Import failed."
 msgstr ""
 
-#: ../../mod/import.php:493
+#: ../../mod/import.php:499
 msgid "You must be logged in to use this feature."
 msgstr ""
 
-#: ../../mod/import.php:498
+#: ../../mod/import.php:504
 msgid "Import Channel"
 msgstr ""
 
-#: ../../mod/import.php:499
+#: ../../mod/import.php:505
 msgid ""
 "Use this form to import an existing channel from a different server/hub. You "
 "may retrieve the channel identity from the old server/hub via the network or "
 "provide an export file."
 msgstr ""
 
-#: ../../mod/import.php:500 ../../mod/import_items.php:121
+#: ../../mod/import.php:506 ../../mod/import_items.php:121
 msgid "File to Upload"
 msgstr ""
 
-#: ../../mod/import.php:501
+#: ../../mod/import.php:507
 msgid "Or provide the old server/hub details"
 msgstr ""
 
-#: ../../mod/import.php:502
+#: ../../mod/import.php:508
 msgid "Your old identity address (xyz@example.com)"
 msgstr ""
 
-#: ../../mod/import.php:503
+#: ../../mod/import.php:509
 msgid "Your old login email address"
 msgstr ""
 
-#: ../../mod/import.php:504
+#: ../../mod/import.php:510
 msgid "Your old login password"
 msgstr ""
 
-#: ../../mod/import.php:505
+#: ../../mod/import.php:511
 msgid ""
 "For either option, please choose whether to make this hub your new primary "
 "address, or whether your old location should continue this role. You will be "
@@ -7257,16 +7297,16 @@ msgid ""
 "location for files, photos, and media."
 msgstr ""
 
-#: ../../mod/import.php:506
+#: ../../mod/import.php:512
 msgid "Make this hub my primary location"
 msgstr ""
 
-#: ../../mod/import.php:507
+#: ../../mod/import.php:513
 msgid ""
 "Import existing posts if possible (experimental - limited by available memory"
 msgstr ""
 
-#: ../../mod/import.php:508
+#: ../../mod/import.php:514
 msgid ""
 "This process may take several minutes to complete. Please submit the form "
 "only once and leave this page open until finished."
@@ -8330,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
@@ -9120,51 +9160,51 @@ msgstr ""
 msgid "Set size of followup author photos"
 msgstr ""
 
-#: ../../boot.php:1302
+#: ../../boot.php:1308
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:1305
+#: ../../boot.php:1311
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:1472
+#: ../../boot.php:1478
 msgid ""
 "Create an account to access services and applications within the Hubzilla"
 msgstr ""
 
-#: ../../boot.php:1500
+#: ../../boot.php:1506
 msgid "Password"
 msgstr ""
 
-#: ../../boot.php:1501
+#: ../../boot.php:1507
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:1504
+#: ../../boot.php:1510
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:2130
+#: ../../boot.php:2136
 msgid "toggle mobile"
 msgstr ""
 
-#: ../../boot.php:2265
+#: ../../boot.php:2271
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr ""
 
-#: ../../boot.php:2268
+#: ../../boot.php:2274
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr ""
 
-#: ../../boot.php:2305
+#: ../../boot.php:2311
 msgid "Cron/Scheduled tasks not running."
 msgstr ""
 
-#: ../../boot.php:2309
+#: ../../boot.php:2315
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr ""
diff --git a/util/messages.po b/util/messages.po
index 341c042bb..6380cdfac 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2015-09-25.1166\n"
+"Project-Id-Version: 2015-10-17.1188\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-25 00:05-0700\n"
+"POT-Creation-Date: 2015-10-17 16:47-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"
@@ -416,7 +416,7 @@ msgstr ""
 msgid "Edited"
 msgstr ""
 
-#: ../../include/api.php:1234
+#: ../../include/api.php:1267
 msgid "Public Timeline"
 msgstr ""
 
@@ -828,7 +828,8 @@ msgstr ""
 msgid "April"
 msgstr ""
 
-#: ../../include/text.php:1201
+#: ../../include/text.php:1201 ../../mod/uexport.php:58
+#: ../../mod/uexport.php:59
 msgid "May"
 msgstr ""
 
@@ -1374,7 +1375,7 @@ msgstr ""
 
 #: ../../include/widgets.php:136 ../../include/widgets.php:175
 #: ../../include/Contact.php:107 ../../include/conversation.php:956
-#: ../../include/identity.php:933 ../../mod/directory.php:316
+#: ../../include/identity.php:956 ../../mod/directory.php:316
 #: ../../mod/match.php:64 ../../mod/suggest.php:52
 msgid "Connect"
 msgstr ""
@@ -1551,7 +1552,7 @@ msgid "Finishes:"
 msgstr ""
 
 #: ../../include/event.php:50 ../../include/bb2diaspora.php:481
-#: ../../include/identity.php:984 ../../mod/directory.php:302
+#: ../../include/identity.php:1007 ../../mod/directory.php:302
 #: ../../mod/events.php:684
 msgid "Location:"
 msgstr ""
@@ -1855,7 +1856,7 @@ msgid "View all"
 msgstr ""
 
 #: ../../include/ItemObject.php:179 ../../include/taxonomy.php:396
-#: ../../include/conversation.php:1712 ../../include/identity.php:1243
+#: ../../include/conversation.php:1712 ../../include/identity.php:1266
 #: ../../mod/photos.php:1019
 msgctxt "noun"
 msgid "Like"
@@ -2107,7 +2108,7 @@ msgstr ""
 msgid "Manage/Edit profiles"
 msgstr ""
 
-#: ../../include/nav.php:95 ../../include/identity.php:956
+#: ../../include/nav.php:95 ../../include/identity.php:979
 msgid "Edit Profile"
 msgstr ""
 
@@ -3037,14 +3038,14 @@ msgstr ""
 msgid "Visible to specific connections."
 msgstr ""
 
-#: ../../include/items.php:4286 ../../mod/thing.php:74
+#: ../../include/items.php:4310 ../../mod/thing.php:74
 #: ../../mod/filestorage.php:27 ../../mod/viewsrc.php:20
 #: ../../mod/admin.php:167 ../../mod/admin.php:1025 ../../mod/admin.php:1225
 #: ../../mod/display.php:36
 msgid "Item not found."
 msgstr ""
 
-#: ../../include/items.php:4359 ../../include/attach.php:137
+#: ../../include/items.php:4383 ../../include/attach.php:137
 #: ../../include/attach.php:184 ../../include/attach.php:247
 #: ../../include/attach.php:261 ../../include/attach.php:305
 #: ../../include/attach.php:319 ../../include/attach.php:350
@@ -3087,38 +3088,38 @@ msgstr ""
 msgid "Permission denied."
 msgstr ""
 
-#: ../../include/items.php:4763 ../../mod/group.php:38 ../../mod/group.php:140
+#: ../../include/items.php:4787 ../../mod/group.php:38 ../../mod/group.php:140
 #: ../../mod/bulksetclose.php:51
 msgid "Collection not found."
 msgstr ""
 
-#: ../../include/items.php:4779
+#: ../../include/items.php:4803
 msgid "Collection is empty."
 msgstr ""
 
-#: ../../include/items.php:4786
+#: ../../include/items.php:4810
 #, php-format
 msgid "Collection: %s"
 msgstr ""
 
-#: ../../include/items.php:4796 ../../mod/connedit.php:674
+#: ../../include/items.php:4820 ../../mod/connedit.php:674
 #, php-format
 msgid "Connection: %s"
 msgstr ""
 
-#: ../../include/items.php:4798
+#: ../../include/items.php:4822
 msgid "Connection not found."
 msgstr ""
 
-#: ../../include/zot.php:678
+#: ../../include/zot.php:684
 msgid "Invalid data packet"
 msgstr ""
 
-#: ../../include/zot.php:694
+#: ../../include/zot.php:700
 msgid "Unable to verify channel signature"
 msgstr ""
 
-#: ../../include/zot.php:2184
+#: ../../include/zot.php:2208
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr ""
@@ -3316,11 +3317,11 @@ msgstr ""
 msgid "Default Profile"
 msgstr ""
 
-#: ../../include/identity.php:736
+#: ../../include/identity.php:759
 msgid "Requested channel is not available."
 msgstr ""
 
-#: ../../include/identity.php:783 ../../mod/profile.php:16
+#: ../../include/identity.php:806 ../../mod/profile.php:16
 #: ../../mod/achievements.php:11 ../../mod/webpages.php:29
 #: ../../mod/connect.php:13 ../../mod/hcard.php:8 ../../mod/blocks.php:29
 #: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28
@@ -3329,193 +3330,193 @@ msgstr ""
 msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../include/identity.php:946 ../../mod/profiles.php:774
+#: ../../include/identity.php:969 ../../mod/profiles.php:774
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../include/identity.php:952
+#: ../../include/identity.php:975
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/identity.php:952
+#: ../../include/identity.php:975
 msgid "Manage/edit profiles"
 msgstr ""
 
-#: ../../include/identity.php:953 ../../mod/profiles.php:775
+#: ../../include/identity.php:976 ../../mod/profiles.php:775
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../include/identity.php:968 ../../mod/profiles.php:786
+#: ../../include/identity.php:991 ../../mod/profiles.php:786
 msgid "Profile Image"
 msgstr ""
 
-#: ../../include/identity.php:971
+#: ../../include/identity.php:994
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../include/identity.php:972 ../../mod/profiles.php:669
+#: ../../include/identity.php:995 ../../mod/profiles.php:669
 #: ../../mod/profiles.php:790
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../include/identity.php:988 ../../include/identity.php:1227
+#: ../../include/identity.php:1011 ../../include/identity.php:1250
 msgid "Gender:"
 msgstr ""
 
-#: ../../include/identity.php:989 ../../include/identity.php:1271
+#: ../../include/identity.php:1012 ../../include/identity.php:1294
 msgid "Status:"
 msgstr ""
 
-#: ../../include/identity.php:990 ../../include/identity.php:1282
+#: ../../include/identity.php:1013 ../../include/identity.php:1305
 msgid "Homepage:"
 msgstr ""
 
-#: ../../include/identity.php:991
+#: ../../include/identity.php:1014
 msgid "Online Now"
 msgstr ""
 
-#: ../../include/identity.php:1074 ../../include/identity.php:1152
+#: ../../include/identity.php:1097 ../../include/identity.php:1175
 #: ../../mod/ping.php:324
 msgid "g A l F d"
 msgstr ""
 
-#: ../../include/identity.php:1075 ../../include/identity.php:1153
+#: ../../include/identity.php:1098 ../../include/identity.php:1176
 msgid "F d"
 msgstr ""
 
-#: ../../include/identity.php:1120 ../../include/identity.php:1192
+#: ../../include/identity.php:1143 ../../include/identity.php:1215
 #: ../../mod/ping.php:346
 msgid "[today]"
 msgstr ""
 
-#: ../../include/identity.php:1131
+#: ../../include/identity.php:1154
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../include/identity.php:1132
+#: ../../include/identity.php:1155
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../include/identity.php:1185
+#: ../../include/identity.php:1208
 msgid "[No description]"
 msgstr ""
 
-#: ../../include/identity.php:1203
+#: ../../include/identity.php:1226
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../include/identity.php:1204
+#: ../../include/identity.php:1227
 msgid "Events this week:"
 msgstr ""
 
-#: ../../include/identity.php:1217 ../../include/identity.php:1334
+#: ../../include/identity.php:1240 ../../include/identity.php:1357
 #: ../../include/apps.php:138 ../../mod/profperm.php:112
 msgid "Profile"
 msgstr ""
 
-#: ../../include/identity.php:1225 ../../mod/settings.php:1056
+#: ../../include/identity.php:1248 ../../mod/settings.php:1056
 msgid "Full Name:"
 msgstr ""
 
-#: ../../include/identity.php:1232
+#: ../../include/identity.php:1255
 msgid "Like this channel"
 msgstr ""
 
-#: ../../include/identity.php:1256
+#: ../../include/identity.php:1279
 msgid "j F, Y"
 msgstr ""
 
-#: ../../include/identity.php:1257
+#: ../../include/identity.php:1280
 msgid "j F"
 msgstr ""
 
-#: ../../include/identity.php:1264
+#: ../../include/identity.php:1287
 msgid "Birthday:"
 msgstr ""
 
-#: ../../include/identity.php:1268 ../../mod/directory.php:297
+#: ../../include/identity.php:1291 ../../mod/directory.php:297
 msgid "Age:"
 msgstr ""
 
-#: ../../include/identity.php:1277
+#: ../../include/identity.php:1300
 #, php-format
 msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/identity.php:1280 ../../mod/profiles.php:691
+#: ../../include/identity.php:1303 ../../mod/profiles.php:691
 msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../include/identity.php:1284 ../../mod/directory.php:313
+#: ../../include/identity.php:1307 ../../mod/directory.php:313
 #: ../../mod/profiles.php:693
 msgid "Hometown:"
 msgstr ""
 
-#: ../../include/identity.php:1286
+#: ../../include/identity.php:1309
 msgid "Tags:"
 msgstr ""
 
-#: ../../include/identity.php:1288 ../../mod/profiles.php:694
+#: ../../include/identity.php:1311 ../../mod/profiles.php:694
 msgid "Political Views:"
 msgstr ""
 
-#: ../../include/identity.php:1290
+#: ../../include/identity.php:1313
 msgid "Religion:"
 msgstr ""
 
-#: ../../include/identity.php:1292 ../../mod/directory.php:315
+#: ../../include/identity.php:1315 ../../mod/directory.php:315
 msgid "About:"
 msgstr ""
 
-#: ../../include/identity.php:1294
+#: ../../include/identity.php:1317
 msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/identity.php:1296 ../../mod/profiles.php:697
+#: ../../include/identity.php:1319 ../../mod/profiles.php:697
 msgid "Likes:"
 msgstr ""
 
-#: ../../include/identity.php:1298 ../../mod/profiles.php:698
+#: ../../include/identity.php:1321 ../../mod/profiles.php:698
 msgid "Dislikes:"
 msgstr ""
 
-#: ../../include/identity.php:1300
+#: ../../include/identity.php:1323
 msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../include/identity.php:1302
+#: ../../include/identity.php:1325
 msgid "My other channels:"
 msgstr ""
 
-#: ../../include/identity.php:1304
+#: ../../include/identity.php:1327
 msgid "Musical interests:"
 msgstr ""
 
-#: ../../include/identity.php:1306
+#: ../../include/identity.php:1329
 msgid "Books, literature:"
 msgstr ""
 
-#: ../../include/identity.php:1308
+#: ../../include/identity.php:1331
 msgid "Television:"
 msgstr ""
 
-#: ../../include/identity.php:1310
+#: ../../include/identity.php:1333
 msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../include/identity.php:1312
+#: ../../include/identity.php:1335
 msgid "Love/Romance:"
 msgstr ""
 
-#: ../../include/identity.php:1314
+#: ../../include/identity.php:1337
 msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/identity.php:1316
+#: ../../include/identity.php:1339
 msgid "School/education:"
 msgstr ""
 
-#: ../../include/identity.php:1336
+#: ../../include/identity.php:1359
 msgid "Like this thing"
 msgstr ""
 
@@ -4602,7 +4603,7 @@ msgstr ""
 msgid "No installed plugins/addons/apps"
 msgstr ""
 
-#: ../../mod/siteinfo.php:155 ../../mod/home.php:58 ../../mod/home.php:64
+#: ../../mod/siteinfo.php:155 ../../mod/home.php:58 ../../mod/home.php:66
 msgid "$Projectname"
 msgstr ""
 
@@ -6521,30 +6522,6 @@ msgstr ""
 msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
 
-#: ../../mod/uexport.php:45 ../../mod/uexport.php:46
-msgid "Export Channel"
-msgstr ""
-
-#: ../../mod/uexport.php:47
-msgid ""
-"Export your basic channel information to a small file.  This acts as a "
-"backup of your connections, permissions, profile and basic data, which can "
-"be used to import your data to a new hub, but\tdoes not contain your content."
-msgstr ""
-
-#: ../../mod/uexport.php:48
-msgid "Export Content"
-msgstr ""
-
-#: ../../mod/uexport.php:49
-msgid ""
-"Export your channel information and all the content to a JSON backup. This "
-"backs up all of your connections, permissions, profile data and all of your "
-"content, but is generally not suitable for importing a channel to a new hub "
-"as this file may be VERY large.  Please be patient - it may take several "
-"minutes for this download to begin."
-msgstr ""
-
 #: ../../mod/viewconnections.php:62
 msgid "No connections."
 msgstr ""
@@ -8155,6 +8132,113 @@ msgstr ""
 msgid "D, d M Y - g:i A"
 msgstr ""
 
+#: ../../mod/uexport.php:50 ../../mod/uexport.php:51
+msgid "Export Channel"
+msgstr ""
+
+#: ../../mod/uexport.php:52
+msgid ""
+"Export your basic channel information to a file.  This acts as a backup of "
+"your connections, permissions, profile and basic data, which can be used to "
+"import your data to a new server hub, but does not contain your content."
+msgstr ""
+
+#: ../../mod/uexport.php:53
+msgid "Export Content"
+msgstr ""
+
+#: ../../mod/uexport.php:54
+msgid ""
+"Export your channel information and recent content to a JSON backup that can "
+"be restored or imported to another server hub. This backs up all of your "
+"connections, permissions, profile data and several months of posts. This "
+"file may be VERY large.  Please be patient - it may take several minutes for "
+"this download to begin."
+msgstr ""
+
+#: ../../mod/uexport.php:55
+msgid "Export your posts from a given year or month:"
+msgstr ""
+
+#: ../../mod/uexport.php:57
+msgid ""
+"You may also export your posts and conversations for a particular year or "
+"month. Click on one of the recent years or months below."
+msgstr ""
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Jan"
+msgstr ""
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Feb"
+msgstr ""
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Mar"
+msgstr ""
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Apr"
+msgstr ""
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Jun"
+msgstr ""
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Jul"
+msgstr ""
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Aug"
+msgstr ""
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Sep"
+msgstr ""
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Oct"
+msgstr ""
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Nov"
+msgstr ""
+
+#: ../../mod/uexport.php:58 ../../mod/uexport.php:59
+msgid "Dec"
+msgstr ""
+
+#: ../../mod/uexport.php:60
+msgid ""
+"If the export fails (possibly due to memory exhaustion on your server hub), "
+"please try again selecting a more limited date range."
+msgstr ""
+
+#: ../../mod/uexport.php:61
+#, php-format
+msgid ""
+"Or adjust the date in your browser location bar to select other dates. For "
+"example the year 2013; <a href=\"%1$s/2013\">%1$s/2013</a> or the month "
+"September 2013; <a href=\"%1$s/2013/9\">%1$s/2013/9</a>"
+msgstr ""
+
+#: ../../mod/uexport.php:62
+msgid "Please visit"
+msgstr ""
+
+#: ../../mod/uexport.php:62
+msgid "on another hub to import the backup files(s)."
+msgstr ""
+
+#: ../../mod/uexport.php:63
+msgid ""
+"We advise you to clone the channel on the new hub first and than to import "
+"the backup file(s) (from the same channel) in chronological order. Importing "
+"the backup files into another channel will certainly give permission issues."
+msgstr ""
+
 #: ../../mod/mood.php:131
 msgid "Set your current mood and tell your friends"
 msgstr ""
@@ -8672,7 +8756,7 @@ msgstr ""
 msgid "Download PDL file"
 msgstr ""
 
-#: ../../mod/home.php:73
+#: ../../mod/home.php:75
 #, php-format
 msgid "Welcome to %s"
 msgstr ""
author	mrjive <mrjive@mrjive.it>	2015-10-26 21:55:47 +0100
committer	mrjive <mrjive@mrjive.it>	2015-10-26 21:55:47 +0100
commit	a4c3058f845a1c38d06b2201a10700c5f878366d (patch)
tree	bab86468397e523457ba25199cb9a67265980e00 /util
parent	32522b61f235266384c81c0669fceaf58afeb4fe (diff)
parent	6cb7afcbc0447b60de0128f9a912e10ae125ba45 (diff)
download	volse-hubzilla-a4c3058f845a1c38d06b2201a10700c5f878366d.tar.gz volse-hubzilla-a4c3058f845a1c38d06b2201a10700c5f878366d.tar.bz2 volse-hubzilla-a4c3058f845a1c38d06b2201a10700c5f878366d.zip