aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--util/messages.po1129
-rw-r--r--version.inc2
2 files changed, 609 insertions, 522 deletions
diff --git a/util/messages.po b/util/messages.po
index 21cc95b0d..892817b74 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 2014-10-31.845\n"
+"Project-Id-Version: 2014-11-07.852\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-31 00:03-0700\n"
+"POT-Creation-Date: 2014-11-07 00:04-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"
@@ -23,7 +23,7 @@ msgid "Cannot locate DNS info for database server '%s'"
msgstr ""
#: ../../include/photo/photo_driver.php:680 ../../include/photos.php:51
-#: ../../mod/photos.php:91 ../../mod/photos.php:645
+#: ../../mod/photos.php:91 ../../mod/photos.php:652
#: ../../mod/profile_photo.php:142 ../../mod/profile_photo.php:301
#: ../../mod/profile_photo.php:423
msgid "Profile Photos"
@@ -42,7 +42,7 @@ msgstr ""
msgid "Address Book"
msgstr ""
-#: ../../include/apps.php:129 ../../include/nav.php:125 ../../boot.php:1496
+#: ../../include/apps.php:129 ../../include/nav.php:125 ../../boot.php:1513
msgid "Login"
msgstr ""
@@ -55,7 +55,7 @@ msgstr ""
msgid "Matrix"
msgstr ""
-#: ../../include/apps.php:132 ../../include/widgets.php:524
+#: ../../include/apps.php:132 ../../include/widgets.php:548
#: ../../include/nav.php:218 ../../mod/admin.php:953 ../../mod/admin.php:1158
msgid "Settings"
msgstr ""
@@ -75,8 +75,8 @@ msgstr ""
msgid "Channel Home"
msgstr ""
-#: ../../include/apps.php:136 ../../include/identity.php:1115
-#: ../../include/identity.php:1233 ../../mod/profperm.php:112
+#: ../../include/apps.php:136 ../../include/identity.php:1120
+#: ../../include/identity.php:1238 ../../mod/profperm.php:112
msgid "Profile"
msgstr ""
@@ -155,7 +155,7 @@ msgid "Profile Photo"
msgstr ""
#: ../../include/apps.php:242 ../../mod/settings.php:81
-#: ../../mod/settings.php:544
+#: ../../mod/settings.php:575
msgid "Update"
msgstr ""
@@ -170,7 +170,7 @@ msgstr ""
#: ../../include/apps.php:249 ../../include/page_widgets.php:8
#: ../../include/page_widgets.php:36 ../../include/RedDAV/RedBrowser.php:250
#: ../../include/menu.php:42 ../../include/ItemObject.php:100
-#: ../../mod/settings.php:580 ../../mod/blocks.php:99
+#: ../../mod/settings.php:611 ../../mod/blocks.php:99
#: ../../mod/connections.php:381 ../../mod/connections.php:394
#: ../../mod/connections.php:413 ../../mod/webpages.php:131
#: ../../mod/editblock.php:111 ../../mod/editlayout.php:106
@@ -181,16 +181,16 @@ msgstr ""
#: ../../include/apps.php:250 ../../include/conversation.php:638
#: ../../include/RedDAV/RedBrowser.php:251 ../../include/ItemObject.php:120
-#: ../../mod/photos.php:1062 ../../mod/settings.php:581
-#: ../../mod/connedit.php:468 ../../mod/group.php:176 ../../mod/admin.php:732
+#: ../../mod/photos.php:1066 ../../mod/settings.php:612
+#: ../../mod/connedit.php:476 ../../mod/group.php:176 ../../mod/admin.php:732
#: ../../mod/admin.php:863 ../../mod/thing.php:234
msgid "Delete"
msgstr ""
#: ../../include/apps.php:331 ../../include/apps.php:382
#: ../../include/conversation.php:1003 ../../include/RedDAV/RedBrowser.php:163
-#: ../../mod/photos.php:703 ../../mod/photos.php:1124
-#: ../../mod/connedit.php:504
+#: ../../mod/photos.php:711 ../../mod/photos.php:1128
+#: ../../mod/connedit.php:512
msgid "Unknown"
msgstr ""
@@ -200,18 +200,18 @@ msgstr ""
#: ../../include/attach.php:318 ../../include/attach.php:511
#: ../../include/attach.php:584 ../../include/chat.php:116
#: ../../include/items.php:4005 ../../include/photos.php:15
-#: ../../mod/mood.php:112 ../../mod/photos.php:68 ../../mod/photos.php:533
-#: ../../mod/mitem.php:73 ../../mod/achievements.php:30
-#: ../../mod/settings.php:495 ../../mod/poke.php:128 ../../mod/api.php:26
-#: ../../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:29 ../../mod/blocks.php:44 ../../mod/profiles.php:179
+#: ../../mod/mood.php:112 ../../mod/photos.php:68 ../../mod/mitem.php:73
+#: ../../mod/achievements.php:30 ../../mod/settings.php:526
+#: ../../mod/poke.php:128 ../../mod/api.php:26 ../../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:29
+#: ../../mod/blocks.php:44 ../../mod/profiles.php:179
#: ../../mod/profiles.php:532 ../../mod/events.php:195
#: ../../mod/channel.php:89 ../../mod/channel.php:193
#: ../../mod/channel.php:236 ../../mod/chat.php:90 ../../mod/chat.php:95
#: ../../mod/register.php:70 ../../mod/regmod.php:17 ../../mod/common.php:35
#: ../../mod/network.php:12 ../../mod/connections.php:169
-#: ../../mod/connedit.php:254 ../../mod/delegate.php:6
+#: ../../mod/connedit.php:266 ../../mod/delegate.php:6
#: ../../mod/webpages.php:40 ../../mod/bookmarks.php:46
#: ../../mod/setup.php:203 ../../mod/editblock.php:34 ../../mod/pdledit.php:21
#: ../../mod/editlayout.php:48 ../../mod/editpost.php:13
@@ -222,15 +222,15 @@ msgstr ""
#: ../../mod/filestorage.php:109 ../../mod/fsuggest.php:78
#: ../../mod/suggest.php:26 ../../mod/group.php:9 ../../mod/like.php:154
#: ../../mod/thing.php:247 ../../mod/thing.php:264 ../../mod/thing.php:299
-#: ../../mod/invite.php:13 ../../mod/invite.php:104 ../../mod/item.php:182
-#: ../../mod/item.php:190 ../../mod/item.php:961 ../../mod/layouts.php:27
-#: ../../mod/layouts.php:39 ../../mod/viewconnections.php:22
-#: ../../mod/viewconnections.php:27 ../../mod/viewsrc.php:14
-#: ../../mod/mail.php:111 ../../mod/manage.php:6 ../../mod/menu.php:44
-#: ../../mod/message.php:16 ../../mod/new_channel.php:68
+#: ../../mod/invite.php:13 ../../mod/invite.php:104 ../../mod/item.php:184
+#: ../../mod/item.php:192 ../../mod/item.php:964 ../../mod/layouts.php:27
+#: ../../mod/layouts.php:39 ../../mod/locs.php:71
+#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
+#: ../../mod/viewsrc.php:14 ../../mod/mail.php:111 ../../mod/manage.php:6
+#: ../../mod/menu.php:44 ../../mod/message.php:16 ../../mod/new_channel.php:68
#: ../../mod/new_channel.php:99 ../../mod/notifications.php:66
#: ../../mod/page.php:28 ../../mod/page.php:78 ../../mod/appman.php:66
-#: ../../mod/service_limits.php:7 ../../index.php:190 ../../index.php:401
+#: ../../mod/service_limits.php:7 ../../index.php:190 ../../index.php:390
msgid "Permission denied."
msgstr ""
@@ -293,7 +293,7 @@ msgid "database storage failed."
msgstr ""
#: ../../include/conversation.php:120 ../../include/text.php:1743
-#: ../../include/diaspora.php:1924 ../../mod/subthread.php:72
+#: ../../include/diaspora.php:1923 ../../mod/subthread.php:72
#: ../../mod/subthread.php:174 ../../mod/tagger.php:45 ../../mod/like.php:298
msgid "photo"
msgstr ""
@@ -308,7 +308,7 @@ msgid "channel"
msgstr ""
#: ../../include/conversation.php:148 ../../include/text.php:1749
-#: ../../include/diaspora.php:1924 ../../mod/subthread.php:72
+#: ../../include/diaspora.php:1923 ../../mod/subthread.php:72
#: ../../mod/subthread.php:174 ../../mod/tagger.php:53 ../../mod/like.php:298
msgid "status"
msgstr ""
@@ -318,7 +318,7 @@ msgstr ""
msgid "comment"
msgstr ""
-#: ../../include/conversation.php:164 ../../include/diaspora.php:1953
+#: ../../include/conversation.php:164 ../../include/diaspora.php:1952
#: ../../mod/like.php:344
#, php-format
msgid "%1$s likes %2$s's %3$s"
@@ -398,7 +398,7 @@ msgid "View in context"
msgstr ""
#: ../../include/conversation.php:719 ../../include/conversation.php:1153
-#: ../../include/ItemObject.php:310 ../../mod/photos.php:970
+#: ../../include/ItemObject.php:310 ../../mod/photos.php:974
#: ../../mod/editblock.php:120 ../../mod/editlayout.php:115
#: ../../mod/editpost.php:121 ../../mod/editwebpage.php:152
#: ../../mod/mail.php:234 ../../mod/mail.php:349
@@ -430,7 +430,7 @@ msgid "View Status"
msgstr ""
#: ../../include/conversation.php:945 ../../include/nav.php:99
-#: ../../mod/connedit.php:421 ../../mod/connedit.php:535
+#: ../../mod/connedit.php:429 ../../mod/connedit.php:544
msgid "View Profile"
msgstr ""
@@ -442,7 +442,7 @@ msgstr ""
msgid "Matrix Activity"
msgstr ""
-#: ../../include/conversation.php:948 ../../include/identity.php:835
+#: ../../include/conversation.php:948 ../../include/identity.php:840
#: ../../include/widgets.php:135 ../../include/widgets.php:175
#: ../../include/Contact.php:107 ../../mod/directory.php:183
#: ../../mod/dirprofile.php:164 ../../mod/suggest.php:51
@@ -538,14 +538,14 @@ msgid "Expires YYYY-MM-DD HH:MM"
msgstr ""
#: ../../include/conversation.php:1114 ../../include/page_widgets.php:40
-#: ../../include/ItemObject.php:608 ../../mod/photos.php:990
+#: ../../include/ItemObject.php:608 ../../mod/photos.php:994
#: ../../mod/webpages.php:135 ../../mod/editblock.php:141
#: ../../mod/editlayout.php:135 ../../mod/editpost.php:140
#: ../../mod/editwebpage.php:174
msgid "Preview"
msgstr ""
-#: ../../include/conversation.php:1128 ../../mod/photos.php:969
+#: ../../include/conversation.php:1128 ../../mod/photos.php:973
#: ../../mod/editblock.php:168 ../../mod/editlayout.php:161
#: ../../mod/editwebpage.php:201 ../../mod/layouts.php:122
msgid "Share"
@@ -675,8 +675,8 @@ msgstr ""
msgid "OK"
msgstr ""
-#: ../../include/conversation.php:1182 ../../mod/settings.php:519
-#: ../../mod/settings.php:545 ../../mod/events.php:568
+#: ../../include/conversation.php:1182 ../../mod/settings.php:550
+#: ../../mod/settings.php:576 ../../mod/events.php:568
#: ../../mod/editpost.php:151 ../../mod/fbrowser.php:82
#: ../../mod/fbrowser.php:117 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
msgid "Cancel"
@@ -832,7 +832,7 @@ msgid "Finishes:"
msgstr ""
#: ../../include/event.php:40 ../../include/bb2diaspora.php:485
-#: ../../include/identity.php:886 ../../mod/events.php:579
+#: ../../include/identity.php:891 ../../mod/events.php:579
#: ../../mod/directory.php:156 ../../mod/dirprofile.php:105
msgid "Location:"
msgstr ""
@@ -1009,10 +1009,110 @@ msgstr ""
msgid "%1$s has an updated %2$s, changing %3$s."
msgstr ""
+#: ../../include/datetime.php:43 ../../include/datetime.php:45
+msgid "Miscellaneous"
+msgstr ""
+
+#: ../../include/datetime.php:241
+msgid "never"
+msgstr ""
+
+#: ../../include/datetime.php:247
+msgid "less than a second ago"
+msgstr ""
+
+#: ../../include/datetime.php:250
+msgid "year"
+msgstr ""
+
+#: ../../include/datetime.php:250
+msgid "years"
+msgstr ""
+
+#: ../../include/datetime.php:251
+msgid "month"
+msgstr ""
+
+#: ../../include/datetime.php:251
+msgid "months"
+msgstr ""
+
+#: ../../include/datetime.php:252
+msgid "week"
+msgstr ""
+
+#: ../../include/datetime.php:252
+msgid "weeks"
+msgstr ""
+
+#: ../../include/datetime.php:253
+msgid "day"
+msgstr ""
+
+#: ../../include/datetime.php:253
+msgid "days"
+msgstr ""
+
+#: ../../include/datetime.php:254
+msgid "hour"
+msgstr ""
+
+#: ../../include/datetime.php:254
+msgid "hours"
+msgstr ""
+
+#: ../../include/datetime.php:255
+msgid "minute"
+msgstr ""
+
+#: ../../include/datetime.php:255
+msgid "minutes"
+msgstr ""
+
+#: ../../include/datetime.php:256
+msgid "second"
+msgstr ""
+
+#: ../../include/datetime.php:256
+msgid "seconds"
+msgstr ""
+
+#: ../../include/datetime.php:265
+#, php-format
+msgid "%1$d %2$s ago"
+msgstr ""
+
+#: ../../include/datetime.php:470
+#, php-format
+msgid "%1$s's birthday"
+msgstr ""
+
+#: ../../include/datetime.php:471
+#, php-format
+msgid "Happy Birthday %1$s"
+msgstr ""
+
#: ../../include/bb2diaspora.php:384
msgid "Attachments:"
msgstr ""
+#: ../../include/bb2diaspora.php:465
+msgid "Redmatrix event notification:"
+msgstr ""
+
+#: ../../include/zot.php:661
+msgid "Invalid data packet"
+msgstr ""
+
+#: ../../include/zot.php:677
+msgid "Unable to verify channel signature"
+msgstr ""
+
+#: ../../include/zot.php:1791
+#, php-format
+msgid "Unable to verify site signature for %s"
+msgstr ""
+
#: ../../include/auth.php:116
msgid "Logged out."
msgstr ""
@@ -1064,8 +1164,8 @@ msgstr ""
msgid "%1$s used of %2$s (%3$s&#37;)"
msgstr ""
-#: ../../include/RedDAV/RedBrowser.php:245 ../../mod/settings.php:520
-#: ../../mod/settings.php:546 ../../mod/admin.php:868
+#: ../../include/RedDAV/RedBrowser.php:245 ../../mod/settings.php:551
+#: ../../mod/settings.php:577 ../../mod/admin.php:868
msgid "Name"
msgstr ""
@@ -1098,8 +1198,8 @@ msgstr ""
msgid "Upload file"
msgstr ""
-#: ../../include/RedDAV/RedBrowser.php:308 ../../mod/photos.php:728
-#: ../../mod/photos.php:1237 ../../mod/profile_photo.php:361
+#: ../../include/RedDAV/RedBrowser.php:308 ../../mod/photos.php:736
+#: ../../mod/photos.php:1241 ../../mod/profile_photo.php:361
msgid "Upload"
msgstr ""
@@ -1149,7 +1249,7 @@ msgid "RSS/Atom"
msgstr ""
#: ../../include/contact_selectors.php:79 ../../mod/admin.php:728
-#: ../../mod/admin.php:737 ../../boot.php:1498
+#: ../../mod/admin.php:737 ../../boot.php:1515
msgid "Email"
msgstr ""
@@ -1239,7 +1339,8 @@ msgstr ""
msgid "Everything"
msgstr ""
-#: ../../include/contact_widgets.php:93 ../../include/widgets.php:29
+#: ../../include/contact_widgets.php:93 ../../include/taxonomy.php:230
+#: ../../include/widgets.php:29
msgid "Categories"
msgstr ""
@@ -1402,44 +1503,44 @@ msgstr ""
msgid "Tags"
msgstr ""
-#: ../../include/taxonomy.php:227
+#: ../../include/taxonomy.php:249
msgid "Keywords"
msgstr ""
-#: ../../include/taxonomy.php:252
+#: ../../include/taxonomy.php:274
msgid "have"
msgstr ""
-#: ../../include/taxonomy.php:252
+#: ../../include/taxonomy.php:274
msgid "has"
msgstr ""
-#: ../../include/taxonomy.php:253
+#: ../../include/taxonomy.php:275
msgid "want"
msgstr ""
-#: ../../include/taxonomy.php:253
+#: ../../include/taxonomy.php:275
msgid "wants"
msgstr ""
-#: ../../include/taxonomy.php:254 ../../include/ItemObject.php:221
+#: ../../include/taxonomy.php:276 ../../include/ItemObject.php:221
msgid "like"
msgstr ""
-#: ../../include/taxonomy.php:254
+#: ../../include/taxonomy.php:276
msgid "likes"
msgstr ""
-#: ../../include/taxonomy.php:255 ../../include/ItemObject.php:222
+#: ../../include/taxonomy.php:277 ../../include/ItemObject.php:222
msgid "dislike"
msgstr ""
-#: ../../include/taxonomy.php:255
+#: ../../include/taxonomy.php:277
msgid "dislikes"
msgstr ""
-#: ../../include/taxonomy.php:338 ../../include/identity.php:1141
-#: ../../include/ItemObject.php:146 ../../mod/photos.php:1019
+#: ../../include/taxonomy.php:360 ../../include/identity.php:1146
+#: ../../include/ItemObject.php:146 ../../mod/photos.php:1023
msgctxt "noun"
msgid "Like"
msgid_plural "Likes"
@@ -1663,7 +1764,7 @@ msgstr ""
#: ../../include/items.php:377 ../../mod/profperm.php:23
#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/like.php:246
-#: ../../index.php:400
+#: ../../index.php:389
msgid "Permission denied"
msgstr ""
@@ -1711,25 +1812,25 @@ msgstr ""
msgid "Item not found."
msgstr ""
-#: ../../include/items.php:4391 ../../mod/group.php:38 ../../mod/group.php:140
+#: ../../include/items.php:4394 ../../mod/group.php:38 ../../mod/group.php:140
msgid "Collection not found."
msgstr ""
-#: ../../include/items.php:4406
+#: ../../include/items.php:4409
msgid "Collection is empty."
msgstr ""
-#: ../../include/items.php:4413
+#: ../../include/items.php:4416
#, php-format
msgid "Collection: %s"
msgstr ""
-#: ../../include/items.php:4424
+#: ../../include/items.php:4427
#, php-format
msgid "Connection: %s"
msgstr ""
-#: ../../include/items.php:4427
+#: ../../include/items.php:4430
msgid "Connection not found."
msgstr ""
@@ -2155,7 +2256,7 @@ msgstr ""
msgid "Allow previewing posts and comments before publishing them"
msgstr ""
-#: ../../include/features.php:49 ../../include/widgets.php:513
+#: ../../include/features.php:49 ../../include/widgets.php:537
#: ../../mod/sources.php:88
msgid "Channel Sources"
msgstr ""
@@ -2297,27 +2398,27 @@ msgstr ""
msgid "Channel location missing."
msgstr ""
-#: ../../include/follow.php:86
+#: ../../include/follow.php:82
msgid "Response from remote channel was incomplete."
msgstr ""
-#: ../../include/follow.php:103
+#: ../../include/follow.php:99
msgid "Channel was deleted and no longer exists."
msgstr ""
-#: ../../include/follow.php:139 ../../include/follow.php:208
+#: ../../include/follow.php:135 ../../include/follow.php:202
msgid "Protocol disabled."
msgstr ""
-#: ../../include/follow.php:182
+#: ../../include/follow.php:176
msgid "Channel discovery failed."
msgstr ""
-#: ../../include/follow.php:198
+#: ../../include/follow.php:192
msgid "local account not found."
msgstr ""
-#: ../../include/follow.php:225
+#: ../../include/follow.php:220
msgid "Cannot connect to yourself."
msgstr ""
@@ -2360,7 +2461,7 @@ msgstr ""
msgid "add"
msgstr ""
-#: ../../include/identity.php:31 ../../mod/item.php:1358
+#: ../../include/identity.php:31 ../../mod/item.php:1361
msgid "Unable to obtain identity information from database"
msgstr ""
@@ -2397,214 +2498,214 @@ msgstr ""
msgid "Default Profile"
msgstr ""
-#: ../../include/identity.php:382 ../../include/identity.php:383
-#: ../../include/identity.php:390 ../../include/widgets.php:407
+#: ../../include/identity.php:387 ../../include/identity.php:388
+#: ../../include/identity.php:395 ../../include/widgets.php:431
#: ../../include/profile_selectors.php:80 ../../mod/settings.php:304
#: ../../mod/settings.php:308 ../../mod/settings.php:309
#: ../../mod/settings.php:312 ../../mod/settings.php:323
-#: ../../mod/connedit.php:501
+#: ../../mod/connedit.php:509
msgid "Friends"
msgstr ""
-#: ../../include/identity.php:638
+#: ../../include/identity.php:643
msgid "Requested channel is not available."
msgstr ""
-#: ../../include/identity.php:686 ../../mod/achievements.php:11
+#: ../../include/identity.php:691 ../../mod/achievements.php:11
#: ../../mod/profile.php:16 ../../mod/blocks.php:10 ../../mod/connect.php:13
#: ../../mod/webpages.php:8 ../../mod/filestorage.php:48
#: ../../mod/layouts.php:8 ../../mod/hcard.php:8
msgid "Requested profile is not available."
msgstr ""
-#: ../../include/identity.php:849 ../../mod/profiles.php:722
+#: ../../include/identity.php:854 ../../mod/profiles.php:722
msgid "Change profile photo"
msgstr ""
-#: ../../include/identity.php:855
+#: ../../include/identity.php:860
msgid "Profiles"
msgstr ""
-#: ../../include/identity.php:855
+#: ../../include/identity.php:860
msgid "Manage/edit profiles"
msgstr ""
-#: ../../include/identity.php:856 ../../mod/profiles.php:723
+#: ../../include/identity.php:861 ../../mod/profiles.php:723
msgid "Create New Profile"
msgstr ""
-#: ../../include/identity.php:859 ../../include/nav.php:103
+#: ../../include/identity.php:864 ../../include/nav.php:103
msgid "Edit Profile"
msgstr ""
-#: ../../include/identity.php:870 ../../mod/profiles.php:734
+#: ../../include/identity.php:875 ../../mod/profiles.php:734
msgid "Profile Image"
msgstr ""
-#: ../../include/identity.php:873
+#: ../../include/identity.php:878
msgid "visible to everybody"
msgstr ""
-#: ../../include/identity.php:874 ../../mod/profiles.php:617
+#: ../../include/identity.php:879 ../../mod/profiles.php:617
#: ../../mod/profiles.php:738
msgid "Edit visibility"
msgstr ""
-#: ../../include/identity.php:888 ../../include/identity.php:1125
+#: ../../include/identity.php:893 ../../include/identity.php:1130
#: ../../mod/directory.php:158
msgid "Gender:"
msgstr ""
-#: ../../include/identity.php:889 ../../include/identity.php:1169
+#: ../../include/identity.php:894 ../../include/identity.php:1174
#: ../../mod/directory.php:160
msgid "Status:"
msgstr ""
-#: ../../include/identity.php:890 ../../include/identity.php:1180
+#: ../../include/identity.php:895 ../../include/identity.php:1185
#: ../../mod/directory.php:162
msgid "Homepage:"
msgstr ""
-#: ../../include/identity.php:891 ../../mod/dirprofile.php:151
+#: ../../include/identity.php:896 ../../mod/dirprofile.php:151
msgid "Online Now"
msgstr ""
-#: ../../include/identity.php:969 ../../include/identity.php:1049
-#: ../../mod/ping.php:298
+#: ../../include/identity.php:974 ../../include/identity.php:1054
+#: ../../mod/ping.php:316
msgid "g A l F d"
msgstr ""
-#: ../../include/identity.php:970 ../../include/identity.php:1050
+#: ../../include/identity.php:975 ../../include/identity.php:1055
msgid "F d"
msgstr ""
-#: ../../include/identity.php:1015 ../../include/identity.php:1090
-#: ../../mod/ping.php:320
+#: ../../include/identity.php:1020 ../../include/identity.php:1095
+#: ../../mod/ping.php:338
msgid "[today]"
msgstr ""
-#: ../../include/identity.php:1027
+#: ../../include/identity.php:1032
msgid "Birthday Reminders"
msgstr ""
-#: ../../include/identity.php:1028
+#: ../../include/identity.php:1033
msgid "Birthdays this week:"
msgstr ""
-#: ../../include/identity.php:1083
+#: ../../include/identity.php:1088
msgid "[No description]"
msgstr ""
-#: ../../include/identity.php:1101
+#: ../../include/identity.php:1106
msgid "Event Reminders"
msgstr ""
-#: ../../include/identity.php:1102
+#: ../../include/identity.php:1107
msgid "Events this week:"
msgstr ""
-#: ../../include/identity.php:1123 ../../mod/settings.php:947
+#: ../../include/identity.php:1128 ../../mod/settings.php:984
msgid "Full Name:"
msgstr ""
-#: ../../include/identity.php:1130
+#: ../../include/identity.php:1135
msgid "Like this channel"
msgstr ""
-#: ../../include/identity.php:1154
+#: ../../include/identity.php:1159
msgid "j F, Y"
msgstr ""
-#: ../../include/identity.php:1155
+#: ../../include/identity.php:1160
msgid "j F"
msgstr ""
-#: ../../include/identity.php:1162
+#: ../../include/identity.php:1167
msgid "Birthday:"
msgstr ""
-#: ../../include/identity.php:1166
+#: ../../include/identity.php:1171
msgid "Age:"
msgstr ""
-#: ../../include/identity.php:1175
+#: ../../include/identity.php:1180
#, php-format
msgid "for %1$d %2$s"
msgstr ""
-#: ../../include/identity.php:1178 ../../mod/profiles.php:639
+#: ../../include/identity.php:1183 ../../mod/profiles.php:639
msgid "Sexual Preference:"
msgstr ""
-#: ../../include/identity.php:1182 ../../mod/profiles.php:641
+#: ../../include/identity.php:1187 ../../mod/profiles.php:641
msgid "Hometown:"
msgstr ""
-#: ../../include/identity.php:1184
+#: ../../include/identity.php:1189
msgid "Tags:"
msgstr ""
-#: ../../include/identity.php:1186 ../../mod/profiles.php:642
+#: ../../include/identity.php:1191 ../../mod/profiles.php:642
msgid "Political Views:"
msgstr ""
-#: ../../include/identity.php:1188
+#: ../../include/identity.php:1193
msgid "Religion:"
msgstr ""
-#: ../../include/identity.php:1190 ../../mod/directory.php:164
+#: ../../include/identity.php:1195 ../../mod/directory.php:164
msgid "About:"
msgstr ""
-#: ../../include/identity.php:1192
+#: ../../include/identity.php:1197
msgid "Hobbies/Interests:"
msgstr ""
-#: ../../include/identity.php:1194 ../../mod/profiles.php:645
+#: ../../include/identity.php:1199 ../../mod/profiles.php:645
msgid "Likes:"
msgstr ""
-#: ../../include/identity.php:1196 ../../mod/profiles.php:646
+#: ../../include/identity.php:1201 ../../mod/profiles.php:646
msgid "Dislikes:"
msgstr ""
-#: ../../include/identity.php:1199
+#: ../../include/identity.php:1204
msgid "Contact information and Social Networks:"
msgstr ""
-#: ../../include/identity.php:1201
+#: ../../include/identity.php:1206
msgid "My other channels:"
msgstr ""
-#: ../../include/identity.php:1203
+#: ../../include/identity.php:1208
msgid "Musical interests:"
msgstr ""
-#: ../../include/identity.php:1205
+#: ../../include/identity.php:1210
msgid "Books, literature:"
msgstr ""
-#: ../../include/identity.php:1207
+#: ../../include/identity.php:1212
msgid "Television:"
msgstr ""
-#: ../../include/identity.php:1209
+#: ../../include/identity.php:1214
msgid "Film/dance/culture/entertainment:"
msgstr ""
-#: ../../include/identity.php:1211
+#: ../../include/identity.php:1216
msgid "Love/Romance:"
msgstr ""
-#: ../../include/identity.php:1213
+#: ../../include/identity.php:1218
msgid "Work/employment:"
msgstr ""
-#: ../../include/identity.php:1215
+#: ../../include/identity.php:1220
msgid "School/education:"
msgstr ""
-#: ../../include/identity.php:1235
+#: ../../include/identity.php:1240
msgid "Like this thing"
msgstr ""
@@ -2662,100 +2763,100 @@ msgstr ""
msgid "Remove term"
msgstr ""
-#: ../../include/widgets.php:342
+#: ../../include/widgets.php:352
msgid "Archives"
msgstr ""
-#: ../../include/widgets.php:404
+#: ../../include/widgets.php:428
msgid "Refresh"
msgstr ""
-#: ../../include/widgets.php:405 ../../mod/connedit.php:498
+#: ../../include/widgets.php:429 ../../mod/connedit.php:506
msgid "Me"
msgstr ""
-#: ../../include/widgets.php:406 ../../mod/connedit.php:500
+#: ../../include/widgets.php:430 ../../mod/connedit.php:508
msgid "Best Friends"
msgstr ""
-#: ../../include/widgets.php:408
+#: ../../include/widgets.php:432
msgid "Co-workers"
msgstr ""
-#: ../../include/widgets.php:409 ../../mod/connedit.php:502
+#: ../../include/widgets.php:433 ../../mod/connedit.php:510
msgid "Former Friends"
msgstr ""
-#: ../../include/widgets.php:410 ../../mod/connedit.php:503
+#: ../../include/widgets.php:434 ../../mod/connedit.php:511
msgid "Acquaintances"
msgstr ""
-#: ../../include/widgets.php:411
+#: ../../include/widgets.php:435
msgid "Everybody"
msgstr ""
-#: ../../include/widgets.php:445
+#: ../../include/widgets.php:469
msgid "Account settings"
msgstr ""
-#: ../../include/widgets.php:451
+#: ../../include/widgets.php:475
msgid "Channel settings"
msgstr ""
-#: ../../include/widgets.php:457
+#: ../../include/widgets.php:481
msgid "Additional features"
msgstr ""
-#: ../../include/widgets.php:463
+#: ../../include/widgets.php:487
msgid "Feature settings"
msgstr ""
-#: ../../include/widgets.php:469
+#: ../../include/widgets.php:493
msgid "Display settings"
msgstr ""
-#: ../../include/widgets.php:475
+#: ../../include/widgets.php:499
msgid "Connected apps"
msgstr ""
-#: ../../include/widgets.php:481
+#: ../../include/widgets.php:505
msgid "Export channel"
msgstr ""
-#: ../../include/widgets.php:487
+#: ../../include/widgets.php:511
msgid "Export content"
msgstr ""
-#: ../../include/widgets.php:496
-msgid "Automatic Permissions (Advanced)"
+#: ../../include/widgets.php:520 ../../mod/connedit.php:538
+msgid "Connection Default Permissions"
msgstr ""
-#: ../../include/widgets.php:504
+#: ../../include/widgets.php:528
msgid "Premium Channel Settings"
msgstr ""
-#: ../../include/widgets.php:538 ../../mod/mail.php:124
+#: ../../include/widgets.php:562 ../../mod/mail.php:124
#: ../../mod/message.php:31
msgid "Messages"
msgstr ""
-#: ../../include/widgets.php:543
+#: ../../include/widgets.php:567
msgid "Check Mail"
msgstr ""
-#: ../../include/widgets.php:548 ../../include/nav.php:209
+#: ../../include/widgets.php:572 ../../include/nav.php:209
msgid "New Message"
msgstr ""
-#: ../../include/widgets.php:624
+#: ../../include/widgets.php:648
msgid "Chat Rooms"
msgstr ""
-#: ../../include/widgets.php:642
+#: ../../include/widgets.php:666
msgid "Bookmarked Chatrooms"
msgstr ""
-#: ../../include/widgets.php:660
+#: ../../include/widgets.php:684
msgid "Suggested Chatrooms"
msgstr ""
@@ -2772,89 +2873,6 @@ msgstr ""
msgid "User '%s' deleted"
msgstr ""
-#: ../../include/datetime.php:43 ../../include/datetime.php:45
-msgid "Miscellaneous"
-msgstr ""
-
-#: ../../include/datetime.php:238
-msgid "never"
-msgstr ""
-
-#: ../../include/datetime.php:244
-msgid "less than a second ago"
-msgstr ""
-
-#: ../../include/datetime.php:247
-msgid "year"
-msgstr ""
-
-#: ../../include/datetime.php:247
-msgid "years"
-msgstr ""
-
-#: ../../include/datetime.php:248
-msgid "month"
-msgstr ""
-
-#: ../../include/datetime.php:248
-msgid "months"
-msgstr ""
-
-#: ../../include/datetime.php:249
-msgid "week"
-msgstr ""
-
-#: ../../include/datetime.php:249
-msgid "weeks"
-msgstr ""
-
-#: ../../include/datetime.php:250
-msgid "day"
-msgstr ""
-
-#: ../../include/datetime.php:250
-msgid "days"
-msgstr ""
-
-#: ../../include/datetime.php:251
-msgid "hour"
-msgstr ""
-
-#: ../../include/datetime.php:251
-msgid "hours"
-msgstr ""
-
-#: ../../include/datetime.php:252
-msgid "minute"
-msgstr ""
-
-#: ../../include/datetime.php:252
-msgid "minutes"
-msgstr ""
-
-#: ../../include/datetime.php:253
-msgid "second"
-msgstr ""
-
-#: ../../include/datetime.php:253
-msgid "seconds"
-msgstr ""
-
-#: ../../include/datetime.php:262
-#, php-format
-msgid "%1$d %2$s ago"
-msgstr ""
-
-#: ../../include/datetime.php:467
-#, php-format
-msgid "%1$s's birthday"
-msgstr ""
-
-#: ../../include/datetime.php:468
-#, php-format
-msgid "Happy Birthday %1$s"
-msgstr ""
-
#: ../../include/message.php:18
msgid "No recipient provided."
msgstr ""
@@ -2871,7 +2889,7 @@ msgstr ""
msgid "Stored post could not be verified."
msgstr ""
-#: ../../include/nav.php:95 ../../include/nav.php:128 ../../boot.php:1495
+#: ../../include/nav.php:95 ../../include/nav.php:128 ../../boot.php:1512
msgid "Logout"
msgstr ""
@@ -2944,7 +2962,7 @@ msgstr ""
msgid "Home Page"
msgstr ""
-#: ../../include/nav.php:163 ../../mod/register.php:220 ../../boot.php:1472
+#: ../../include/nav.php:163 ../../mod/register.php:220 ../../boot.php:1489
msgid "Register"
msgstr ""
@@ -3060,19 +3078,6 @@ msgstr ""
msgid "view full size"
msgstr ""
-#: ../../include/zot.php:661
-msgid "Invalid data packet"
-msgstr ""
-
-#: ../../include/zot.php:677
-msgid "Unable to verify channel signature"
-msgstr ""
-
-#: ../../include/zot.php:1776
-#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr ""
-
#: ../../include/acl_selectors.php:240
msgid "Visible to your default audience"
msgstr ""
@@ -3085,14 +3090,14 @@ msgstr ""
msgid "Don't show"
msgstr ""
-#: ../../include/acl_selectors.php:248 ../../mod/photos.php:591
-#: ../../mod/photos.php:945 ../../mod/events.php:585 ../../mod/chat.php:209
+#: ../../include/acl_selectors.php:248 ../../mod/photos.php:589
+#: ../../mod/photos.php:948 ../../mod/events.php:585 ../../mod/chat.php:209
#: ../../mod/filestorage.php:137
msgid "Permissions"
msgstr ""
#: ../../include/acl_selectors.php:249 ../../include/ItemObject.php:305
-#: ../../mod/photos.php:1141
+#: ../../mod/photos.php:1145
msgid "Close"
msgstr ""
@@ -3126,7 +3131,7 @@ msgid "Delete this item?"
msgstr ""
#: ../../include/js_strings.php:6 ../../include/ItemObject.php:598
-#: ../../mod/photos.php:988 ../../mod/photos.php:1098
+#: ../../mod/photos.php:992 ../../mod/photos.php:1102
msgid "Comment"
msgstr ""
@@ -3492,11 +3497,11 @@ msgid "Save to Folder"
msgstr ""
#: ../../include/ItemObject.php:142 ../../include/ItemObject.php:154
-#: ../../mod/photos.php:1015 ../../mod/photos.php:1027
+#: ../../mod/photos.php:1019 ../../mod/photos.php:1031
msgid "View all"
msgstr ""
-#: ../../include/ItemObject.php:151 ../../mod/photos.php:1024
+#: ../../include/ItemObject.php:151 ../../mod/photos.php:1028
msgctxt "noun"
msgid "Dislike"
msgid_plural "Dislikes"
@@ -3523,11 +3528,11 @@ msgstr ""
msgid "Add Tag"
msgstr ""
-#: ../../include/ItemObject.php:221 ../../mod/photos.php:967
+#: ../../include/ItemObject.php:221 ../../mod/photos.php:971
msgid "I like this (toggle)"
msgstr ""
-#: ../../include/ItemObject.php:222 ../../mod/photos.php:968
+#: ../../include/ItemObject.php:222 ../../mod/photos.php:972
msgid "I don't like this (toggle)"
msgstr ""
@@ -3568,12 +3573,12 @@ msgstr ""
msgid "Add to Calendar"
msgstr ""
-#: ../../include/ItemObject.php:299 ../../mod/photos.php:1135
+#: ../../include/ItemObject.php:299 ../../mod/photos.php:1139
msgctxt "noun"
msgid "Likes"
msgstr ""
-#: ../../include/ItemObject.php:300 ../../mod/photos.php:1136
+#: ../../include/ItemObject.php:300 ../../mod/photos.php:1140
msgctxt "noun"
msgid "Dislikes"
msgstr ""
@@ -3585,28 +3590,28 @@ msgid_plural "%d comments"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/ItemObject.php:596 ../../mod/photos.php:986
-#: ../../mod/photos.php:1096
+#: ../../include/ItemObject.php:596 ../../mod/photos.php:990
+#: ../../mod/photos.php:1100
msgid "This is you"
msgstr ""
#: ../../include/ItemObject.php:599 ../../mod/mood.php:135
-#: ../../mod/photos.php:547 ../../mod/photos.php:661 ../../mod/photos.php:949
-#: ../../mod/photos.php:989 ../../mod/photos.php:1099
-#: ../../mod/settings.php:518 ../../mod/settings.php:630
-#: ../../mod/settings.php:659 ../../mod/settings.php:683
-#: ../../mod/settings.php:759 ../../mod/settings.php:939
+#: ../../mod/photos.php:595 ../../mod/photos.php:669 ../../mod/photos.php:953
+#: ../../mod/photos.php:993 ../../mod/photos.php:1103
+#: ../../mod/settings.php:549 ../../mod/settings.php:661
+#: ../../mod/settings.php:690 ../../mod/settings.php:714
+#: ../../mod/settings.php:790 ../../mod/settings.php:976
#: ../../mod/poke.php:166 ../../mod/profiles.php:615 ../../mod/events.php:587
#: ../../mod/chat.php:177 ../../mod/chat.php:211 ../../mod/connect.php:92
-#: ../../mod/connedit.php:546 ../../mod/setup.php:307 ../../mod/setup.php:350
+#: ../../mod/connedit.php:555 ../../mod/setup.php:307 ../../mod/setup.php:350
#: ../../mod/pdledit.php:58 ../../mod/sources.php:104
#: ../../mod/sources.php:138 ../../mod/filestorage.php:146
#: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/admin.php:414
#: ../../mod/admin.php:725 ../../mod/admin.php:861 ../../mod/admin.php:994
#: ../../mod/admin.php:1193 ../../mod/admin.php:1280 ../../mod/thing.php:284
#: ../../mod/thing.php:327 ../../mod/import.php:480 ../../mod/invite.php:142
-#: ../../mod/mail.php:348 ../../mod/appman.php:99 ../../mod/poll.php:68
-#: ../../view/theme/apw/php/config.php:256
+#: ../../mod/locs.php:99 ../../mod/mail.php:348 ../../mod/appman.php:99
+#: ../../mod/poll.php:68 ../../view/theme/apw/php/config.php:256
#: ../../view/theme/blogga/php/config.php:67
#: ../../view/theme/blogga/view/theme/blog/config.php:67
#: ../../view/theme/redbasic/php/config.php:99
@@ -3657,84 +3662,84 @@ msgstr ""
msgid "Album not found."
msgstr ""
-#: ../../mod/photos.php:119 ../../mod/photos.php:662
+#: ../../mod/photos.php:119 ../../mod/photos.php:670
msgid "Delete Album"
msgstr ""
-#: ../../mod/photos.php:159 ../../mod/photos.php:950
+#: ../../mod/photos.php:159 ../../mod/photos.php:954
msgid "Delete Photo"
msgstr ""
-#: ../../mod/photos.php:451 ../../mod/search.php:13 ../../mod/directory.php:15
+#: ../../mod/photos.php:459 ../../mod/search.php:13 ../../mod/directory.php:15
#: ../../mod/dirprofile.php:9 ../../mod/display.php:9
#: ../../mod/viewconnections.php:17
msgid "Public access denied."
msgstr ""
-#: ../../mod/photos.php:461
+#: ../../mod/photos.php:470
msgid "No photos selected"
msgstr ""
-#: ../../mod/photos.php:507
+#: ../../mod/photos.php:514
msgid "Access to this item is restricted."
msgstr ""
-#: ../../mod/photos.php:558
+#: ../../mod/photos.php:553
#, php-format
msgid "%1$.2f MB of %2$.2f MB photo storage used."
msgstr ""
-#: ../../mod/photos.php:561
+#: ../../mod/photos.php:556
#, php-format
msgid "%1$.2f MB photo storage used."
msgstr ""
-#: ../../mod/photos.php:583
+#: ../../mod/photos.php:580
msgid "Upload Photos"
msgstr ""
-#: ../../mod/photos.php:587
-msgid "Enter a new album name or select an existing one:"
+#: ../../mod/photos.php:584 ../../mod/photos.php:663 ../../mod/photos.php:941
+msgid "Enter a new album name"
+msgstr ""
+
+#: ../../mod/photos.php:585 ../../mod/photos.php:664 ../../mod/photos.php:942
+msgid "or select an existing one (doubleclick)"
msgstr ""
-#: ../../mod/photos.php:588
+#: ../../mod/photos.php:586
msgid "Do not show a status post for this upload"
msgstr ""
-#: ../../mod/photos.php:609
+#: ../../mod/photos.php:614
msgid "Album name could not be decoded"
msgstr ""
-#: ../../mod/photos.php:645 ../../mod/photos.php:1159
-#: ../../mod/photos.php:1174
+#: ../../mod/photos.php:652 ../../mod/photos.php:1163
+#: ../../mod/photos.php:1178
msgid "Contact Photos"
msgstr ""
-#: ../../mod/photos.php:656
-msgid "New album name: "
-msgstr ""
-
-#: ../../mod/photos.php:668
+#: ../../mod/photos.php:676
msgid "Show Newest First"
msgstr ""
-#: ../../mod/photos.php:670
+#: ../../mod/photos.php:678
msgid "Show Oldest First"
msgstr ""
-#: ../../mod/photos.php:697 ../../mod/photos.php:1206
+#: ../../mod/photos.php:705 ../../mod/photos.php:1210
msgid "View Photo"
msgstr ""
-#: ../../mod/photos.php:726
+#: ../../mod/photos.php:734
msgid "Edit Album"
msgstr ""
-#: ../../mod/photos.php:777
+#: ../../mod/photos.php:779
msgid "Permission denied. Access to this item may be restricted."
msgstr ""
-#: ../../mod/photos.php:779
+#: ../../mod/photos.php:781
msgid "Photo not available"
msgstr ""
@@ -3762,43 +3767,43 @@ msgstr ""
msgid "Remove"
msgstr ""
-#: ../../mod/photos.php:933
+#: ../../mod/photos.php:935
msgid "Edit photo"
msgstr ""
-#: ../../mod/photos.php:935
+#: ../../mod/photos.php:937
msgid "Rotate CW (right)"
msgstr ""
-#: ../../mod/photos.php:936
+#: ../../mod/photos.php:938
msgid "Rotate CCW (left)"
msgstr ""
-#: ../../mod/photos.php:939
-msgid "New album name"
-msgstr ""
-
-#: ../../mod/photos.php:942
+#: ../../mod/photos.php:945
msgid "Caption"
msgstr ""
-#: ../../mod/photos.php:944
+#: ../../mod/photos.php:947
msgid "Add a Tag"
msgstr ""
-#: ../../mod/photos.php:947
+#: ../../mod/photos.php:950
msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
msgstr ""
-#: ../../mod/photos.php:1125
+#: ../../mod/photos.php:952
+msgid "Flag as adult in album view"
+msgstr ""
+
+#: ../../mod/photos.php:1129
msgid "In This Photo:"
msgstr ""
-#: ../../mod/photos.php:1212
+#: ../../mod/photos.php:1216
msgid "View Album"
msgstr ""
-#: ../../mod/photos.php:1235
+#: ../../mod/photos.php:1239
msgid "Recent Photos"
msgstr ""
@@ -3871,7 +3876,7 @@ msgstr ""
msgid "Menu Item Permissions"
msgstr ""
-#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:974
+#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:1011
msgid "(click to open/close)"
msgstr ""
@@ -3923,15 +3928,15 @@ msgstr ""
msgid "Some blurb about what to do when you're new here"
msgstr ""
-#: ../../mod/ping.php:237
+#: ../../mod/ping.php:255
msgid "sent you a private message"
msgstr ""
-#: ../../mod/ping.php:288
+#: ../../mod/ping.php:306
msgid "added your channel"
msgstr ""
-#: ../../mod/ping.php:329
+#: ../../mod/ping.php:347
msgid "posted an event"
msgstr ""
@@ -3975,438 +3980,503 @@ msgstr ""
msgid "System failure storing new email. Please try again."
msgstr ""
-#: ../../mod/settings.php:448
+#: ../../mod/settings.php:479
msgid "Settings updated."
msgstr ""
-#: ../../mod/settings.php:517 ../../mod/settings.php:543
-#: ../../mod/settings.php:579
+#: ../../mod/settings.php:548 ../../mod/settings.php:574
+#: ../../mod/settings.php:610
msgid "Add application"
msgstr ""
-#: ../../mod/settings.php:520
+#: ../../mod/settings.php:551
msgid "Name of application"
msgstr ""
-#: ../../mod/settings.php:521 ../../mod/settings.php:547
+#: ../../mod/settings.php:552 ../../mod/settings.php:578
msgid "Consumer Key"
msgstr ""
-#: ../../mod/settings.php:521 ../../mod/settings.php:522
+#: ../../mod/settings.php:552 ../../mod/settings.php:553
msgid "Automatically generated - change if desired. Max length 20"
msgstr ""
-#: ../../mod/settings.php:522 ../../mod/settings.php:548
+#: ../../mod/settings.php:553 ../../mod/settings.php:579
msgid "Consumer Secret"
msgstr ""
-#: ../../mod/settings.php:523 ../../mod/settings.php:549
+#: ../../mod/settings.php:554 ../../mod/settings.php:580
msgid "Redirect"
msgstr ""
-#: ../../mod/settings.php:523
+#: ../../mod/settings.php:554
msgid ""
"Redirect URI - leave blank unless your application specifically requires this"
msgstr ""
-#: ../../mod/settings.php:524 ../../mod/settings.php:550
+#: ../../mod/settings.php:555 ../../mod/settings.php:581
msgid "Icon url"
msgstr ""
-#: ../../mod/settings.php:524
+#: ../../mod/settings.php:555
msgid "Optional"
msgstr ""
-#: ../../mod/settings.php:535
+#: ../../mod/settings.php:566
msgid "You can't edit this application."
msgstr ""
-#: ../../mod/settings.php:578
+#: ../../mod/settings.php:609
msgid "Connected Apps"
msgstr ""
-#: ../../mod/settings.php:582
+#: ../../mod/settings.php:613
msgid "Client key starts with"
msgstr ""
-#: ../../mod/settings.php:583
+#: ../../mod/settings.php:614
msgid "No name"
msgstr ""
-#: ../../mod/settings.php:584
+#: ../../mod/settings.php:615
msgid "Remove authorization"
msgstr ""
-#: ../../mod/settings.php:595
+#: ../../mod/settings.php:626
msgid "No feature settings configured"
msgstr ""
-#: ../../mod/settings.php:603
+#: ../../mod/settings.php:634
msgid "Feature Settings"
msgstr ""
-#: ../../mod/settings.php:626
+#: ../../mod/settings.php:657
msgid "Account Settings"
msgstr ""
-#: ../../mod/settings.php:627
+#: ../../mod/settings.php:658
msgid "Password Settings"
msgstr ""
-#: ../../mod/settings.php:628
+#: ../../mod/settings.php:659
msgid "New Password:"
msgstr ""
-#: ../../mod/settings.php:629
+#: ../../mod/settings.php:660
msgid "Confirm:"
msgstr ""
-#: ../../mod/settings.php:629
+#: ../../mod/settings.php:660
msgid "Leave password fields blank unless changing"
msgstr ""
-#: ../../mod/settings.php:631 ../../mod/settings.php:948
+#: ../../mod/settings.php:662 ../../mod/settings.php:985
msgid "Email Address:"
msgstr ""
-#: ../../mod/settings.php:632 ../../mod/removeaccount.php:61
+#: ../../mod/settings.php:663 ../../mod/removeaccount.php:61
msgid "Remove Account"
msgstr ""
-#: ../../mod/settings.php:633
+#: ../../mod/settings.php:664
msgid "Remove this account from this server including all its channels"
msgstr ""
-#: ../../mod/settings.php:634 ../../mod/settings.php:1014
+#: ../../mod/settings.php:665 ../../mod/settings.php:1067
msgid "Warning: This action is permanent and cannot be reversed."
msgstr ""
-#: ../../mod/settings.php:650
+#: ../../mod/settings.php:681
msgid "Off"
msgstr ""
-#: ../../mod/settings.php:650
+#: ../../mod/settings.php:681
msgid "On"
msgstr ""
-#: ../../mod/settings.php:657
+#: ../../mod/settings.php:688
msgid "Additional Features"
msgstr ""
-#: ../../mod/settings.php:682
+#: ../../mod/settings.php:713
msgid "Connector Settings"
msgstr ""
-#: ../../mod/settings.php:712 ../../mod/admin.php:362
+#: ../../mod/settings.php:743 ../../mod/admin.php:362
msgid "No special theme for mobile devices"
msgstr ""
-#: ../../mod/settings.php:721
+#: ../../mod/settings.php:752
#, php-format
msgid "%s - (Experimental)"
msgstr ""
-#: ../../mod/settings.php:757
+#: ../../mod/settings.php:788
msgid "Display Settings"
msgstr ""
-#: ../../mod/settings.php:763
+#: ../../mod/settings.php:794
msgid "Display Theme:"
msgstr ""
-#: ../../mod/settings.php:764
+#: ../../mod/settings.php:795
msgid "Mobile Theme:"
msgstr ""
-#: ../../mod/settings.php:765
+#: ../../mod/settings.php:796
msgid "Enable user zoom on mobile devices"
msgstr ""
-#: ../../mod/settings.php:766
+#: ../../mod/settings.php:797
msgid "Update browser every xx seconds"
msgstr ""
-#: ../../mod/settings.php:766
+#: ../../mod/settings.php:797
msgid "Minimum of 10 seconds, no maximum"
msgstr ""
-#: ../../mod/settings.php:767
+#: ../../mod/settings.php:798
msgid "Maximum number of conversations to load at any time:"
msgstr ""
-#: ../../mod/settings.php:767
+#: ../../mod/settings.php:798
msgid "Maximum of 100 items"
msgstr ""
-#: ../../mod/settings.php:768
+#: ../../mod/settings.php:799
msgid "Don't show emoticons"
msgstr ""
-#: ../../mod/settings.php:769
+#: ../../mod/settings.php:800
msgid "Link post titles to source"
msgstr ""
-#: ../../mod/settings.php:770
+#: ../../mod/settings.php:801
msgid "System Page Layout Editor - (advanced)"
msgstr ""
-#: ../../mod/settings.php:804
+#: ../../mod/settings.php:835
msgid "Nobody except yourself"
msgstr ""
-#: ../../mod/settings.php:805
+#: ../../mod/settings.php:836
msgid "Only those you specifically allow"
msgstr ""
-#: ../../mod/settings.php:806
+#: ../../mod/settings.php:837
msgid "Approved connections"
msgstr ""
-#: ../../mod/settings.php:807
+#: ../../mod/settings.php:838
msgid "Any connections"
msgstr ""
-#: ../../mod/settings.php:808
+#: ../../mod/settings.php:839
msgid "Anybody on this website"
msgstr ""
-#: ../../mod/settings.php:809
+#: ../../mod/settings.php:840
msgid "Anybody in this network"
msgstr ""
-#: ../../mod/settings.php:810
+#: ../../mod/settings.php:841
msgid "Anybody authenticated"
msgstr ""
-#: ../../mod/settings.php:811
+#: ../../mod/settings.php:842
msgid "Anybody on the internet"
msgstr ""
-#: ../../mod/settings.php:885
+#: ../../mod/settings.php:916
msgid "Publish your default profile in the network directory"
msgstr ""
-#: ../../mod/settings.php:885 ../../mod/settings.php:890
-#: ../../mod/settings.php:967 ../../mod/api.php:106 ../../mod/profiles.php:574
-#: ../../mod/admin.php:392
+#: ../../mod/settings.php:916 ../../mod/settings.php:921
+#: ../../mod/settings.php:1004 ../../mod/api.php:106
+#: ../../mod/profiles.php:574 ../../mod/admin.php:392
msgid "No"
msgstr ""
-#: ../../mod/settings.php:885 ../../mod/settings.php:890
-#: ../../mod/settings.php:967 ../../mod/api.php:105 ../../mod/profiles.php:573
-#: ../../mod/admin.php:394
+#: ../../mod/settings.php:916 ../../mod/settings.php:921
+#: ../../mod/settings.php:1004 ../../mod/api.php:105
+#: ../../mod/profiles.php:573 ../../mod/admin.php:394
msgid "Yes"
msgstr ""
-#: ../../mod/settings.php:890
+#: ../../mod/settings.php:921
msgid "Allow us to suggest you as a potential friend to new members?"
msgstr ""
-#: ../../mod/settings.php:894 ../../mod/profile_photo.php:365
+#: ../../mod/settings.php:925 ../../mod/profile_photo.php:365
msgid "or"
msgstr ""
-#: ../../mod/settings.php:899
+#: ../../mod/settings.php:930
msgid "Your channel address is"
msgstr ""
-#: ../../mod/settings.php:937
+#: ../../mod/settings.php:974
msgid "Channel Settings"
msgstr ""
-#: ../../mod/settings.php:946
+#: ../../mod/settings.php:983
msgid "Basic Settings"
msgstr ""
-#: ../../mod/settings.php:949
+#: ../../mod/settings.php:986
msgid "Your Timezone:"
msgstr ""
-#: ../../mod/settings.php:950
+#: ../../mod/settings.php:987
msgid "Default Post Location:"
msgstr ""
-#: ../../mod/settings.php:950
+#: ../../mod/settings.php:987
msgid "Geographical location to display on your posts"
msgstr ""
-#: ../../mod/settings.php:951
+#: ../../mod/settings.php:988
msgid "Use Browser Location:"
msgstr ""
-#: ../../mod/settings.php:953
+#: ../../mod/settings.php:990
msgid "Adult Content"
msgstr ""
-#: ../../mod/settings.php:953
+#: ../../mod/settings.php:990
msgid ""
"This channel frequently or regularly publishes adult content. (Please tag "
"any adult material and/or nudity with #NSFW)"
msgstr ""
-#: ../../mod/settings.php:955
+#: ../../mod/settings.php:992
msgid "Security and Privacy Settings"
msgstr ""
-#: ../../mod/settings.php:957
+#: ../../mod/settings.php:994
msgid "Your permissions are already configured. Click to view/adjust"
msgstr ""
-#: ../../mod/settings.php:959
+#: ../../mod/settings.php:996
msgid "Hide my online presence"
msgstr ""
-#: ../../mod/settings.php:959
+#: ../../mod/settings.php:996
msgid "Prevents displaying in your profile that you are online"
msgstr ""
-#: ../../mod/settings.php:961
+#: ../../mod/settings.php:998
msgid "Simple Privacy Settings:"
msgstr ""
-#: ../../mod/settings.php:962
+#: ../../mod/settings.php:999
msgid ""
"Very Public - <em>extremely permissive (should be used with caution)</em>"
msgstr ""
-#: ../../mod/settings.php:963
+#: ../../mod/settings.php:1000
msgid ""
"Typical - <em>default public, privacy when desired (similar to social "
"network permissions but with improved privacy)</em>"
msgstr ""
-#: ../../mod/settings.php:964
+#: ../../mod/settings.php:1001
msgid "Private - <em>default private, never open or public</em>"
msgstr ""
-#: ../../mod/settings.php:965
+#: ../../mod/settings.php:1002
msgid "Blocked - <em>default blocked to/from everybody</em>"
msgstr ""
-#: ../../mod/settings.php:967
+#: ../../mod/settings.php:1004
msgid "Allow others to tag your posts"
msgstr ""
-#: ../../mod/settings.php:967
+#: ../../mod/settings.php:1004
msgid ""
"Often used by the community to retro-actively flag inappropriate content"
msgstr ""
-#: ../../mod/settings.php:969
+#: ../../mod/settings.php:1006
msgid "Advanced Privacy Settings"
msgstr ""
-#: ../../mod/settings.php:971
+#: ../../mod/settings.php:1008
msgid "Expire other channel content after this many days"
msgstr ""
-#: ../../mod/settings.php:971
+#: ../../mod/settings.php:1008
msgid "0 or blank prevents expiration"
msgstr ""
-#: ../../mod/settings.php:972
+#: ../../mod/settings.php:1009
msgid "Maximum Friend Requests/Day:"
msgstr ""
-#: ../../mod/settings.php:972
+#: ../../mod/settings.php:1009
msgid "May reduce spam activity"
msgstr ""
-#: ../../mod/settings.php:973
+#: ../../mod/settings.php:1010
msgid "Default Post Permissions"
msgstr ""
-#: ../../mod/settings.php:978
+#: ../../mod/settings.php:1015
msgid "Channel permissions category:"
msgstr ""
-#: ../../mod/settings.php:986
+#: ../../mod/settings.php:1023
msgid "Maximum private messages per day from unknown people:"
msgstr ""
-#: ../../mod/settings.php:986
+#: ../../mod/settings.php:1023
msgid "Useful to reduce spamming"
msgstr ""
-#: ../../mod/settings.php:989
+#: ../../mod/settings.php:1026
msgid "Notification Settings"
msgstr ""
-#: ../../mod/settings.php:990
+#: ../../mod/settings.php:1027
msgid "By default post a status message when:"
msgstr ""
-#: ../../mod/settings.php:991
+#: ../../mod/settings.php:1028
msgid "accepting a friend request"
msgstr ""
-#: ../../mod/settings.php:992
+#: ../../mod/settings.php:1029
msgid "joining a forum/community"
msgstr ""
-#: ../../mod/settings.php:993
+#: ../../mod/settings.php:1030
msgid "making an <em>interesting</em> profile change"
msgstr ""
-#: ../../mod/settings.php:994
+#: ../../mod/settings.php:1031
msgid "Send a notification email when:"
msgstr ""
-#: ../../mod/settings.php:995
+#: ../../mod/settings.php:1032
msgid "You receive a connection request"
msgstr ""
-#: ../../mod/settings.php:996
+#: ../../mod/settings.php:1033
msgid "Your connections are confirmed"
msgstr ""
-#: ../../mod/settings.php:997
+#: ../../mod/settings.php:1034
msgid "Someone writes on your profile wall"
msgstr ""
-#: ../../mod/settings.php:998
+#: ../../mod/settings.php:1035
msgid "Someone writes a followup comment"
msgstr ""
-#: ../../mod/settings.php:999
+#: ../../mod/settings.php:1036
msgid "You receive a private message"
msgstr ""
-#: ../../mod/settings.php:1000
+#: ../../mod/settings.php:1037
msgid "You receive a friend suggestion"
msgstr ""
-#: ../../mod/settings.php:1001
+#: ../../mod/settings.php:1038
msgid "You are tagged in a post"
msgstr ""
-#: ../../mod/settings.php:1002
+#: ../../mod/settings.php:1039
msgid "You are poked/prodded/etc. in a post"
msgstr ""
-#: ../../mod/settings.php:1005
+#: ../../mod/settings.php:1042
+msgid "Show visual notifications including:"
+msgstr ""
+
+#: ../../mod/settings.php:1044
+msgid "Unseen matrix activity"
+msgstr ""
+
+#: ../../mod/settings.php:1045
+msgid "Unseen channel activity"
+msgstr ""
+
+#: ../../mod/settings.php:1046
+msgid "Unseen private messages"
+msgstr ""
+
+#: ../../mod/settings.php:1046 ../../mod/settings.php:1051
+#: ../../mod/settings.php:1052 ../../mod/settings.php:1053
+msgid "Recommended"
+msgstr ""
+
+#: ../../mod/settings.php:1047
+msgid "Upcoming events"
+msgstr ""
+
+#: ../../mod/settings.php:1048
+msgid "Events today"
+msgstr ""
+
+#: ../../mod/settings.php:1049
+msgid "Upcoming birthdays"
+msgstr ""
+
+#: ../../mod/settings.php:1049
+msgid "Not available in all themes"
+msgstr ""
+
+#: ../../mod/settings.php:1050
+msgid "System (personal) notifications"
+msgstr ""
+
+#: ../../mod/settings.php:1051
+msgid "System info messages"
+msgstr ""
+
+#: ../../mod/settings.php:1052
+msgid "System critical alerts"
+msgstr ""
+
+#: ../../mod/settings.php:1053
+msgid "New connections"
+msgstr ""
+
+#: ../../mod/settings.php:1054
+msgid "System Registrations"
+msgstr ""
+
+#: ../../mod/settings.php:1056
+msgid "Notify me of events this many days in advance"
+msgstr ""
+
+#: ../../mod/settings.php:1056
+msgid "Must be greater than 0"
+msgstr ""
+
+#: ../../mod/settings.php:1058
msgid "Advanced Account/Page Type Settings"
msgstr ""
-#: ../../mod/settings.php:1006
+#: ../../mod/settings.php:1059
msgid "Change the behaviour of this account for special situations"
msgstr ""
-#: ../../mod/settings.php:1009
+#: ../../mod/settings.php:1062
msgid ""
"Please enable expert mode (in <a href=\"settings/features\">Settings > "
"Additional features</a>) to adjust!"
msgstr ""
-#: ../../mod/settings.php:1010
+#: ../../mod/settings.php:1063
msgid "Miscellaneous Settings"
msgstr ""
-#: ../../mod/settings.php:1012
+#: ../../mod/settings.php:1065
msgid "Personal menu to display in your channel pages"
msgstr ""
-#: ../../mod/settings.php:1013
+#: ../../mod/settings.php:1066
msgid "Remove this channel"
msgstr ""
@@ -4477,7 +4547,7 @@ msgid "Channel not found."
msgstr ""
#: ../../mod/block.php:75 ../../mod/display.php:102 ../../mod/help.php:70
-#: ../../mod/page.php:81 ../../index.php:252
+#: ../../mod/page.php:81 ../../index.php:241
msgid "Page not found."
msgstr ""
@@ -5201,15 +5271,15 @@ msgstr ""
msgid "Could not access contact record."
msgstr ""
-#: ../../mod/connections.php:51 ../../mod/connedit.php:78
+#: ../../mod/connections.php:51 ../../mod/connedit.php:86
msgid "Could not locate selected profile."
msgstr ""
-#: ../../mod/connections.php:94 ../../mod/connedit.php:132
+#: ../../mod/connections.php:94 ../../mod/connedit.php:140
msgid "Connection updated."
msgstr ""
-#: ../../mod/connections.php:96 ../../mod/connedit.php:134
+#: ../../mod/connections.php:96 ../../mod/connedit.php:142
msgid "Failed to update connection record."
msgstr ""
@@ -5294,314 +5364,311 @@ msgstr ""
msgid "Edit post"
msgstr ""
-#: ../../mod/connedit.php:181
+#: ../../mod/connedit.php:189
msgid "is now connected to"
msgstr ""
-#: ../../mod/connedit.php:302
+#: ../../mod/connedit.php:310
msgid "Could not access address book record."
msgstr ""
-#: ../../mod/connedit.php:316
+#: ../../mod/connedit.php:324
msgid "Refresh failed - channel is currently unavailable."
msgstr ""
-#: ../../mod/connedit.php:323
+#: ../../mod/connedit.php:331
msgid "Channel has been unblocked"
msgstr ""
-#: ../../mod/connedit.php:324
+#: ../../mod/connedit.php:332
msgid "Channel has been blocked"
msgstr ""
-#: ../../mod/connedit.php:328 ../../mod/connedit.php:340
-#: ../../mod/connedit.php:352 ../../mod/connedit.php:364
-#: ../../mod/connedit.php:380
+#: ../../mod/connedit.php:336 ../../mod/connedit.php:348
+#: ../../mod/connedit.php:360 ../../mod/connedit.php:372
+#: ../../mod/connedit.php:388
msgid "Unable to set address book parameters."
msgstr ""
-#: ../../mod/connedit.php:335
+#: ../../mod/connedit.php:343
msgid "Channel has been unignored"
msgstr ""
-#: ../../mod/connedit.php:336
+#: ../../mod/connedit.php:344
msgid "Channel has been ignored"
msgstr ""
-#: ../../mod/connedit.php:347
+#: ../../mod/connedit.php:355
msgid "Channel has been unarchived"
msgstr ""
-#: ../../mod/connedit.php:348
+#: ../../mod/connedit.php:356
msgid "Channel has been archived"
msgstr ""
-#: ../../mod/connedit.php:359
+#: ../../mod/connedit.php:367
msgid "Channel has been unhidden"
msgstr ""
-#: ../../mod/connedit.php:360
+#: ../../mod/connedit.php:368
msgid "Channel has been hidden"
msgstr ""
-#: ../../mod/connedit.php:375
+#: ../../mod/connedit.php:383
msgid "Channel has been approved"
msgstr ""
-#: ../../mod/connedit.php:376
+#: ../../mod/connedit.php:384
msgid "Channel has been unapproved"
msgstr ""
-#: ../../mod/connedit.php:404
+#: ../../mod/connedit.php:412
msgid "Connection has been removed."
msgstr ""
-#: ../../mod/connedit.php:424
+#: ../../mod/connedit.php:432
#, php-format
msgid "View %s's profile"
msgstr ""
-#: ../../mod/connedit.php:428
+#: ../../mod/connedit.php:436
msgid "Refresh Permissions"
msgstr ""
-#: ../../mod/connedit.php:431
+#: ../../mod/connedit.php:439
msgid "Fetch updated permissions"
msgstr ""
-#: ../../mod/connedit.php:435
+#: ../../mod/connedit.php:443
msgid "Recent Activity"
msgstr ""
-#: ../../mod/connedit.php:438
+#: ../../mod/connedit.php:446
msgid "View recent posts and comments"
msgstr ""
-#: ../../mod/connedit.php:442 ../../mod/connedit.php:585
+#: ../../mod/connedit.php:450 ../../mod/connedit.php:594
#: ../../mod/admin.php:734
msgid "Unblock"
msgstr ""
-#: ../../mod/connedit.php:442 ../../mod/connedit.php:585
+#: ../../mod/connedit.php:450 ../../mod/connedit.php:594
#: ../../mod/admin.php:733
msgid "Block"
msgstr ""
-#: ../../mod/connedit.php:445
+#: ../../mod/connedit.php:453
msgid "Block or Unblock this connection"
msgstr ""
-#: ../../mod/connedit.php:449 ../../mod/connedit.php:586
+#: ../../mod/connedit.php:457 ../../mod/connedit.php:595
msgid "Unignore"
msgstr ""
-#: ../../mod/connedit.php:449 ../../mod/connedit.php:586
+#: ../../mod/connedit.php:457 ../../mod/connedit.php:595
#: ../../mod/notifications.php:51
msgid "Ignore"
msgstr ""
-#: ../../mod/connedit.php:452
+#: ../../mod/connedit.php:460
msgid "Ignore or Unignore this connection"
msgstr ""
-#: ../../mod/connedit.php:455
+#: ../../mod/connedit.php:463
msgid "Unarchive"
msgstr ""
-#: ../../mod/connedit.php:455
+#: ../../mod/connedit.php:463
msgid "Archive"
msgstr ""
-#: ../../mod/connedit.php:458
+#: ../../mod/connedit.php:466
msgid "Archive or Unarchive this connection"
msgstr ""
-#: ../../mod/connedit.php:461
+#: ../../mod/connedit.php:469
msgid "Unhide"
msgstr ""
-#: ../../mod/connedit.php:461
+#: ../../mod/connedit.php:469
msgid "Hide"
msgstr ""
-#: ../../mod/connedit.php:464
+#: ../../mod/connedit.php:472
msgid "Hide or Unhide this connection"
msgstr ""
-#: ../../mod/connedit.php:471
+#: ../../mod/connedit.php:479
msgid "Delete this connection"
msgstr ""
-#: ../../mod/connedit.php:514 ../../mod/connedit.php:543
+#: ../../mod/connedit.php:522 ../../mod/connedit.php:552
msgid "Approve this connection"
msgstr ""
-#: ../../mod/connedit.php:514
+#: ../../mod/connedit.php:522
msgid "Accept connection to allow communication"
msgstr ""
-#: ../../mod/connedit.php:530
-msgid "Automatic Permissions Settings"
-msgstr ""
-
-#: ../../mod/connedit.php:530
+#: ../../mod/connedit.php:538
#, php-format
msgid "Connections: settings for %s"
msgstr ""
-#: ../../mod/connedit.php:534
-msgid ""
-"When receiving a channel introduction, any permissions provided here will be "
-"applied to the new connection automatically and the introduction approved. "
-"Leave this page if you do not wish to use this feature."
+#: ../../mod/connedit.php:539
+msgid "Apply these permissions automatically"
+msgstr ""
+
+#: ../../mod/connedit.php:543
+msgid "Apply the permissions indicated on this page to all new connections."
msgstr ""
-#: ../../mod/connedit.php:536
+#: ../../mod/connedit.php:545
msgid "Slide to adjust your degree of friendship"
msgstr ""
-#: ../../mod/connedit.php:542
+#: ../../mod/connedit.php:551
msgid "inherited"
msgstr ""
-#: ../../mod/connedit.php:544
+#: ../../mod/connedit.php:553
msgid "Connection has no individual permissions!"
msgstr ""
-#: ../../mod/connedit.php:545
+#: ../../mod/connedit.php:554
msgid ""
"This may be appropriate based on your <a href=\"settings\">privacy settings</"
"a>, though you may wish to review the \"Advanced Permissions\"."
msgstr ""
-#: ../../mod/connedit.php:547
+#: ../../mod/connedit.php:556
msgid "Profile Visibility"
msgstr ""
-#: ../../mod/connedit.php:548
+#: ../../mod/connedit.php:557
#, php-format
msgid ""
"Please choose the profile you would like to display to %s when viewing your "
"profile securely."
msgstr ""
-#: ../../mod/connedit.php:549
+#: ../../mod/connedit.php:558
msgid "Contact Information / Notes"
msgstr ""
-#: ../../mod/connedit.php:550
+#: ../../mod/connedit.php:559
msgid "Edit contact notes"
msgstr ""
-#: ../../mod/connedit.php:552
+#: ../../mod/connedit.php:561
msgid "Their Settings"
msgstr ""
-#: ../../mod/connedit.php:553
+#: ../../mod/connedit.php:562
msgid "My Settings"
msgstr ""
-#: ../../mod/connedit.php:555
+#: ../../mod/connedit.php:564
msgid "Clear/Disable Automatic Permissions"
msgstr ""
-#: ../../mod/connedit.php:556
+#: ../../mod/connedit.php:565
msgid "Forum Members"
msgstr ""
-#: ../../mod/connedit.php:557
+#: ../../mod/connedit.php:566
msgid "Soapbox"
msgstr ""
-#: ../../mod/connedit.php:558
+#: ../../mod/connedit.php:567
msgid "Full Sharing (typical social network permissions)"
msgstr ""
-#: ../../mod/connedit.php:559
+#: ../../mod/connedit.php:568
msgid "Cautious Sharing "
msgstr ""
-#: ../../mod/connedit.php:560
+#: ../../mod/connedit.php:569
msgid "Follow Only"
msgstr ""
-#: ../../mod/connedit.php:561
+#: ../../mod/connedit.php:570
msgid "Individual Permissions"
msgstr ""
-#: ../../mod/connedit.php:562
+#: ../../mod/connedit.php:571
msgid ""
"Some permissions may be inherited from your channel <a href=\"settings"
"\">privacy settings</a>, which have higher priority than individual "
"settings. Changing those inherited settings on this page will have no effect."
msgstr ""
-#: ../../mod/connedit.php:563
+#: ../../mod/connedit.php:572
msgid "Advanced Permissions"
msgstr ""
-#: ../../mod/connedit.php:564
+#: ../../mod/connedit.php:573
msgid "Simple Permissions (select one and submit)"
msgstr ""
-#: ../../mod/connedit.php:568
+#: ../../mod/connedit.php:577
#, php-format
msgid "Visit %s's profile - %s"
msgstr ""
-#: ../../mod/connedit.php:569
+#: ../../mod/connedit.php:578
msgid "Block/Unblock contact"
msgstr ""
-#: ../../mod/connedit.php:570
+#: ../../mod/connedit.php:579
msgid "Ignore contact"
msgstr ""
-#: ../../mod/connedit.php:571
+#: ../../mod/connedit.php:580
msgid "Repair URL settings"
msgstr ""
-#: ../../mod/connedit.php:572
+#: ../../mod/connedit.php:581
msgid "View conversations"
msgstr ""
-#: ../../mod/connedit.php:574
+#: ../../mod/connedit.php:583
msgid "Delete contact"
msgstr ""
-#: ../../mod/connedit.php:577
+#: ../../mod/connedit.php:586
msgid "Last update:"
msgstr ""
-#: ../../mod/connedit.php:579
+#: ../../mod/connedit.php:588
msgid "Update public posts"
msgstr ""
-#: ../../mod/connedit.php:581
+#: ../../mod/connedit.php:590
msgid "Update now"
msgstr ""
-#: ../../mod/connedit.php:587
+#: ../../mod/connedit.php:596
msgid "Currently blocked"
msgstr ""
-#: ../../mod/connedit.php:588
+#: ../../mod/connedit.php:597
msgid "Currently ignored"
msgstr ""
-#: ../../mod/connedit.php:589
+#: ../../mod/connedit.php:598
msgid "Currently archived"
msgstr ""
-#: ../../mod/connedit.php:590
+#: ../../mod/connedit.php:599
msgid "Currently pending"
msgstr ""
-#: ../../mod/connedit.php:591
+#: ../../mod/connedit.php:600
msgid "Hide this contact from others"
msgstr ""
-#: ../../mod/connedit.php:591
+#: ../../mod/connedit.php:600
msgid ""
"Replies/likes to your public posts <strong>may</strong> still be visible"
msgstr ""
@@ -6359,7 +6426,7 @@ msgstr ""
msgid "Help:"
msgstr ""
-#: ../../mod/help.php:67 ../../index.php:249
+#: ../../mod/help.php:67 ../../index.php:238
msgid "Not Found"
msgstr ""
@@ -7354,28 +7421,28 @@ msgstr ""
msgid "3. Click [Connect]"
msgstr ""
-#: ../../mod/item.php:150
+#: ../../mod/item.php:151
msgid "Unable to locate original post."
msgstr ""
-#: ../../mod/item.php:409
+#: ../../mod/item.php:411
msgid "Empty post discarded."
msgstr ""
-#: ../../mod/item.php:451
+#: ../../mod/item.php:453
msgid "Executable content type not permitted to this channel."
msgstr ""
-#: ../../mod/item.php:888
+#: ../../mod/item.php:891
msgid "System error. Post not saved."
msgstr ""
-#: ../../mod/item.php:1363
+#: ../../mod/item.php:1366
#, php-format
msgid "You have reached your limit of %1$.0f top level posts."
msgstr ""
-#: ../../mod/item.php:1369
+#: ../../mod/item.php:1372
#, php-format
msgid "You have reached your limit of %1$.0f webpages."
msgstr ""
@@ -7393,14 +7460,34 @@ msgstr ""
msgid "Layout Name"
msgstr ""
-#: ../../mod/locs.php:47 ../../mod/locs.php:74
+#: ../../mod/locs.php:19 ../../mod/locs.php:46
msgid "Location not found."
msgstr ""
-#: ../../mod/locs.php:78
+#: ../../mod/locs.php:50
msgid "Primary location cannot be removed."
msgstr ""
+#: ../../mod/locs.php:82
+msgid "No locations found."
+msgstr ""
+
+#: ../../mod/locs.php:95
+msgid "Manage Channel Locations"
+msgstr ""
+
+#: ../../mod/locs.php:96
+msgid "Location (address)"
+msgstr ""
+
+#: ../../mod/locs.php:97
+msgid "Primary Location"
+msgstr ""
+
+#: ../../mod/locs.php:98
+msgid "Drop location"
+msgstr ""
+
#: ../../mod/lockview.php:31
msgid "Remote privacy information not available."
msgstr ""
@@ -7446,7 +7533,7 @@ msgid ""
"Password reset failed."
msgstr ""
-#: ../../mod/lostpass.php:85 ../../boot.php:1506
+#: ../../mod/lostpass.php:85 ../../boot.php:1523
msgid "Password Reset"
msgstr ""
@@ -8179,41 +8266,41 @@ msgstr ""
msgid "Are you a clean desk or a messy desk person?"
msgstr ""
-#: ../../boot.php:1294
+#: ../../boot.php:1311
#, php-format
msgid "Update %s failed. See error logs."
msgstr ""
-#: ../../boot.php:1297
+#: ../../boot.php:1314
#, php-format
msgid "Update Error at %s"
msgstr ""
-#: ../../boot.php:1471
+#: ../../boot.php:1488
msgid ""
"Create an account to access services and applications within the Red Matrix"
msgstr ""
-#: ../../boot.php:1499
+#: ../../boot.php:1516
msgid "Password"
msgstr ""
-#: ../../boot.php:1500
+#: ../../boot.php:1517
msgid "Remember me"
msgstr ""
-#: ../../boot.php:1505
+#: ../../boot.php:1522
msgid "Forgot your password?"
msgstr ""
-#: ../../boot.php:1570
+#: ../../boot.php:1587
msgid "permission denied"
msgstr ""
-#: ../../boot.php:1571
+#: ../../boot.php:1588
msgid "Got Zot?"
msgstr ""
-#: ../../boot.php:2005
+#: ../../boot.php:2021
msgid "toggle mobile"
msgstr ""
diff --git a/version.inc b/version.inc
index 01d6c72d9..b0f79cf5f 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-11-06.851
+2014-11-07.852