don't import to sys channel from self-censored authors

1 files changed, 820 insertions, 807 deletions

diff --git a/util/messages.po b/util/messages.po
index 5ed73624f..6d2340a11 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2014-12-05.880\n"
+"Project-Id-Version: 2014-12-12.887\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-12-05 00:03-0800\n"
+"POT-Creation-Date: 2014-12-12 00:03-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -70,6 +70,12 @@ msgstr ""
 msgid "commented on %s's post"
 msgstr ""
 
+#: ../../include/security.php:357
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
+msgstr ""
+
 #: ../../include/page_widgets.php:6
 msgid "New Page"
 msgstr ""
@@ -77,7 +83,7 @@ msgstr ""
 #: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
 #: ../../include/menu.php:42 ../../include/RedDAV/RedBrowser.php:250
 #: ../../include/apps.php:249 ../../include/ItemObject.php:100
-#: ../../mod/blocks.php:132 ../../mod/settings.php:625
+#: ../../mod/blocks.php:132 ../../mod/settings.php:627
 #: ../../mod/connections.php:381 ../../mod/connections.php:394
 #: ../../mod/connections.php:413 ../../mod/thing.php:233
 #: ../../mod/webpages.php:162 ../../mod/editblock.php:143
@@ -92,7 +98,7 @@ msgstr ""
 msgid "View"
 msgstr ""
 
-#: ../../include/page_widgets.php:40 ../../include/conversation.php:1099
+#: ../../include/page_widgets.php:40 ../../include/conversation.php:1104
 #: ../../include/ItemObject.php:630 ../../mod/webpages.php:166
 #: ../../mod/editblock.php:173 ../../mod/editlayout.php:168
 #: ../../mod/editpost.php:140 ../../mod/editwebpage.php:205
@@ -148,11 +154,12 @@ msgid "Examples: Robert Morgenstein, Fishing"
 msgstr ""
 
 #: ../../include/contact_widgets.php:26 ../../mod/connections.php:412
-#: ../../mod/directory.php:278 ../../mod/directory.php:283
+#: ../../mod/directory.php:316 ../../mod/directory.php:321
 msgid "Find"
 msgstr ""
 
 #: ../../include/contact_widgets.php:27 ../../mod/suggest.php:59
+#: ../../mod/directory.php:320
 msgid "Channel Suggestions"
 msgstr ""
 
@@ -169,17 +176,17 @@ msgid "Advanced example: name=fred and country=iceland"
 msgstr ""
 
 #: ../../include/contact_widgets.php:57 ../../include/features.php:73
-#: ../../include/widgets.php:303
+#: ../../include/widgets.php:298
 msgid "Saved Folders"
 msgstr ""
 
 #: ../../include/contact_widgets.php:60 ../../include/contact_widgets.php:95
-#: ../../include/widgets.php:306
+#: ../../include/widgets.php:301
 msgid "Everything"
 msgstr ""
 
 #: ../../include/contact_widgets.php:92 ../../include/taxonomy.php:230
-#: ../../include/widgets.php:29
+#: ../../include/widgets.php:35
 msgid "Categories"
 msgstr ""
 
@@ -286,7 +293,7 @@ msgstr ""
 
 #: ../../include/bb2diaspora.php:485 ../../include/identity.php:891
 #: ../../include/event.php:40 ../../mod/events.php:590
-#: ../../mod/directory.php:170
+#: ../../mod/directory.php:199
 msgid "Location:"
 msgstr ""
 
@@ -302,7 +309,7 @@ msgstr ""
 #: ../../mod/api.php:31 ../../mod/authtest.php:13 ../../mod/profile.php:64
 #: ../../mod/profile.php:72 ../../mod/block.php:22 ../../mod/block.php:72
 #: ../../mod/blocks.php:67 ../../mod/blocks.php:75 ../../mod/setup.php:207
-#: ../../mod/settings.php:540 ../../mod/events.php:195
+#: ../../mod/settings.php:542 ../../mod/events.php:195
 #: ../../mod/channel.php:89 ../../mod/channel.php:198
 #: ../../mod/channel.php:241 ../../mod/chat.php:90 ../../mod/chat.php:95
 #: ../../mod/regmod.php:17 ../../mod/common.php:35 ../../mod/like.php:154
@@ -315,7 +322,7 @@ msgstr ""
 #: ../../mod/editpost.php:13 ../../mod/editwebpage.php:64
 #: ../../mod/editwebpage.php:86 ../../mod/editwebpage.php:118
 #: ../../mod/profile_photo.php:263 ../../mod/profile_photo.php:276
-#: ../../mod/item.php:191 ../../mod/item.php:199 ../../mod/item.php:971
+#: ../../mod/item.php:191 ../../mod/item.php:199 ../../mod/item.php:972
 #: ../../mod/fsuggest.php:78 ../../mod/filestorage.php:18
 #: ../../mod/filestorage.php:67 ../../mod/filestorage.php:82
 #: ../../mod/filestorage.php:109 ../../mod/delegate.php:6
@@ -419,7 +426,7 @@ msgstr ""
 msgid "Schedule Outbox"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:163 ../../include/conversation.php:988
+#: ../../include/RedDAV/RedBrowser.php:163 ../../include/conversation.php:993
 #: ../../include/apps.php:331 ../../include/apps.php:382
 #: ../../mod/connedit.php:513 ../../mod/photos.php:713
 #: ../../mod/photos.php:1132
@@ -437,13 +444,13 @@ msgid "%1$s used of %2$s (%3$s&#37;)"
 msgstr ""
 
 #: ../../include/RedDAV/RedBrowser.php:241 ../../include/nav.php:106
-#: ../../include/conversation.php:1535 ../../include/apps.php:133
+#: ../../include/conversation.php:1540 ../../include/apps.php:133
 #: ../../mod/fbrowser.php:114
 msgid "Files"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:245 ../../mod/settings.php:565
-#: ../../mod/settings.php:591 ../../mod/admin.php:866
+#: ../../include/RedDAV/RedBrowser.php:245 ../../mod/settings.php:567
+#: ../../mod/settings.php:593 ../../mod/admin.php:866
 msgid "Name"
 msgstr ""
 
@@ -459,9 +466,9 @@ msgstr ""
 msgid "Last Modified"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:251 ../../include/conversation.php:634
+#: ../../include/RedDAV/RedBrowser.php:251 ../../include/conversation.php:639
 #: ../../include/apps.php:250 ../../include/ItemObject.php:120
-#: ../../mod/settings.php:626 ../../mod/connedit.php:476
+#: ../../mod/settings.php:628 ../../mod/connedit.php:476
 #: ../../mod/thing.php:234 ../../mod/group.php:176 ../../mod/admin.php:730
 #: ../../mod/admin.php:861 ../../mod/photos.php:1070
 msgid "Delete"
@@ -494,7 +501,7 @@ msgstr ""
 msgid "%1$s's bookmarks"
 msgstr ""
 
-#: ../../include/nav.php:95 ../../include/nav.php:128 ../../boot.php:1485
+#: ../../include/nav.php:95 ../../include/nav.php:128 ../../boot.php:1528
 msgid "Logout"
 msgstr ""
 
@@ -510,7 +517,7 @@ msgstr ""
 msgid "Your posts and conversations"
 msgstr ""
 
-#: ../../include/nav.php:99 ../../include/conversation.php:930
+#: ../../include/nav.php:99 ../../include/conversation.php:935
 #: ../../mod/connedit.php:429 ../../mod/connedit.php:545
 msgid "View Profile"
 msgstr ""
@@ -535,7 +542,7 @@ msgstr ""
 msgid "Edit your profile"
 msgstr ""
 
-#: ../../include/nav.php:105 ../../include/conversation.php:1526
+#: ../../include/nav.php:105 ../../include/conversation.php:1531
 #: ../../include/apps.php:137 ../../mod/fbrowser.php:25
 msgid "Photos"
 msgstr ""
@@ -556,7 +563,7 @@ msgstr ""
 msgid "Your chatrooms"
 msgstr ""
 
-#: ../../include/nav.php:117 ../../include/conversation.php:1561
+#: ../../include/nav.php:117 ../../include/conversation.php:1566
 #: ../../include/apps.php:127
 msgid "Bookmarks"
 msgstr ""
@@ -565,7 +572,7 @@ msgstr ""
 msgid "Your bookmarks"
 msgstr ""
 
-#: ../../include/nav.php:121 ../../include/conversation.php:1572
+#: ../../include/nav.php:121 ../../include/conversation.php:1577
 #: ../../include/apps.php:134 ../../mod/webpages.php:160
 msgid "Webpages"
 msgstr ""
@@ -574,7 +581,7 @@ msgstr ""
 msgid "Your webpages"
 msgstr ""
 
-#: ../../include/nav.php:125 ../../include/apps.php:129 ../../boot.php:1486
+#: ../../include/nav.php:125 ../../include/apps.php:129 ../../boot.php:1529
 msgid "Login"
 msgstr ""
 
@@ -599,7 +606,7 @@ msgstr ""
 msgid "Home Page"
 msgstr ""
 
-#: ../../include/nav.php:163 ../../mod/register.php:224 ../../boot.php:1464
+#: ../../include/nav.php:163 ../../mod/register.php:224 ../../boot.php:1507
 msgid "Register"
 msgstr ""
 
@@ -616,7 +623,7 @@ msgstr ""
 msgid "Help and documentation"
 msgstr ""
 
-#: ../../include/nav.php:171 ../../include/widgets.php:86
+#: ../../include/nav.php:171 ../../include/widgets.php:91
 #: ../../mod/apps.php:33
 msgid "Apps"
 msgstr ""
@@ -636,7 +643,7 @@ msgid "Search site content"
 msgstr ""
 
 #: ../../include/nav.php:176 ../../include/apps.php:139
-#: ../../mod/directory.php:282
+#: ../../mod/directory.php:320
 msgid "Directory"
 msgstr ""
 
@@ -712,7 +719,7 @@ msgstr ""
 msgid "Outbox"
 msgstr ""
 
-#: ../../include/nav.php:209 ../../include/widgets.php:572
+#: ../../include/nav.php:209 ../../include/widgets.php:557
 msgid "New Message"
 msgstr ""
 
@@ -742,7 +749,7 @@ msgstr ""
 msgid "Manage Your Channels"
 msgstr ""
 
-#: ../../include/nav.php:218 ../../include/widgets.php:548
+#: ../../include/nav.php:218 ../../include/widgets.php:536
 #: ../../include/apps.php:132 ../../mod/admin.php:951 ../../mod/admin.php:1156
 msgid "Settings"
 msgstr ""
@@ -759,7 +766,7 @@ msgstr ""
 msgid "Site Setup and Configuration"
 msgstr ""
 
-#: ../../include/nav.php:257 ../../include/conversation.php:835
+#: ../../include/nav.php:257 ../../include/conversation.php:840
 msgid "Loading..."
 msgstr ""
 
@@ -771,6 +778,183 @@ msgstr ""
 msgid "view full size"
 msgstr ""
 
+#: ../../include/dir_fns.php:66
+msgid "Directory Options"
+msgstr ""
+
+#: ../../include/dir_fns.php:67
+msgid "Alphabetic"
+msgstr ""
+
+#: ../../include/dir_fns.php:68
+msgid "Reverse Alphabetic"
+msgstr ""
+
+#: ../../include/dir_fns.php:69
+msgid "Newest to Oldest"
+msgstr ""
+
+#: ../../include/dir_fns.php:70
+msgid "Oldest to Newest"
+msgstr ""
+
+#: ../../include/dir_fns.php:71
+msgid "Public Forums Only"
+msgstr ""
+
+#: ../../include/dir_fns.php:73
+msgid "Sort"
+msgstr ""
+
+#: ../../include/dir_fns.php:89
+msgid "Enable Safe Search"
+msgstr ""
+
+#: ../../include/dir_fns.php:91
+msgid "Disable Safe Search"
+msgstr ""
+
+#: ../../include/dir_fns.php:93
+msgid "Safe Mode"
+msgstr ""
+
+#: ../../include/permissions.php:26
+msgid "Can view my normal stream and posts"
+msgstr ""
+
+#: ../../include/permissions.php:27
+msgid "Can view my default channel profile"
+msgstr ""
+
+#: ../../include/permissions.php:28
+msgid "Can view my photo albums"
+msgstr ""
+
+#: ../../include/permissions.php:29
+msgid "Can view my connections"
+msgstr ""
+
+#: ../../include/permissions.php:30
+msgid "Can view my file storage"
+msgstr ""
+
+#: ../../include/permissions.php:31
+msgid "Can view my webpages"
+msgstr ""
+
+#: ../../include/permissions.php:34
+msgid "Can send me their channel stream and posts"
+msgstr ""
+
+#: ../../include/permissions.php:35
+msgid "Can post on my channel page (\"wall\")"
+msgstr ""
+
+#: ../../include/permissions.php:36
+msgid "Can comment on or like my posts"
+msgstr ""
+
+#: ../../include/permissions.php:37
+msgid "Can send me private mail messages"
+msgstr ""
+
+#: ../../include/permissions.php:38
+msgid "Can post photos to my photo albums"
+msgstr ""
+
+#: ../../include/permissions.php:39
+msgid "Can like/dislike stuff"
+msgstr ""
+
+#: ../../include/permissions.php:39
+msgid "Profiles and things other than posts/comments"
+msgstr ""
+
+#: ../../include/permissions.php:41
+msgid "Can forward to all my channel contacts via post @mentions"
+msgstr ""
+
+#: ../../include/permissions.php:41
+msgid "Advanced - useful for creating group forum channels"
+msgstr ""
+
+#: ../../include/permissions.php:42
+msgid "Can chat with me (when available)"
+msgstr ""
+
+#: ../../include/permissions.php:43
+msgid "Can write to my file storage"
+msgstr ""
+
+#: ../../include/permissions.php:44
+msgid "Can edit my webpages"
+msgstr ""
+
+#: ../../include/permissions.php:46
+msgid "Can source my public posts in derived channels"
+msgstr ""
+
+#: ../../include/permissions.php:46
+msgid "Somewhat advanced - very useful in open communities"
+msgstr ""
+
+#: ../../include/permissions.php:48
+msgid "Can administer my channel resources"
+msgstr ""
+
+#: ../../include/permissions.php:48
+msgid "Extremely advanced. Leave this alone unless you know what you are doing"
+msgstr ""
+
+#: ../../include/permissions.php:814
+msgid "Social Networking"
+msgstr ""
+
+#: ../../include/permissions.php:815 ../../include/permissions.php:817
+#: ../../include/permissions.php:819
+msgid "Mostly Public"
+msgstr ""
+
+#: ../../include/permissions.php:815 ../../include/permissions.php:817
+#: ../../include/permissions.php:819
+msgid "Restricted"
+msgstr ""
+
+#: ../../include/permissions.php:815 ../../include/permissions.php:817
+msgid "Private"
+msgstr ""
+
+#: ../../include/permissions.php:816
+msgid "Community Forum"
+msgstr ""
+
+#: ../../include/permissions.php:818
+msgid "Feed Republish"
+msgstr ""
+
+#: ../../include/permissions.php:820
+msgid "Special Purpose"
+msgstr ""
+
+#: ../../include/permissions.php:821
+msgid "Celebrity/Soapbox"
+msgstr ""
+
+#: ../../include/permissions.php:821
+msgid "Group Repository"
+msgstr ""
+
+#: ../../include/permissions.php:822 ../../include/profile_selectors.php:6
+#: ../../include/profile_selectors.php:23
+#: ../../include/profile_selectors.php:61
+#: ../../include/profile_selectors.php:97
+msgid "Other"
+msgstr ""
+
+#: ../../include/permissions.php:823
+msgid "Custom/Expert Mode"
+msgstr ""
+
 #: ../../include/comanche.php:35 ../../mod/admin.php:353
 #: ../../view/theme/apw/php/config.php:185
 msgid "Default"
@@ -813,7 +997,7 @@ msgid "RSS/Atom"
 msgstr ""
 
 #: ../../include/contact_selectors.php:79 ../../mod/admin.php:726
-#: ../../mod/admin.php:735 ../../boot.php:1488
+#: ../../mod/admin.php:735 ../../boot.php:1531
 msgid "Email"
 msgstr ""
 
@@ -841,7 +1025,7 @@ msgstr ""
 msgid "MySpace"
 msgstr ""
 
-#: ../../include/identity.php:31 ../../mod/item.php:1368
+#: ../../include/identity.php:31 ../../mod/item.php:1112
 msgid "Unable to obtain identity information from database"
 msgstr ""
 
@@ -879,10 +1063,10 @@ msgid "Default Profile"
 msgstr ""
 
 #: ../../include/identity.php:387 ../../include/identity.php:388
-#: ../../include/identity.php:395 ../../include/widgets.php:431
-#: ../../include/profile_selectors.php:80 ../../mod/settings.php:318
-#: ../../mod/settings.php:322 ../../mod/settings.php:323
-#: ../../mod/settings.php:326 ../../mod/settings.php:337
+#: ../../include/identity.php:395 ../../include/widgets.php:424
+#: ../../include/profile_selectors.php:80 ../../mod/settings.php:320
+#: ../../mod/settings.php:324 ../../mod/settings.php:325
+#: ../../mod/settings.php:328 ../../mod/settings.php:339
 #: ../../mod/connedit.php:510
 msgid "Friends"
 msgstr ""
@@ -900,9 +1084,9 @@ msgid "Requested profile is not available."
 msgstr ""
 
 #: ../../include/identity.php:840 ../../include/Contact.php:107
-#: ../../include/widgets.php:135 ../../include/widgets.php:175
-#: ../../include/conversation.php:933 ../../mod/suggest.php:51
-#: ../../mod/match.php:62 ../../mod/directory.php:235
+#: ../../include/conversation.php:938 ../../include/widgets.php:136
+#: ../../include/widgets.php:175 ../../mod/suggest.php:51
+#: ../../mod/match.php:62 ../../mod/directory.php:264
 msgid "Connect"
 msgstr ""
 
@@ -985,12 +1169,12 @@ msgstr ""
 msgid "Events this week:"
 msgstr ""
 
-#: ../../include/identity.php:1122 ../../include/identity.php:1240
+#: ../../include/identity.php:1122 ../../include/identity.php:1251
 #: ../../include/apps.php:136 ../../mod/profperm.php:112
 msgid "Profile"
 msgstr ""
 
-#: ../../include/identity.php:1130 ../../mod/settings.php:1010
+#: ../../include/identity.php:1130 ../../mod/settings.php:1012
 msgid "Full Name:"
 msgstr ""
 
@@ -1067,39 +1251,39 @@ msgstr ""
 msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../include/identity.php:1208
+#: ../../include/identity.php:1218
 msgid "My other channels:"
 msgstr ""
 
-#: ../../include/identity.php:1210
+#: ../../include/identity.php:1221
 msgid "Musical interests:"
 msgstr ""
 
-#: ../../include/identity.php:1212
+#: ../../include/identity.php:1223
 msgid "Books, literature:"
 msgstr ""
 
-#: ../../include/identity.php:1214
+#: ../../include/identity.php:1225
 msgid "Television:"
 msgstr ""
 
-#: ../../include/identity.php:1216
+#: ../../include/identity.php:1227
 msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../include/identity.php:1218
+#: ../../include/identity.php:1229
 msgid "Love/Romance:"
 msgstr ""
 
-#: ../../include/identity.php:1220
+#: ../../include/identity.php:1231
 msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/identity.php:1222
+#: ../../include/identity.php:1233
 msgid "School/education:"
 msgstr ""
 
-#: ../../include/identity.php:1242
+#: ../../include/identity.php:1253
 msgid "Like this thing"
 msgstr ""
 
@@ -1237,7 +1421,7 @@ msgstr ""
 msgid "Open the selected location in a different window or browser tab"
 msgstr ""
 
-#: ../../include/Contact.php:213 ../../mod/admin.php:646
+#: ../../include/Contact.php:214 ../../mod/admin.php:646
 #, php-format
 msgid "User '%s' deleted"
 msgstr ""
@@ -1286,38 +1470,6 @@ msgstr ""
 msgid "Public Timeline"
 msgstr ""
 
-#: ../../include/dir_fns.php:56
-msgid "Directory Options"
-msgstr ""
-
-#: ../../include/dir_fns.php:57
-msgid "Alphabetic"
-msgstr ""
-
-#: ../../include/dir_fns.php:58
-msgid "Reverse Alphabetic"
-msgstr ""
-
-#: ../../include/dir_fns.php:59
-msgid "Newest to Oldest"
-msgstr ""
-
-#: ../../include/dir_fns.php:60
-msgid "Public Forums Only"
-msgstr ""
-
-#: ../../include/dir_fns.php:72
-msgid "Enable Safe Search"
-msgstr ""
-
-#: ../../include/dir_fns.php:74
-msgid "Disable Safe Search"
-msgstr ""
-
-#: ../../include/dir_fns.php:76
-msgid "Safe Mode"
-msgstr ""
-
 #: ../../include/enotify.php:41
 msgid "Red Matrix Notification"
 msgstr ""
@@ -1552,7 +1704,7 @@ msgstr ""
 msgid "Channels not in any collection"
 msgstr ""
 
-#: ../../include/group.php:303 ../../include/widgets.php:273
+#: ../../include/group.php:303 ../../include/widgets.php:269
 msgid "add"
 msgstr ""
 
@@ -1664,7 +1816,7 @@ msgstr ""
 msgid "Allow previewing posts and comments before publishing them"
 msgstr ""
 
-#: ../../include/features.php:49 ../../include/widgets.php:537
+#: ../../include/features.php:49 ../../include/widgets.php:528
 #: ../../mod/sources.php:88
 msgid "Channel Sources"
 msgstr ""
@@ -1710,7 +1862,7 @@ msgstr ""
 msgid "Enable widget to display Network posts only from selected collections"
 msgstr ""
 
-#: ../../include/features.php:59 ../../include/widgets.php:272
+#: ../../include/features.php:59 ../../include/widgets.php:268
 msgid "Saved Searches"
 msgstr ""
 
@@ -1846,7 +1998,7 @@ msgid "View Connections"
 msgstr ""
 
 #: ../../include/text.php:827 ../../include/text.php:839
-#: ../../include/widgets.php:193 ../../mod/filer.php:50
+#: ../../include/widgets.php:192 ../../mod/filer.php:50
 #: ../../mod/rbmark.php:28 ../../mod/rbmark.php:98 ../../mod/admin.php:1339
 #: ../../mod/admin.php:1360
 msgid "Save"
@@ -2146,899 +2298,756 @@ msgstr ""
 msgid "Pages"
 msgstr ""
 
-#: ../../include/account.php:23
-msgid "Not a valid email address"
-msgstr ""
-
-#: ../../include/account.php:25
-msgid "Your email domain is not among those allowed on this site"
-msgstr ""
-
-#: ../../include/account.php:31
-msgid "Your email address is already registered at this site."
-msgstr ""
-
-#: ../../include/account.php:64
-msgid "An invitation is required."
-msgstr ""
-
-#: ../../include/account.php:68
-msgid "Invitation could not be verified."
-msgstr ""
-
-#: ../../include/account.php:119
-msgid "Please enter the required information."
-msgstr ""
-
-#: ../../include/account.php:187
-msgid "Failed to store account information."
+#: ../../include/conversation.php:126 ../../mod/like.php:89
+msgid "channel"
 msgstr ""
 
-#: ../../include/account.php:245
+#: ../../include/conversation.php:164 ../../include/diaspora.php:1957
+#: ../../mod/like.php:336
 #, php-format
-msgid "Registration confirmation for %s"
+msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../include/account.php:313
+#: ../../include/conversation.php:167 ../../mod/like.php:338
 #, php-format
-msgid "Registration request at %s"
-msgstr ""
-
-#: ../../include/account.php:315 ../../include/account.php:342
-#: ../../include/account.php:399
-msgid "Administrator"
-msgstr ""
-
-#: ../../include/account.php:337
-msgid "your registration password"
+msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: ../../include/account.php:340 ../../include/account.php:397
+#: ../../include/conversation.php:204
 #, php-format
-msgid "Registration details for %s"
-msgstr ""
-
-#: ../../include/account.php:406
-msgid "Account approved."
+msgid "%1$s is now connected with %2$s"
 msgstr ""
 
-#: ../../include/account.php:440
+#: ../../include/conversation.php:239
 #, php-format
-msgid "Registration revoked for %s"
-msgstr ""
-
-#: ../../include/account.php:486
-msgid "Account verified. Please login."
-msgstr ""
-
-#: ../../include/account.php:648 ../../include/account.php:650
-msgid "Click here to upgrade."
+msgid "%1$s poked %2$s"
 msgstr ""
 
-#: ../../include/account.php:656
-msgid "This action exceeds the limits set by your subscription plan."
+#: ../../include/conversation.php:261 ../../mod/mood.php:63
+#, php-format
+msgctxt "mood"
+msgid "%1$s is %2$s"
 msgstr ""
 
-#: ../../include/account.php:661
-msgid "This action is not available under your subscription plan."
+#: ../../include/conversation.php:638 ../../include/ItemObject.php:126
+msgid "Select"
 msgstr ""
 
-#: ../../include/permissions.php:13
-msgid "Can view my normal stream and posts"
+#: ../../include/conversation.php:646 ../../include/ItemObject.php:89
+msgid "Private Message"
 msgstr ""
 
-#: ../../include/permissions.php:14
-msgid "Can view my default channel profile"
+#: ../../include/conversation.php:653 ../../include/ItemObject.php:194
+msgid "Message signature validated"
 msgstr ""
 
-#: ../../include/permissions.php:15
-msgid "Can view my photo albums"
+#: ../../include/conversation.php:654 ../../include/ItemObject.php:195
+msgid "Message signature incorrect"
 msgstr ""
 
-#: ../../include/permissions.php:16
-msgid "Can view my connections"
+#: ../../include/conversation.php:675
+#, php-format
+msgid "View %s's profile @ %s"
 msgstr ""
 
-#: ../../include/permissions.php:17
-msgid "Can view my file storage"
+#: ../../include/conversation.php:690
+msgid "Categories:"
 msgstr ""
 
-#: ../../include/permissions.php:18
-msgid "Can view my webpages"
+#: ../../include/conversation.php:691
+msgid "Filed under:"
 msgstr ""
 
-#: ../../include/permissions.php:21
-msgid "Can send me their channel stream and posts"
+#: ../../include/conversation.php:699 ../../include/ItemObject.php:266
+#, php-format
+msgid " from %s"
 msgstr ""
 
-#: ../../include/permissions.php:22
-msgid "Can post on my channel page (\"wall\")"
+#: ../../include/conversation.php:702 ../../include/ItemObject.php:269
+#, php-format
+msgid "last edited: %s"
 msgstr ""
 
-#: ../../include/permissions.php:23
-msgid "Can comment on or like my posts"
+#: ../../include/conversation.php:703 ../../include/ItemObject.php:270
+#, php-format
+msgid "Expires: %s"
 msgstr ""
 
-#: ../../include/permissions.php:24
-msgid "Can send me private mail messages"
+#: ../../include/conversation.php:718
+msgid "View in context"
 msgstr ""
 
-#: ../../include/permissions.php:25
-msgid "Can post photos to my photo albums"
+#: ../../include/conversation.php:720 ../../include/conversation.php:1143
+#: ../../include/ItemObject.php:317 ../../mod/editblock.php:152
+#: ../../mod/editlayout.php:148 ../../mod/editpost.php:121
+#: ../../mod/editwebpage.php:183 ../../mod/mail.php:238 ../../mod/mail.php:353
+#: ../../mod/photos.php:978
+msgid "Please wait"
 msgstr ""
 
-#: ../../include/permissions.php:26
-msgid "Can like/dislike stuff"
+#: ../../include/conversation.php:836
+msgid "remove"
 msgstr ""
 
-#: ../../include/permissions.php:26
-msgid "Profiles and things other than posts/comments"
+#: ../../include/conversation.php:841
+msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/permissions.php:28
-msgid "Can forward to all my channel contacts via post @mentions"
+#: ../../include/conversation.php:932
+msgid "View Source"
 msgstr ""
 
-#: ../../include/permissions.php:28
-msgid "Advanced - useful for creating group forum channels"
+#: ../../include/conversation.php:933
+msgid "Follow Thread"
 msgstr ""
 
-#: ../../include/permissions.php:29
-msgid "Can chat with me (when available)"
+#: ../../include/conversation.php:934
+msgid "View Status"
 msgstr ""
 
-#: ../../include/permissions.php:30
-msgid "Can write to my file storage"
+#: ../../include/conversation.php:936
+msgid "View Photos"
 msgstr ""
 
-#: ../../include/permissions.php:31
-msgid "Can edit my webpages"
+#: ../../include/conversation.php:937
+msgid "Matrix Activity"
 msgstr ""
 
-#: ../../include/permissions.php:33
-msgid "Can source my public posts in derived channels"
+#: ../../include/conversation.php:939
+msgid "Edit Contact"
 msgstr ""
 
-#: ../../include/permissions.php:33
-msgid "Somewhat advanced - very useful in open communities"
+#: ../../include/conversation.php:940
+msgid "Send PM"
 msgstr ""
 
-#: ../../include/permissions.php:35
-msgid "Can administer my channel resources"
+#: ../../include/conversation.php:941 ../../include/apps.php:143
+msgid "Poke"
 msgstr ""
 
-#: ../../include/permissions.php:35
-msgid "Extremely advanced. Leave this alone unless you know what you are doing"
+#: ../../include/conversation.php:1014
+#, php-format
+msgid "%s likes this."
 msgstr ""
 
-#: ../../include/permissions.php:785
-msgid "Social Networking"
+#: ../../include/conversation.php:1014
+#, php-format
+msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/permissions.php:786 ../../include/permissions.php:788
-#: ../../include/permissions.php:790
-msgid "Mostly Public"
-msgstr ""
+#: ../../include/conversation.php:1018
+#, 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/permissions.php:786 ../../include/permissions.php:788
-#: ../../include/permissions.php:790
-msgid "Restricted"
-msgstr ""
+#: ../../include/conversation.php:1020
+#, 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/permissions.php:786 ../../include/permissions.php:788
-msgid "Private"
+#: ../../include/conversation.php:1026
+msgid "and"
 msgstr ""
 
-#: ../../include/permissions.php:787
-msgid "Community Forum"
-msgstr ""
+#: ../../include/conversation.php:1029
+#, php-format
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/permissions.php:789
-msgid "Feed Republish"
+#: ../../include/conversation.php:1030
+#, php-format
+msgid "%s like this."
 msgstr ""
 
-#: ../../include/permissions.php:791
-msgid "Special Purpose"
+#: ../../include/conversation.php:1030
+#, php-format
+msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/permissions.php:792
-msgid "Celebrity/Soapbox"
+#: ../../include/conversation.php:1087
+msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: ../../include/permissions.php:792
-msgid "Group Repository"
+#: ../../include/conversation.php:1088 ../../mod/mail.php:171
+#: ../../mod/mail.php:286
+msgid "Please enter a link URL:"
 msgstr ""
 
-#: ../../include/permissions.php:793 ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23
-#: ../../include/profile_selectors.php:61
-#: ../../include/profile_selectors.php:97
-msgid "Other"
+#: ../../include/conversation.php:1089
+msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../include/permissions.php:794
-msgid "Custom/Expert Mode"
+#: ../../include/conversation.php:1090
+msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../include/photos.php:105
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
+#: ../../include/conversation.php:1091
+msgid "Tag term:"
 msgstr ""
 
-#: ../../include/photos.php:112
-msgid "Image file is empty."
+#: ../../include/conversation.php:1092 ../../mod/filer.php:49
+msgid "Save to Folder:"
 msgstr ""
 
-#: ../../include/photos.php:141 ../../mod/profile_photo.php:216
-msgid "Unable to process image"
+#: ../../include/conversation.php:1093
+msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/photos.php:213
-msgid "Photo storage failed."
+#: ../../include/conversation.php:1094 ../../mod/editpost.php:52
+#: ../../mod/mail.php:172 ../../mod/mail.php:287
+msgid "Expires YYYY-MM-DD HH:MM"
 msgstr ""
 
-#: ../../include/photos.php:341 ../../include/conversation.php:1529
-msgid "Photo Albums"
+#: ../../include/conversation.php:1118 ../../mod/editblock.php:198
+#: ../../mod/editlayout.php:193 ../../mod/editwebpage.php:230
+#: ../../mod/layouts.php:168 ../../mod/photos.php:977
+msgid "Share"
 msgstr ""
 
-#: ../../include/photos.php:345
-msgid "Upload New Photos"
+#: ../../include/conversation.php:1120 ../../mod/editwebpage.php:170
+msgid "Page link title"
 msgstr ""
 
-#: ../../include/items.php:382 ../../mod/profperm.php:23
-#: ../../mod/subthread.php:49 ../../mod/like.php:246 ../../mod/group.php:68
-#: ../../index.php:389
-msgid "Permission denied"
+#: ../../include/conversation.php:1123
+msgid "Post as"
 msgstr ""
 
-#: ../../include/items.php:969 ../../include/items.php:1014
-msgid "(Unknown)"
+#: ../../include/conversation.php:1124 ../../mod/editblock.php:144
+#: ../../mod/editlayout.php:140 ../../mod/editpost.php:113
+#: ../../mod/editwebpage.php:175 ../../mod/mail.php:235 ../../mod/mail.php:349
+msgid "Upload photo"
 msgstr ""
 
-#: ../../include/items.php:1171
-msgid "Visible to anybody on the internet."
+#: ../../include/conversation.php:1125
+msgid "upload photo"
 msgstr ""
 
-#: ../../include/items.php:1173
-msgid "Visible to you only."
+#: ../../include/conversation.php:1126 ../../mod/editblock.php:145
+#: ../../mod/editlayout.php:141 ../../mod/editpost.php:114
+#: ../../mod/editwebpage.php:176 ../../mod/mail.php:236 ../../mod/mail.php:350
+msgid "Attach file"
 msgstr ""
 
-#: ../../include/items.php:1175
-msgid "Visible to anybody in this network."
+#: ../../include/conversation.php:1127
+msgid "attach file"
 msgstr ""
 
-#: ../../include/items.php:1177
-msgid "Visible to anybody authenticated."
+#: ../../include/conversation.php:1128 ../../mod/editblock.php:146
+#: ../../mod/editlayout.php:142 ../../mod/editpost.php:115
+#: ../../mod/editwebpage.php:177 ../../mod/mail.php:237 ../../mod/mail.php:351
+msgid "Insert web link"
 msgstr ""
 
-#: ../../include/items.php:1179
-#, php-format
-msgid "Visible to anybody on %s."
+#: ../../include/conversation.php:1129
+msgid "web link"
 msgstr ""
 
-#: ../../include/items.php:1181
-msgid "Visible to all connections."
+#: ../../include/conversation.php:1130
+msgid "Insert video link"
 msgstr ""
 
-#: ../../include/items.php:1183
-msgid "Visible to approved connections."
+#: ../../include/conversation.php:1131
+msgid "video link"
 msgstr ""
 
-#: ../../include/items.php:1185
-msgid "Visible to specific connections."
+#: ../../include/conversation.php:1132
+msgid "Insert audio link"
 msgstr ""
 
-#: ../../include/items.php:3952 ../../mod/thing.php:76
-#: ../../mod/display.php:32 ../../mod/filestorage.php:26
-#: ../../mod/admin.php:168 ../../mod/admin.php:896 ../../mod/admin.php:1099
-#: ../../mod/viewsrc.php:20
-msgid "Item not found."
+#: ../../include/conversation.php:1133
+msgid "audio link"
 msgstr ""
 
-#: ../../include/items.php:4410 ../../mod/group.php:38 ../../mod/group.php:140
-msgid "Collection not found."
+#: ../../include/conversation.php:1134 ../../mod/editblock.php:150
+#: ../../mod/editlayout.php:146 ../../mod/editpost.php:119
+#: ../../mod/editwebpage.php:181
+msgid "Set your location"
 msgstr ""
 
-#: ../../include/items.php:4425
-msgid "Collection is empty."
+#: ../../include/conversation.php:1135
+msgid "set location"
 msgstr ""
 
-#: ../../include/items.php:4432
-#, php-format
-msgid "Collection: %s"
+#: ../../include/conversation.php:1136 ../../mod/editblock.php:151
+#: ../../mod/editlayout.php:147 ../../mod/editpost.php:120
+#: ../../mod/editwebpage.php:182
+msgid "Clear browser location"
 msgstr ""
 
-#: ../../include/items.php:4443
-#, php-format
-msgid "Connection: %s"
+#: ../../include/conversation.php:1137
+msgid "clear location"
 msgstr ""
 
-#: ../../include/items.php:4446
-msgid "Connection not found."
+#: ../../include/conversation.php:1139 ../../mod/editblock.php:164
+#: ../../mod/editlayout.php:159 ../../mod/editpost.php:132
+#: ../../mod/editwebpage.php:198
+msgid "Title (optional)"
 msgstr ""
 
-#: ../../include/security.php:323
-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."
+#: ../../include/conversation.php:1142 ../../mod/editblock.php:167
+#: ../../mod/editlayout.php:162 ../../mod/editpost.php:134
+#: ../../mod/editwebpage.php:200
+msgid "Categories (optional, comma-separated list)"
 msgstr ""
 
-#: ../../include/widgets.php:87
-msgid "System"
+#: ../../include/conversation.php:1144 ../../mod/editblock.php:153
+#: ../../mod/editlayout.php:149 ../../mod/editpost.php:122
+#: ../../mod/editwebpage.php:184
+msgid "Permission settings"
 msgstr ""
 
-#: ../../include/widgets.php:89 ../../include/conversation.php:1434
-msgid "Personal"
+#: ../../include/conversation.php:1145
+msgid "permissions"
 msgstr ""
 
-#: ../../include/widgets.php:90
-msgid "Create Personal App"
+#: ../../include/conversation.php:1152 ../../mod/editblock.php:161
+#: ../../mod/editlayout.php:156 ../../mod/editpost.php:129
+#: ../../mod/editwebpage.php:193
+msgid "Public post"
 msgstr ""
 
-#: ../../include/widgets.php:91
-msgid "Edit Personal App"
+#: ../../include/conversation.php:1154 ../../mod/editblock.php:168
+#: ../../mod/editlayout.php:163 ../../mod/editpost.php:135
+#: ../../mod/editwebpage.php:201
+msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
-#: ../../include/widgets.php:137 ../../mod/suggest.php:53
-msgid "Ignore/Hide"
+#: ../../include/conversation.php:1167 ../../mod/editblock.php:178
+#: ../../mod/editlayout.php:173 ../../mod/editpost.php:146
+#: ../../mod/editwebpage.php:210 ../../mod/mail.php:242 ../../mod/mail.php:356
+msgid "Set expiration date"
 msgstr ""
 
-#: ../../include/widgets.php:143 ../../mod/connections.php:267
-msgid "Suggestions"
+#: ../../include/conversation.php:1169 ../../include/ItemObject.php:633
+#: ../../mod/editpost.php:148 ../../mod/mail.php:244 ../../mod/mail.php:358
+msgid "Encrypt text"
 msgstr ""
 
-#: ../../include/widgets.php:144
-msgid "See more..."
+#: ../../include/conversation.php:1171 ../../mod/events.php:580
+#: ../../mod/editpost.php:150
+msgid "OK"
 msgstr ""
 
-#: ../../include/widgets.php:166
-#, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
+#: ../../include/conversation.php:1172 ../../mod/settings.php:566
+#: ../../mod/settings.php:592 ../../mod/events.php:579
+#: ../../mod/editpost.php:151 ../../mod/fbrowser.php:82
+#: ../../mod/fbrowser.php:117 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
+msgid "Cancel"
 msgstr ""
 
-#: ../../include/widgets.php:172
-msgid "Add New Connection"
+#: ../../include/conversation.php:1416
+msgid "Discover"
 msgstr ""
 
-#: ../../include/widgets.php:173
-msgid "Enter the channel address"
+#: ../../include/conversation.php:1419
+msgid "Imported public streams"
 msgstr ""
 
-#: ../../include/widgets.php:174
-msgid "Example: bob@example.com, http://example.com/barbara"
+#: ../../include/conversation.php:1424
+msgid "Commented Order"
 msgstr ""
 
-#: ../../include/widgets.php:191
-msgid "Notes"
+#: ../../include/conversation.php:1427
+msgid "Sort by Comment Date"
 msgstr ""
 
-#: ../../include/widgets.php:263
-msgid "Remove term"
+#: ../../include/conversation.php:1431
+msgid "Posted Order"
 msgstr ""
 
-#: ../../include/widgets.php:352
-msgid "Archives"
+#: ../../include/conversation.php:1434
+msgid "Sort by Post Date"
 msgstr ""
 
-#: ../../include/widgets.php:428
-msgid "Refresh"
+#: ../../include/conversation.php:1439 ../../include/widgets.php:94
+msgid "Personal"
 msgstr ""
 
-#: ../../include/widgets.php:429 ../../mod/connedit.php:506
-msgid "Me"
+#: ../../include/conversation.php:1442
+msgid "Posts that mention or involve you"
 msgstr ""
 
-#: ../../include/widgets.php:430 ../../mod/connedit.php:509
-msgid "Best Friends"
+#: ../../include/conversation.php:1448 ../../mod/connections.php:211
+#: ../../mod/connections.php:224 ../../mod/menu.php:80
+msgid "New"
 msgstr ""
 
-#: ../../include/widgets.php:432
-msgid "Co-workers"
+#: ../../include/conversation.php:1451
+msgid "Activity Stream - by date"
 msgstr ""
 
-#: ../../include/widgets.php:433 ../../mod/connedit.php:511
-msgid "Former Friends"
+#: ../../include/conversation.php:1457
+msgid "Starred"
 msgstr ""
 
-#: ../../include/widgets.php:434 ../../mod/connedit.php:512
-msgid "Acquaintances"
+#: ../../include/conversation.php:1460
+msgid "Favourite Posts"
 msgstr ""
 
-#: ../../include/widgets.php:435
-msgid "Everybody"
+#: ../../include/conversation.php:1467
+msgid "Spam"
 msgstr ""
 
-#: ../../include/widgets.php:469
-msgid "Account settings"
+#: ../../include/conversation.php:1470
+msgid "Posts flagged as SPAM"
 msgstr ""
 
-#: ../../include/widgets.php:475
-msgid "Channel settings"
+#: ../../include/conversation.php:1510 ../../mod/admin.php:865
+msgid "Channel"
 msgstr ""
 
-#: ../../include/widgets.php:481
-msgid "Additional features"
+#: ../../include/conversation.php:1513
+msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../include/widgets.php:487
-msgid "Feature settings"
+#: ../../include/conversation.php:1522
+msgid "About"
 msgstr ""
 
-#: ../../include/widgets.php:493
-msgid "Display settings"
+#: ../../include/conversation.php:1525
+msgid "Profile Details"
 msgstr ""
 
-#: ../../include/widgets.php:499
-msgid "Connected apps"
+#: ../../include/conversation.php:1534 ../../include/photos.php:341
+msgid "Photo Albums"
 msgstr ""
 
-#: ../../include/widgets.php:505
-msgid "Export channel"
+#: ../../include/conversation.php:1543
+msgid "Files and Storage"
 msgstr ""
 
-#: ../../include/widgets.php:511
-msgid "Export content"
+#: ../../include/conversation.php:1553 ../../include/conversation.php:1556
+msgid "Chatrooms"
 msgstr ""
 
-#: ../../include/widgets.php:520 ../../mod/connedit.php:539
-msgid "Connection Default Permissions"
+#: ../../include/conversation.php:1569
+msgid "Saved Bookmarks"
 msgstr ""
 
-#: ../../include/widgets.php:528
-msgid "Premium Channel Settings"
+#: ../../include/conversation.php:1580
+msgid "Manage Webpages"
 msgstr ""
 
-#: ../../include/widgets.php:562 ../../mod/mail.php:125
-#: ../../mod/message.php:31
-msgid "Messages"
+#: ../../include/account.php:23
+msgid "Not a valid email address"
 msgstr ""
 
-#: ../../include/widgets.php:567
-msgid "Check Mail"
+#: ../../include/account.php:25
+msgid "Your email domain is not among those allowed on this site"
 msgstr ""
 
-#: ../../include/widgets.php:648
-msgid "Chat Rooms"
+#: ../../include/account.php:31
+msgid "Your email address is already registered at this site."
 msgstr ""
 
-#: ../../include/widgets.php:668
-msgid "Bookmarked Chatrooms"
+#: ../../include/account.php:64
+msgid "An invitation is required."
 msgstr ""
 
-#: ../../include/widgets.php:688
-msgid "Suggested Chatrooms"
+#: ../../include/account.php:68
+msgid "Invitation could not be verified."
 msgstr ""
 
-#: ../../include/widgets.php:817 ../../include/widgets.php:875
-msgid "photo/image"
+#: ../../include/account.php:119
+msgid "Please enter the required information."
 msgstr ""
 
-#: ../../include/conversation.php:126 ../../mod/like.php:89
-msgid "channel"
+#: ../../include/account.php:187
+msgid "Failed to store account information."
 msgstr ""
 
-#: ../../include/conversation.php:164 ../../include/diaspora.php:1957
-#: ../../mod/like.php:336
+#: ../../include/account.php:245
 #, php-format
-msgid "%1$s likes %2$s's %3$s"
+msgid "Registration confirmation for %s"
 msgstr ""
 
-#: ../../include/conversation.php:167 ../../mod/like.php:338
+#: ../../include/account.php:313
 #, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
+msgid "Registration request at %s"
 msgstr ""
 
-#: ../../include/conversation.php:204
-#, php-format
-msgid "%1$s is now connected with %2$s"
+#: ../../include/account.php:315 ../../include/account.php:342
+#: ../../include/account.php:399
+msgid "Administrator"
 msgstr ""
 
-#: ../../include/conversation.php:239
-#, php-format
-msgid "%1$s poked %2$s"
+#: ../../include/account.php:337
+msgid "your registration password"
 msgstr ""
 
-#: ../../include/conversation.php:261 ../../mod/mood.php:63
+#: ../../include/account.php:340 ../../include/account.php:397
 #, php-format
-msgctxt "mood"
-msgid "%1$s is %2$s"
-msgstr ""
-
-#: ../../include/conversation.php:633 ../../include/ItemObject.php:126
-msgid "Select"
-msgstr ""
-
-#: ../../include/conversation.php:641 ../../include/ItemObject.php:89
-msgid "Private Message"
-msgstr ""
-
-#: ../../include/conversation.php:648 ../../include/ItemObject.php:194
-msgid "Message signature validated"
+msgid "Registration details for %s"
 msgstr ""
 
-#: ../../include/conversation.php:649 ../../include/ItemObject.php:195
-msgid "Message signature incorrect"
+#: ../../include/account.php:406
+msgid "Account approved."
 msgstr ""
 
-#: ../../include/conversation.php:670
+#: ../../include/account.php:440
 #, php-format
-msgid "View %s's profile @ %s"
+msgid "Registration revoked for %s"
 msgstr ""
 
-#: ../../include/conversation.php:685
-msgid "Categories:"
+#: ../../include/account.php:486
+msgid "Account verified. Please login."
 msgstr ""
 
-#: ../../include/conversation.php:686
-msgid "Filed under:"
+#: ../../include/account.php:648 ../../include/account.php:650
+msgid "Click here to upgrade."
 msgstr ""
 
-#: ../../include/conversation.php:694 ../../include/ItemObject.php:266
-#, php-format
-msgid " from %s"
+#: ../../include/account.php:656
+msgid "This action exceeds the limits set by your subscription plan."
 msgstr ""
 
-#: ../../include/conversation.php:697 ../../include/ItemObject.php:269
-#, php-format
-msgid "last edited: %s"
+#: ../../include/account.php:661
+msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: ../../include/conversation.php:698 ../../include/ItemObject.php:270
+#: ../../include/photos.php:105
 #, php-format
-msgid "Expires: %s"
-msgstr ""
-
-#: ../../include/conversation.php:713
-msgid "View in context"
-msgstr ""
-
-#: ../../include/conversation.php:715 ../../include/conversation.php:1138
-#: ../../include/ItemObject.php:317 ../../mod/editblock.php:152
-#: ../../mod/editlayout.php:148 ../../mod/editpost.php:121
-#: ../../mod/editwebpage.php:183 ../../mod/mail.php:238 ../../mod/mail.php:353
-#: ../../mod/photos.php:978
-msgid "Please wait"
-msgstr ""
-
-#: ../../include/conversation.php:831
-msgid "remove"
-msgstr ""
-
-#: ../../include/conversation.php:836
-msgid "Delete Selected Items"
-msgstr ""
-
-#: ../../include/conversation.php:927
-msgid "View Source"
-msgstr ""
-
-#: ../../include/conversation.php:928
-msgid "Follow Thread"
+msgid "Image exceeds website size limit of %lu bytes"
 msgstr ""
 
-#: ../../include/conversation.php:929
-msgid "View Status"
+#: ../../include/photos.php:112
+msgid "Image file is empty."
 msgstr ""
 
-#: ../../include/conversation.php:931
-msgid "View Photos"
+#: ../../include/photos.php:141 ../../mod/profile_photo.php:216
+msgid "Unable to process image"
 msgstr ""
 
-#: ../../include/conversation.php:932
-msgid "Matrix Activity"
+#: ../../include/photos.php:213
+msgid "Photo storage failed."
 msgstr ""
 
-#: ../../include/conversation.php:934
-msgid "Edit Contact"
+#: ../../include/photos.php:345
+msgid "Upload New Photos"
 msgstr ""
 
-#: ../../include/conversation.php:935
-msgid "Send PM"
+#: ../../include/items.php:382 ../../mod/profperm.php:23
+#: ../../mod/subthread.php:49 ../../mod/like.php:246 ../../mod/group.php:68
+#: ../../index.php:389
+msgid "Permission denied"
 msgstr ""
 
-#: ../../include/conversation.php:936 ../../include/apps.php:143
-msgid "Poke"
+#: ../../include/items.php:969 ../../include/items.php:1014
+msgid "(Unknown)"
 msgstr ""
 
-#: ../../include/conversation.php:1009
-#, php-format
-msgid "%s likes this."
+#: ../../include/items.php:1171
+msgid "Visible to anybody on the internet."
 msgstr ""
 
-#: ../../include/conversation.php:1009
-#, php-format
-msgid "%s doesn't like this."
+#: ../../include/items.php:1173
+msgid "Visible to you only."
 msgstr ""
 
-#: ../../include/conversation.php:1013
-#, 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/conversation.php:1015
-#, 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:1021
-msgid "and"
+#: ../../include/items.php:1175
+msgid "Visible to anybody in this network."
 msgstr ""
 
-#: ../../include/conversation.php:1024
-#, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1025
-#, php-format
-msgid "%s like this."
+#: ../../include/items.php:1177
+msgid "Visible to anybody authenticated."
 msgstr ""
 
-#: ../../include/conversation.php:1025
+#: ../../include/items.php:1179
 #, php-format
-msgid "%s don't like this."
-msgstr ""
-
-#: ../../include/conversation.php:1082
-msgid "Visible to <strong>everybody</strong>"
-msgstr ""
-
-#: ../../include/conversation.php:1083 ../../mod/mail.php:171
-#: ../../mod/mail.php:286
-msgid "Please enter a link URL:"
-msgstr ""
-
-#: ../../include/conversation.php:1084
-msgid "Please enter a video link/URL:"
-msgstr ""
-
-#: ../../include/conversation.php:1085
-msgid "Please enter an audio link/URL:"
-msgstr ""
-
-#: ../../include/conversation.php:1086
-msgid "Tag term:"
-msgstr ""
-
-#: ../../include/conversation.php:1087 ../../mod/filer.php:49
-msgid "Save to Folder:"
-msgstr ""
-
-#: ../../include/conversation.php:1088
-msgid "Where are you right now?"
-msgstr ""
-
-#: ../../include/conversation.php:1089 ../../mod/editpost.php:52
-#: ../../mod/mail.php:172 ../../mod/mail.php:287
-msgid "Expires YYYY-MM-DD HH:MM"
-msgstr ""
-
-#: ../../include/conversation.php:1113 ../../mod/editblock.php:198
-#: ../../mod/editlayout.php:193 ../../mod/editwebpage.php:230
-#: ../../mod/layouts.php:168 ../../mod/photos.php:977
-msgid "Share"
-msgstr ""
-
-#: ../../include/conversation.php:1115 ../../mod/editwebpage.php:170
-msgid "Page link title"
-msgstr ""
-
-#: ../../include/conversation.php:1118
-msgid "Post as"
+msgid "Visible to anybody on %s."
 msgstr ""
 
-#: ../../include/conversation.php:1119 ../../mod/editblock.php:144
-#: ../../mod/editlayout.php:140 ../../mod/editpost.php:113
-#: ../../mod/editwebpage.php:175 ../../mod/mail.php:235 ../../mod/mail.php:349
-msgid "Upload photo"
+#: ../../include/items.php:1181
+msgid "Visible to all connections."
 msgstr ""
 
-#: ../../include/conversation.php:1120
-msgid "upload photo"
+#: ../../include/items.php:1183
+msgid "Visible to approved connections."
 msgstr ""
 
-#: ../../include/conversation.php:1121 ../../mod/editblock.php:145
-#: ../../mod/editlayout.php:141 ../../mod/editpost.php:114
-#: ../../mod/editwebpage.php:176 ../../mod/mail.php:236 ../../mod/mail.php:350
-msgid "Attach file"
+#: ../../include/items.php:1185
+msgid "Visible to specific connections."
 msgstr ""
 
-#: ../../include/conversation.php:1122
-msgid "attach file"
+#: ../../include/items.php:3952 ../../mod/thing.php:76
+#: ../../mod/display.php:32 ../../mod/filestorage.php:26
+#: ../../mod/admin.php:168 ../../mod/admin.php:896 ../../mod/admin.php:1099
+#: ../../mod/viewsrc.php:20
+msgid "Item not found."
 msgstr ""
 
-#: ../../include/conversation.php:1123 ../../mod/editblock.php:146
-#: ../../mod/editlayout.php:142 ../../mod/editpost.php:115
-#: ../../mod/editwebpage.php:177 ../../mod/mail.php:237 ../../mod/mail.php:351
-msgid "Insert web link"
+#: ../../include/items.php:4410 ../../mod/group.php:38 ../../mod/group.php:140
+msgid "Collection not found."
 msgstr ""
 
-#: ../../include/conversation.php:1124
-msgid "web link"
+#: ../../include/items.php:4425
+msgid "Collection is empty."
 msgstr ""
 
-#: ../../include/conversation.php:1125
-msgid "Insert video link"
+#: ../../include/items.php:4432
+#, php-format
+msgid "Collection: %s"
 msgstr ""
 
-#: ../../include/conversation.php:1126
-msgid "video link"
+#: ../../include/items.php:4443
+#, php-format
+msgid "Connection: %s"
 msgstr ""
 
-#: ../../include/conversation.php:1127
-msgid "Insert audio link"
+#: ../../include/items.php:4446
+msgid "Connection not found."
 msgstr ""
 
-#: ../../include/conversation.php:1128
-msgid "audio link"
+#: ../../include/widgets.php:92
+msgid "System"
 msgstr ""
 
-#: ../../include/conversation.php:1129 ../../mod/editblock.php:150
-#: ../../mod/editlayout.php:146 ../../mod/editpost.php:119
-#: ../../mod/editwebpage.php:181
-msgid "Set your location"
+#: ../../include/widgets.php:95
+msgid "Create Personal App"
 msgstr ""
 
-#: ../../include/conversation.php:1130
-msgid "set location"
+#: ../../include/widgets.php:96
+msgid "Edit Personal App"
 msgstr ""
 
-#: ../../include/conversation.php:1131 ../../mod/editblock.php:151
-#: ../../mod/editlayout.php:147 ../../mod/editpost.php:120
-#: ../../mod/editwebpage.php:182
-msgid "Clear browser location"
+#: ../../include/widgets.php:138 ../../mod/suggest.php:53
+msgid "Ignore/Hide"
 msgstr ""
 
-#: ../../include/conversation.php:1132
-msgid "clear location"
+#: ../../include/widgets.php:143 ../../mod/connections.php:267
+msgid "Suggestions"
 msgstr ""
 
-#: ../../include/conversation.php:1134 ../../mod/editblock.php:164
-#: ../../mod/editlayout.php:159 ../../mod/editpost.php:132
-#: ../../mod/editwebpage.php:198
-msgid "Set title"
+#: ../../include/widgets.php:144
+msgid "See more..."
 msgstr ""
 
-#: ../../include/conversation.php:1137 ../../mod/events.php:574
-#: ../../mod/editblock.php:167 ../../mod/editlayout.php:162
-#: ../../mod/editpost.php:134 ../../mod/editwebpage.php:200
-msgid "Categories (comma-separated list)"
+#: ../../include/widgets.php:166
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
 msgstr ""
 
-#: ../../include/conversation.php:1139 ../../mod/editblock.php:153
-#: ../../mod/editlayout.php:149 ../../mod/editpost.php:122
-#: ../../mod/editwebpage.php:184
-msgid "Permission settings"
+#: ../../include/widgets.php:172
+msgid "Add New Connection"
 msgstr ""
 
-#: ../../include/conversation.php:1140
-msgid "permissions"
+#: ../../include/widgets.php:173
+msgid "Enter the channel address"
 msgstr ""
 
-#: ../../include/conversation.php:1147 ../../mod/editblock.php:161
-#: ../../mod/editlayout.php:156 ../../mod/editpost.php:129
-#: ../../mod/editwebpage.php:193
-msgid "Public post"
+#: ../../include/widgets.php:174
+msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr ""
 
-#: ../../include/conversation.php:1149 ../../mod/editblock.php:168
-#: ../../mod/editlayout.php:163 ../../mod/editpost.php:135
-#: ../../mod/editwebpage.php:201
-msgid "Example: bob@example.com, mary@example.com"
+#: ../../include/widgets.php:190
+msgid "Notes"
 msgstr ""
 
-#: ../../include/conversation.php:1162 ../../mod/editblock.php:178
-#: ../../mod/editlayout.php:173 ../../mod/editpost.php:146
-#: ../../mod/editwebpage.php:210 ../../mod/mail.php:242 ../../mod/mail.php:356
-msgid "Set expiration date"
+#: ../../include/widgets.php:260
+msgid "Remove term"
 msgstr ""
 
-#: ../../include/conversation.php:1164 ../../include/ItemObject.php:633
-#: ../../mod/editpost.php:148 ../../mod/mail.php:244 ../../mod/mail.php:358
-msgid "Encrypt text"
+#: ../../include/widgets.php:343
+msgid "Archives"
 msgstr ""
 
-#: ../../include/conversation.php:1166 ../../mod/events.php:580
-#: ../../mod/editpost.php:150
-msgid "OK"
+#: ../../include/widgets.php:421
+msgid "Refresh"
 msgstr ""
 
-#: ../../include/conversation.php:1167 ../../mod/settings.php:564
-#: ../../mod/settings.php:590 ../../mod/events.php:579
-#: ../../mod/editpost.php:151 ../../mod/fbrowser.php:82
-#: ../../mod/fbrowser.php:117 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
-msgid "Cancel"
+#: ../../include/widgets.php:422 ../../mod/connedit.php:506
+msgid "Me"
 msgstr ""
 
-#: ../../include/conversation.php:1411
-msgid "Discover"
+#: ../../include/widgets.php:423 ../../mod/connedit.php:509
+msgid "Best Friends"
 msgstr ""
 
-#: ../../include/conversation.php:1414
-msgid "Imported public streams"
+#: ../../include/widgets.php:425
+msgid "Co-workers"
 msgstr ""
 
-#: ../../include/conversation.php:1419
-msgid "Commented Order"
+#: ../../include/widgets.php:426 ../../mod/connedit.php:511
+msgid "Former Friends"
 msgstr ""
 
-#: ../../include/conversation.php:1422
-msgid "Sort by Comment Date"
+#: ../../include/widgets.php:427 ../../mod/connedit.php:512
+msgid "Acquaintances"
 msgstr ""
 
-#: ../../include/conversation.php:1426
-msgid "Posted Order"
+#: ../../include/widgets.php:428
+msgid "Everybody"
 msgstr ""
 
-#: ../../include/conversation.php:1429
-msgid "Sort by Post Date"
+#: ../../include/widgets.php:462
+msgid "Account settings"
 msgstr ""
 
-#: ../../include/conversation.php:1437
-msgid "Posts that mention or involve you"
+#: ../../include/widgets.php:468
+msgid "Channel settings"
 msgstr ""
 
-#: ../../include/conversation.php:1443 ../../mod/connections.php:211
-#: ../../mod/connections.php:224 ../../mod/menu.php:80
-msgid "New"
+#: ../../include/widgets.php:474
+msgid "Additional features"
 msgstr ""
 
-#: ../../include/conversation.php:1446
-msgid "Activity Stream - by date"
+#: ../../include/widgets.php:480
+msgid "Feature settings"
 msgstr ""
 
-#: ../../include/conversation.php:1452
-msgid "Starred"
+#: ../../include/widgets.php:486
+msgid "Display settings"
 msgstr ""
 
-#: ../../include/conversation.php:1455
-msgid "Favourite Posts"
+#: ../../include/widgets.php:492
+msgid "Connected apps"
 msgstr ""
 
-#: ../../include/conversation.php:1462
-msgid "Spam"
+#: ../../include/widgets.php:498
+msgid "Export channel"
 msgstr ""
 
-#: ../../include/conversation.php:1465
-msgid "Posts flagged as SPAM"
+#: ../../include/widgets.php:504
+msgid "Export content"
 msgstr ""
 
-#: ../../include/conversation.php:1505 ../../mod/admin.php:865
-msgid "Channel"
+#: ../../include/widgets.php:512 ../../mod/connedit.php:539
+msgid "Connection Default Permissions"
 msgstr ""
 
-#: ../../include/conversation.php:1508
-msgid "Status Messages and Posts"
+#: ../../include/widgets.php:520
+msgid "Premium Channel Settings"
 msgstr ""
 
-#: ../../include/conversation.php:1517
-msgid "About"
+#: ../../include/widgets.php:549 ../../mod/mail.php:125
+#: ../../mod/message.php:31
+msgid "Messages"
 msgstr ""
 
-#: ../../include/conversation.php:1520
-msgid "Profile Details"
+#: ../../include/widgets.php:552
+msgid "Check Mail"
 msgstr ""
 
-#: ../../include/conversation.php:1538
-msgid "Files and Storage"
+#: ../../include/widgets.php:635
+msgid "Chat Rooms"
 msgstr ""
 
-#: ../../include/conversation.php:1548 ../../include/conversation.php:1551
-msgid "Chatrooms"
+#: ../../include/widgets.php:655
+msgid "Bookmarked Chatrooms"
 msgstr ""
 
-#: ../../include/conversation.php:1564
-msgid "Saved Bookmarks"
+#: ../../include/widgets.php:675
+msgid "Suggested Chatrooms"
 msgstr ""
 
-#: ../../include/conversation.php:1575
-msgid "Manage Webpages"
+#: ../../include/widgets.php:802 ../../include/widgets.php:860
+msgid "photo/image"
 msgstr ""
 
 #: ../../include/zot.php:664
@@ -3465,7 +3474,7 @@ msgid "Profile Photo"
 msgstr ""
 
 #: ../../include/apps.php:242 ../../mod/settings.php:81
-#: ../../mod/settings.php:589
+#: ../../mod/settings.php:591
 msgid "Update"
 msgstr ""
 
@@ -3598,10 +3607,10 @@ msgstr ""
 
 #: ../../include/ItemObject.php:621 ../../mod/mood.php:135
 #: ../../mod/sources.php:104 ../../mod/sources.php:138 ../../mod/poke.php:166
-#: ../../mod/setup.php:313 ../../mod/setup.php:358 ../../mod/settings.php:563
-#: ../../mod/settings.php:675 ../../mod/settings.php:704
-#: ../../mod/settings.php:728 ../../mod/settings.php:810
-#: ../../mod/settings.php:1002 ../../mod/events.php:598 ../../mod/chat.php:177
+#: ../../mod/setup.php:313 ../../mod/setup.php:358 ../../mod/settings.php:565
+#: ../../mod/settings.php:677 ../../mod/settings.php:706
+#: ../../mod/settings.php:730 ../../mod/settings.php:812
+#: ../../mod/settings.php:1004 ../../mod/events.php:598 ../../mod/chat.php:177
 #: ../../mod/chat.php:211 ../../mod/connect.php:93 ../../mod/connedit.php:556
 #: ../../mod/thing.php:284 ../../mod/thing.php:327 ../../mod/profiles.php:633
 #: ../../mod/pdledit.php:58 ../../mod/fsuggest.php:108
@@ -3741,7 +3750,7 @@ msgstr ""
 msgid "Menu Item Permissions"
 msgstr ""
 
-#: ../../mod/mitem.php:161 ../../mod/mitem.php:204 ../../mod/settings.php:1037
+#: ../../mod/mitem.php:161 ../../mod/mitem.php:204 ../../mod/settings.php:1039
 msgid "(click to open/close)"
 msgstr ""
 
@@ -3996,20 +4005,20 @@ msgid ""
 "and/or create new posts for you?"
 msgstr ""
 
-#: ../../mod/api.php:105 ../../mod/settings.php:942 ../../mod/settings.php:947
-#: ../../mod/settings.php:1030 ../../mod/profiles.php:591
+#: ../../mod/api.php:105 ../../mod/settings.php:944 ../../mod/settings.php:949
+#: ../../mod/settings.php:1032 ../../mod/profiles.php:591
 #: ../../mod/admin.php:392
 msgid "Yes"
 msgstr ""
 
-#: ../../mod/api.php:106 ../../mod/settings.php:942 ../../mod/settings.php:947
-#: ../../mod/settings.php:1030 ../../mod/profiles.php:592
+#: ../../mod/api.php:106 ../../mod/settings.php:944 ../../mod/settings.php:949
+#: ../../mod/settings.php:1032 ../../mod/profiles.php:592
 #: ../../mod/admin.php:390
 msgid "No"
 msgstr ""
 
 #: ../../mod/search.php:13 ../../mod/display.php:9
-#: ../../mod/viewconnections.php:17 ../../mod/directory.php:15
+#: ../../mod/viewconnections.php:17 ../../mod/directory.php:22
 #: ../../mod/photos.php:458
 msgid "Public access denied."
 msgstr ""
@@ -4440,547 +4449,547 @@ msgstr ""
 msgid "Key and Secret are required"
 msgstr ""
 
-#: ../../mod/settings.php:211
+#: ../../mod/settings.php:213
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:215
+#: ../../mod/settings.php:217
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:229
+#: ../../mod/settings.php:231
 msgid "Password changed."
 msgstr ""
 
-#: ../../mod/settings.php:231
+#: ../../mod/settings.php:233
 msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/settings.php:245
+#: ../../mod/settings.php:247
 msgid "Not valid email."
 msgstr ""
 
-#: ../../mod/settings.php:248
+#: ../../mod/settings.php:250
 msgid "Protected email address. Cannot change to that email."
 msgstr ""
 
-#: ../../mod/settings.php:257
+#: ../../mod/settings.php:259
 msgid "System failure storing new email. Please try again."
 msgstr ""
 
-#: ../../mod/settings.php:493
+#: ../../mod/settings.php:495
 msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:562 ../../mod/settings.php:588
-#: ../../mod/settings.php:624
+#: ../../mod/settings.php:564 ../../mod/settings.php:590
+#: ../../mod/settings.php:626
 msgid "Add application"
 msgstr ""
 
-#: ../../mod/settings.php:565
+#: ../../mod/settings.php:567
 msgid "Name of application"
 msgstr ""
 
-#: ../../mod/settings.php:566 ../../mod/settings.php:592
+#: ../../mod/settings.php:568 ../../mod/settings.php:594
 msgid "Consumer Key"
 msgstr ""
 
-#: ../../mod/settings.php:566 ../../mod/settings.php:567
+#: ../../mod/settings.php:568 ../../mod/settings.php:569
 msgid "Automatically generated - change if desired. Max length 20"
 msgstr ""
 
-#: ../../mod/settings.php:567 ../../mod/settings.php:593
+#: ../../mod/settings.php:569 ../../mod/settings.php:595
 msgid "Consumer Secret"
 msgstr ""
 
-#: ../../mod/settings.php:568 ../../mod/settings.php:594
+#: ../../mod/settings.php:570 ../../mod/settings.php:596
 msgid "Redirect"
 msgstr ""
 
-#: ../../mod/settings.php:568
+#: ../../mod/settings.php:570
 msgid ""
 "Redirect URI - leave blank unless your application specifically requires this"
 msgstr ""
 
-#: ../../mod/settings.php:569 ../../mod/settings.php:595
+#: ../../mod/settings.php:571 ../../mod/settings.php:597
 msgid "Icon url"
 msgstr ""
 
-#: ../../mod/settings.php:569
+#: ../../mod/settings.php:571
 msgid "Optional"
 msgstr ""
 
-#: ../../mod/settings.php:580
+#: ../../mod/settings.php:582
 msgid "You can't edit this application."
 msgstr ""
 
-#: ../../mod/settings.php:623
+#: ../../mod/settings.php:625
 msgid "Connected Apps"
 msgstr ""
 
-#: ../../mod/settings.php:627
+#: ../../mod/settings.php:629
 msgid "Client key starts with"
 msgstr ""
 
-#: ../../mod/settings.php:628
+#: ../../mod/settings.php:630
 msgid "No name"
 msgstr ""
 
-#: ../../mod/settings.php:629
+#: ../../mod/settings.php:631
 msgid "Remove authorization"
 msgstr ""
 
-#: ../../mod/settings.php:640
+#: ../../mod/settings.php:642
 msgid "No feature settings configured"
 msgstr ""
 
-#: ../../mod/settings.php:648
+#: ../../mod/settings.php:650
 msgid "Feature Settings"
 msgstr ""
 
-#: ../../mod/settings.php:671
+#: ../../mod/settings.php:673
 msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/settings.php:672
+#: ../../mod/settings.php:674
 msgid "Password Settings"
 msgstr ""
 
-#: ../../mod/settings.php:673
+#: ../../mod/settings.php:675
 msgid "New Password:"
 msgstr ""
 
-#: ../../mod/settings.php:674
+#: ../../mod/settings.php:676
 msgid "Confirm:"
 msgstr ""
 
-#: ../../mod/settings.php:674
+#: ../../mod/settings.php:676
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/settings.php:676 ../../mod/settings.php:1011
+#: ../../mod/settings.php:678 ../../mod/settings.php:1013
 msgid "Email Address:"
 msgstr ""
 
-#: ../../mod/settings.php:677 ../../mod/removeaccount.php:61
+#: ../../mod/settings.php:679 ../../mod/removeaccount.php:61
 msgid "Remove Account"
 msgstr ""
 
-#: ../../mod/settings.php:678
+#: ../../mod/settings.php:680
 msgid "Remove this account from this server including all its channels"
 msgstr ""
 
-#: ../../mod/settings.php:679 ../../mod/settings.php:1093
+#: ../../mod/settings.php:681 ../../mod/settings.php:1095
 msgid "Warning: This action is permanent and cannot be reversed."
 msgstr ""
 
-#: ../../mod/settings.php:695
+#: ../../mod/settings.php:697
 msgid "Off"
 msgstr ""
 
-#: ../../mod/settings.php:695
+#: ../../mod/settings.php:697
 msgid "On"
 msgstr ""
 
-#: ../../mod/settings.php:702
+#: ../../mod/settings.php:704
 msgid "Additional Features"
 msgstr ""
 
-#: ../../mod/settings.php:727
+#: ../../mod/settings.php:729
 msgid "Connector Settings"
 msgstr ""
 
-#: ../../mod/settings.php:758
+#: ../../mod/settings.php:768
 msgid "No special theme for mobile devices"
 msgstr ""
 
-#: ../../mod/settings.php:769
+#: ../../mod/settings.php:771
 #, php-format
 msgid "%s - (Experimental)"
 msgstr ""
 
-#: ../../mod/settings.php:773 ../../mod/admin.php:363
+#: ../../mod/settings.php:774 ../../mod/admin.php:363
 msgid "mobile"
 msgstr ""
 
-#: ../../mod/settings.php:808
+#: ../../mod/settings.php:810
 msgid "Display Settings"
 msgstr ""
 
-#: ../../mod/settings.php:814
+#: ../../mod/settings.php:816
 msgid "Display Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:815
+#: ../../mod/settings.php:817
 msgid "Mobile Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:816
+#: ../../mod/settings.php:818
 msgid "Enable user zoom on mobile devices"
 msgstr ""
 
-#: ../../mod/settings.php:817
+#: ../../mod/settings.php:819
 msgid "Update browser every xx seconds"
 msgstr ""
 
-#: ../../mod/settings.php:817
+#: ../../mod/settings.php:819
 msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
-#: ../../mod/settings.php:818
+#: ../../mod/settings.php:820
 msgid "Maximum number of conversations to load at any time:"
 msgstr ""
 
-#: ../../mod/settings.php:818
+#: ../../mod/settings.php:820
 msgid "Maximum of 100 items"
 msgstr ""
 
-#: ../../mod/settings.php:819
+#: ../../mod/settings.php:821
 msgid "Don't show emoticons"
 msgstr ""
 
-#: ../../mod/settings.php:820
+#: ../../mod/settings.php:822
 msgid "Link post titles to source"
 msgstr ""
 
-#: ../../mod/settings.php:821
+#: ../../mod/settings.php:823
 msgid "System Page Layout Editor - (advanced)"
 msgstr ""
 
-#: ../../mod/settings.php:824
+#: ../../mod/settings.php:826
 msgid "Use blog/list mode on channel page"
 msgstr ""
 
-#: ../../mod/settings.php:824 ../../mod/settings.php:825
+#: ../../mod/settings.php:826 ../../mod/settings.php:827
 msgid "(comments displayed separately)"
 msgstr ""
 
-#: ../../mod/settings.php:825
+#: ../../mod/settings.php:827
 msgid "Use blog/list mode on matrix page"
 msgstr ""
 
-#: ../../mod/settings.php:826
+#: ../../mod/settings.php:828
 msgid "Channel page max height of content (in pixels)"
 msgstr ""
 
-#: ../../mod/settings.php:826 ../../mod/settings.php:827
+#: ../../mod/settings.php:828 ../../mod/settings.php:829
 msgid "click to expand content exceeding this height"
 msgstr ""
 
-#: ../../mod/settings.php:827
+#: ../../mod/settings.php:829
 msgid "Matrix page max height of content (in pixels)"
 msgstr ""
 
-#: ../../mod/settings.php:861
+#: ../../mod/settings.php:863
 msgid "Nobody except yourself"
 msgstr ""
 
-#: ../../mod/settings.php:862
+#: ../../mod/settings.php:864
 msgid "Only those you specifically allow"
 msgstr ""
 
-#: ../../mod/settings.php:863
+#: ../../mod/settings.php:865
 msgid "Approved connections"
 msgstr ""
 
-#: ../../mod/settings.php:864
+#: ../../mod/settings.php:866
 msgid "Any connections"
 msgstr ""
 
-#: ../../mod/settings.php:865
+#: ../../mod/settings.php:867
 msgid "Anybody on this website"
 msgstr ""
 
-#: ../../mod/settings.php:866
+#: ../../mod/settings.php:868
 msgid "Anybody in this network"
 msgstr ""
 
-#: ../../mod/settings.php:867
+#: ../../mod/settings.php:869
 msgid "Anybody authenticated"
 msgstr ""
 
-#: ../../mod/settings.php:868
+#: ../../mod/settings.php:870
 msgid "Anybody on the internet"
 msgstr ""
 
-#: ../../mod/settings.php:942
+#: ../../mod/settings.php:944
 msgid "Publish your default profile in the network directory"
 msgstr ""
 
-#: ../../mod/settings.php:947
+#: ../../mod/settings.php:949
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../mod/settings.php:951 ../../mod/profile_photo.php:365
+#: ../../mod/settings.php:953 ../../mod/profile_photo.php:365
 msgid "or"
 msgstr ""
 
-#: ../../mod/settings.php:956
+#: ../../mod/settings.php:958
 msgid "Your channel address is"
 msgstr ""
 
-#: ../../mod/settings.php:1000
+#: ../../mod/settings.php:1002
 msgid "Channel Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1009
+#: ../../mod/settings.php:1011
 msgid "Basic Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1012
+#: ../../mod/settings.php:1014
 msgid "Your Timezone:"
 msgstr ""
 
-#: ../../mod/settings.php:1013
+#: ../../mod/settings.php:1015
 msgid "Default Post Location:"
 msgstr ""
 
-#: ../../mod/settings.php:1013
+#: ../../mod/settings.php:1015
 msgid "Geographical location to display on your posts"
 msgstr ""
 
-#: ../../mod/settings.php:1014
+#: ../../mod/settings.php:1016
 msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../mod/settings.php:1016
+#: ../../mod/settings.php:1018
 msgid "Adult Content"
 msgstr ""
 
-#: ../../mod/settings.php:1016
+#: ../../mod/settings.php:1018
 msgid ""
 "This channel frequently or regularly publishes adult content. (Please tag "
 "any adult material and/or nudity with #NSFW)"
 msgstr ""
 
-#: ../../mod/settings.php:1018
+#: ../../mod/settings.php:1020
 msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1020
+#: ../../mod/settings.php:1022
 msgid "Your permissions are already configured. Click to view/adjust"
 msgstr ""
 
-#: ../../mod/settings.php:1022
+#: ../../mod/settings.php:1024
 msgid "Hide my online presence"
 msgstr ""
 
-#: ../../mod/settings.php:1022
+#: ../../mod/settings.php:1024
 msgid "Prevents displaying in your profile that you are online"
 msgstr ""
 
-#: ../../mod/settings.php:1024
+#: ../../mod/settings.php:1026
 msgid "Simple Privacy Settings:"
 msgstr ""
 
-#: ../../mod/settings.php:1025
+#: ../../mod/settings.php:1027
 msgid ""
 "Very Public - <em>extremely permissive (should be used with caution)</em>"
 msgstr ""
 
-#: ../../mod/settings.php:1026
+#: ../../mod/settings.php:1028
 msgid ""
 "Typical - <em>default public, privacy when desired (similar to social "
 "network permissions but with improved privacy)</em>"
 msgstr ""
 
-#: ../../mod/settings.php:1027
+#: ../../mod/settings.php:1029
 msgid "Private - <em>default private, never open or public</em>"
 msgstr ""
 
-#: ../../mod/settings.php:1028
+#: ../../mod/settings.php:1030
 msgid "Blocked - <em>default blocked to/from everybody</em>"
 msgstr ""
 
-#: ../../mod/settings.php:1030
+#: ../../mod/settings.php:1032
 msgid "Allow others to tag your posts"
 msgstr ""
 
-#: ../../mod/settings.php:1030
+#: ../../mod/settings.php:1032
 msgid ""
 "Often used by the community to retro-actively flag inappropriate content"
 msgstr ""
 
-#: ../../mod/settings.php:1032
+#: ../../mod/settings.php:1034
 msgid "Advanced Privacy Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1034
+#: ../../mod/settings.php:1036
 msgid "Expire other channel content after this many days"
 msgstr ""
 
-#: ../../mod/settings.php:1034
+#: ../../mod/settings.php:1036
 msgid "0 or blank prevents expiration"
 msgstr ""
 
-#: ../../mod/settings.php:1035
+#: ../../mod/settings.php:1037
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/settings.php:1035
+#: ../../mod/settings.php:1037
 msgid "May reduce spam activity"
 msgstr ""
 
-#: ../../mod/settings.php:1036
+#: ../../mod/settings.php:1038
 msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:1041
+#: ../../mod/settings.php:1043
 msgid "Channel permissions category:"
 msgstr ""
 
-#: ../../mod/settings.php:1049
+#: ../../mod/settings.php:1051
 msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: ../../mod/settings.php:1049
+#: ../../mod/settings.php:1051
 msgid "Useful to reduce spamming"
 msgstr ""
 
-#: ../../mod/settings.php:1052
+#: ../../mod/settings.php:1054
 msgid "Notification Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1053
+#: ../../mod/settings.php:1055
 msgid "By default post a status message when:"
 msgstr ""
 
-#: ../../mod/settings.php:1054
+#: ../../mod/settings.php:1056
 msgid "accepting a friend request"
 msgstr ""
 
-#: ../../mod/settings.php:1055
+#: ../../mod/settings.php:1057
 msgid "joining a forum/community"
 msgstr ""
 
-#: ../../mod/settings.php:1056
+#: ../../mod/settings.php:1058
 msgid "making an <em>interesting</em> profile change"
 msgstr ""
 
-#: ../../mod/settings.php:1057
+#: ../../mod/settings.php:1059
 msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../mod/settings.php:1058
+#: ../../mod/settings.php:1060
 msgid "You receive a connection request"
 msgstr ""
 
-#: ../../mod/settings.php:1059
+#: ../../mod/settings.php:1061
 msgid "Your connections are confirmed"
 msgstr ""
 
-#: ../../mod/settings.php:1060
+#: ../../mod/settings.php:1062
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../mod/settings.php:1061
+#: ../../mod/settings.php:1063
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../mod/settings.php:1062
+#: ../../mod/settings.php:1064
 msgid "You receive a private message"
 msgstr ""
 
-#: ../../mod/settings.php:1063
+#: ../../mod/settings.php:1065
 msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../mod/settings.php:1064
+#: ../../mod/settings.php:1066
 msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../mod/settings.php:1065
+#: ../../mod/settings.php:1067
 msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: ../../mod/settings.php:1068
+#: ../../mod/settings.php:1070
 msgid "Show visual notifications including:"
 msgstr ""
 
-#: ../../mod/settings.php:1070
+#: ../../mod/settings.php:1072
 msgid "Unseen matrix activity"
 msgstr ""
 
-#: ../../mod/settings.php:1071
+#: ../../mod/settings.php:1073
 msgid "Unseen channel activity"
 msgstr ""
 
-#: ../../mod/settings.php:1072
+#: ../../mod/settings.php:1074
 msgid "Unseen private messages"
 msgstr ""
 
-#: ../../mod/settings.php:1072 ../../mod/settings.php:1077
-#: ../../mod/settings.php:1078 ../../mod/settings.php:1079
+#: ../../mod/settings.php:1074 ../../mod/settings.php:1079
+#: ../../mod/settings.php:1080 ../../mod/settings.php:1081
 msgid "Recommended"
 msgstr ""
 
-#: ../../mod/settings.php:1073
+#: ../../mod/settings.php:1075
 msgid "Upcoming events"
 msgstr ""
 
-#: ../../mod/settings.php:1074
+#: ../../mod/settings.php:1076
 msgid "Events today"
 msgstr ""
 
-#: ../../mod/settings.php:1075
+#: ../../mod/settings.php:1077
 msgid "Upcoming birthdays"
 msgstr ""
 
-#: ../../mod/settings.php:1075
+#: ../../mod/settings.php:1077
 msgid "Not available in all themes"
 msgstr ""
 
-#: ../../mod/settings.php:1076
+#: ../../mod/settings.php:1078
 msgid "System (personal) notifications"
 msgstr ""
 
-#: ../../mod/settings.php:1077
+#: ../../mod/settings.php:1079
 msgid "System info messages"
 msgstr ""
 
-#: ../../mod/settings.php:1078
+#: ../../mod/settings.php:1080
 msgid "System critical alerts"
 msgstr ""
 
-#: ../../mod/settings.php:1079
+#: ../../mod/settings.php:1081
 msgid "New connections"
 msgstr ""
 
-#: ../../mod/settings.php:1080
+#: ../../mod/settings.php:1082
 msgid "System Registrations"
 msgstr ""
 
-#: ../../mod/settings.php:1082
+#: ../../mod/settings.php:1084
 msgid "Notify me of events this many days in advance"
 msgstr ""
 
-#: ../../mod/settings.php:1082
+#: ../../mod/settings.php:1084
 msgid "Must be greater than 0"
 msgstr ""
 
-#: ../../mod/settings.php:1084
+#: ../../mod/settings.php:1086
 msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1085
+#: ../../mod/settings.php:1087
 msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
-#: ../../mod/settings.php:1088
+#: ../../mod/settings.php:1090
 msgid ""
 "Please enable expert mode (in <a href=\"settings/features\">Settings > "
 "Additional features</a>) to adjust!"
 msgstr ""
 
-#: ../../mod/settings.php:1089
+#: ../../mod/settings.php:1091
 msgid "Miscellaneous Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1091
+#: ../../mod/settings.php:1093
 msgid "Personal menu to display in your channel pages"
 msgstr ""
 
-#: ../../mod/settings.php:1092
+#: ../../mod/settings.php:1094
 msgid "Remove this channel"
 msgstr ""
 
@@ -5024,6 +5033,10 @@ msgstr ""
 msgid "Starting date and Title are required."
 msgstr ""
 
+#: ../../mod/events.php:574
+msgid "Categories (comma-separated list)"
+msgstr ""
+
 #: ../../mod/events.php:576
 msgid "Event Starts:"
 msgstr ""
@@ -5864,7 +5877,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:85 ../../boot.php:1494
+#: ../../mod/lostpass.php:85 ../../boot.php:1537
 msgid "Password Reset"
 msgstr ""
 
@@ -6174,7 +6187,7 @@ msgstr ""
 msgid "This is your default profile."
 msgstr ""
 
-#: ../../mod/profiles.php:694 ../../mod/directory.php:159
+#: ../../mod/profiles.php:694 ../../mod/directory.php:188
 msgid "Age: "
 msgstr ""
 
@@ -6384,16 +6397,16 @@ msgstr ""
 msgid "Executable content type not permitted to this channel."
 msgstr ""
 
-#: ../../mod/item.php:898
+#: ../../mod/item.php:899
 msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/item.php:1373
+#: ../../mod/item.php:1117
 #, php-format
 msgid "You have reached your limit of %1$.0f top level posts."
 msgstr ""
 
-#: ../../mod/item.php:1379
+#: ../../mod/item.php:1123
 #, php-format
 msgid "You have reached your limit of %1$.0f webpages."
 msgstr ""
@@ -7766,47 +7779,47 @@ msgstr ""
 msgid "Post successful."
 msgstr ""
 
-#: ../../mod/directory.php:172
+#: ../../mod/directory.php:201
 msgid "Gender: "
 msgstr ""
 
-#: ../../mod/directory.php:174
+#: ../../mod/directory.php:203
 msgid "Status: "
 msgstr ""
 
-#: ../../mod/directory.php:176
+#: ../../mod/directory.php:205
 msgid "Homepage: "
 msgstr ""
 
-#: ../../mod/directory.php:179
+#: ../../mod/directory.php:208
 msgid "Hometown: "
 msgstr ""
 
-#: ../../mod/directory.php:181
+#: ../../mod/directory.php:210
 msgid "About: "
 msgstr ""
 
-#: ../../mod/directory.php:236
+#: ../../mod/directory.php:265
 msgid "Public Forum:"
 msgstr ""
 
-#: ../../mod/directory.php:239
+#: ../../mod/directory.php:268
 msgid "Keywords: "
 msgstr ""
 
-#: ../../mod/directory.php:279
+#: ../../mod/directory.php:317
 msgid "Finding:"
 msgstr ""
 
-#: ../../mod/directory.php:284
+#: ../../mod/directory.php:322
 msgid "next page"
 msgstr ""
 
-#: ../../mod/directory.php:284
+#: ../../mod/directory.php:322
 msgid "previous page"
 msgstr ""
 
-#: ../../mod/directory.php:301
+#: ../../mod/directory.php:339
 msgid "No entries (some entries may be hidden)."
 msgstr ""
 
@@ -8313,41 +8326,41 @@ msgstr ""
 msgid "Are you a clean desk or a messy desk person?"
 msgstr ""
 
-#: ../../boot.php:1293
+#: ../../boot.php:1336
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:1296
+#: ../../boot.php:1339
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:1463
+#: ../../boot.php:1506
 msgid ""
 "Create an account to access services and applications within the Red Matrix"
 msgstr ""
 
-#: ../../boot.php:1489
+#: ../../boot.php:1532
 msgid "Password"
 msgstr ""
 
-#: ../../boot.php:1490
+#: ../../boot.php:1533
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:1493
+#: ../../boot.php:1536
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:1567
+#: ../../boot.php:1617
 msgid "permission denied"
 msgstr ""
 
-#: ../../boot.php:1568
+#: ../../boot.php:1618
 msgid "Got Zot?"
 msgstr ""
 
-#: ../../boot.php:2030
+#: ../../boot.php:2101
 msgid "toggle mobile"
 msgstr ""