aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-02-27 13:43:12 -0800
committerfriendica <info@friendica.com>2015-02-27 13:43:12 -0800
commit2b44c5fc72ac1a76b0a711d459ddcb52ed6666dc (patch)
tree8ca0bd9d8f4e7cc43ed8f90ca90b23ed04ef7127
parent2a74fab21a3e055a794ebef421eada79ca89c390 (diff)
downloadvolse-hubzilla-2b44c5fc72ac1a76b0a711d459ddcb52ed6666dc.tar.gz
volse-hubzilla-2b44c5fc72ac1a76b0a711d459ddcb52ed6666dc.tar.bz2
volse-hubzilla-2b44c5fc72ac1a76b0a711d459ddcb52ed6666dc.zip
Fix a couple of places where we weren't checking for dead hublocs. Add a function to mark a hubloc dead.
-rw-r--r--include/hubloc.php11
-rw-r--r--include/notifier.php19
-rw-r--r--util/messages.po4714
-rw-r--r--version.inc2
4 files changed, 2394 insertions, 2352 deletions
diff --git a/include/hubloc.php b/include/hubloc.php
index b5a3d47c5..94f1dc985 100644
--- a/include/hubloc.php
+++ b/include/hubloc.php
@@ -170,7 +170,16 @@ function hubloc_change_primary($hubloc) {
return true;
}
-
+
+// We use the post url to distinguish between http and https hublocs.
+// The https might be alive, and the http dead.
+
+function hubloc_mark_as_down($posturl) {
+ $r = q("update hubloc set hubloc_status = ( hubloc_status | %d ) where hubloc_posturl = '%s'",
+ intval(HUBLOC_OFFLINE)
+ );
+}
+
function xchan_store($arr) {
diff --git a/include/notifier.php b/include/notifier.php
index 36a52b209..a9c4905ae 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -100,10 +100,14 @@ function notifier_run($argv, $argc){
// Get the recipient
$r = q("select abook.*, hubloc.* from abook
left join hubloc on hubloc_hash = abook_xchan
- where abook_id = %d and not ( abook_flags & %d )>0 limit 1",
+ where abook_id = %d and not ( abook_flags & %d ) > 0
+ and not (hubloc_flags & %d) > 0 and not (hubloc_status & %d) > 0 limit 1",
intval($item_id),
- intval(ABOOK_FLAG_SELF)
+ intval(ABOOK_FLAG_SELF),
+ intval(HUBLOC_FLAGS_DELETED),
+ intval(HUBLOC_OFFLINE)
);
+
if($r) {
// Get the sender
$s = q("select * from channel left join xchan on channel_hash = xchan_hash where channel_id = %d limit 1",
@@ -116,8 +120,11 @@ function notifier_run($argv, $argc){
}
else {
// send a refresh message to each hub they have registered here
- $h = q("select * from hubloc where hubloc_hash = '%s'",
- dbesc($r[0]['hubloc_hash'])
+ $h = q("select * from hubloc where hubloc_hash = '%s'
+ and not (hubloc_flags & %d) > 0 and not (hubloc_status & %d) > 0",
+ dbesc($r[0]['hubloc_hash']),
+ intval(HUBLOC_FLAGS_DELETED),
+ intval(HUBLOC_OFFLINE)
);
if($h) {
foreach($h as $hh) {
@@ -138,7 +145,6 @@ function notifier_run($argv, $argc){
}
}
}
-
return;
}
@@ -491,6 +497,9 @@ function notifier_run($argv, $argc){
logger('notifier: hub choice: ' . intval($relay_to_owner) . ' ' . intval($private) . ' ' . $cmd, LOGGER_DEBUG);
+ // FIXME: I think we need to remove the private bit or this clause will never execute. Needs more coffee to think it through.
+ // We may in fact have to send it to clones in case the one we pick recently died.
+
if($relay_to_owner && (! $private) && ($cmd !== 'relay')) {
// If sending a followup to the post owner, only send it to one channel clone - to avoid race conditions.
diff --git a/util/messages.po b/util/messages.po
index 05e49605d..0c8f6d4fc 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 2015-02-20.950\n"
+"Project-Id-Version: 2015-02-27.956\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-20 00:04-0800\n"
+"POT-Creation-Date: 2015-02-27 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"
@@ -34,40 +34,41 @@ msgstr ""
#: ../../include/attach.php:261 ../../include/attach.php:301
#: ../../include/attach.php:315 ../../include/attach.php:339
#: ../../include/attach.php:532 ../../include/attach.php:606
-#: ../../include/chat.php:116 ../../include/items.php:4072
+#: ../../include/items.php:4083 ../../include/chat.php:116
#: ../../mod/profile.php:64 ../../mod/profile.php:72
#: ../../mod/achievements.php:30 ../../mod/editblock.php:65
-#: ../../mod/manage.php:6 ../../mod/api.php:26 ../../mod/api.php:31
-#: ../../mod/blocks.php:67 ../../mod/blocks.php:75 ../../mod/connedit.php:321
-#: ../../mod/editpost.php:13 ../../mod/profile_photo.php:264
-#: ../../mod/profile_photo.php:277 ../../mod/block.php:22
-#: ../../mod/block.php:72 ../../mod/network.php:12 ../../mod/events.php:219
-#: ../../mod/settings.php:560 ../../mod/group.php:9 ../../mod/setup.php:207
-#: ../../mod/common.php:35 ../../mod/suggest.php:26
+#: ../../mod/manage.php:6 ../../mod/delegate.php:6 ../../mod/api.php:26
+#: ../../mod/api.php:31 ../../mod/blocks.php:67 ../../mod/blocks.php:75
+#: ../../mod/profile_photo.php:264 ../../mod/profile_photo.php:277
+#: ../../mod/block.php:22 ../../mod/block.php:72 ../../mod/like.php:178
+#: ../../mod/events.php:219 ../../mod/network.php:12
+#: ../../mod/connedit.php:321 ../../mod/group.php:9 ../../mod/setup.php:207
+#: ../../mod/common.php:35 ../../mod/editpost.php:13
#: ../../mod/connections.php:169 ../../mod/item.php:197 ../../mod/item.php:205
#: ../../mod/item.php:938 ../../mod/thing.php:247 ../../mod/thing.php:264
-#: ../../mod/thing.php:299 ../../mod/pdledit.php:21 ../../mod/appman.php:66
-#: ../../mod/authtest.php:13 ../../mod/editlayout.php:64
-#: ../../mod/editlayout.php:89 ../../mod/chat.php:90 ../../mod/chat.php:95
-#: ../../mod/editwebpage.php:64 ../../mod/editwebpage.php:86
-#: ../../mod/editwebpage.php:118 ../../mod/rate.php:110
-#: ../../mod/invite.php:13 ../../mod/invite.php:104 ../../mod/locs.php:77
-#: ../../mod/sources.php:66 ../../mod/menu.php:61 ../../mod/filestorage.php:18
+#: ../../mod/thing.php:299 ../../mod/pdledit.php:21 ../../mod/authtest.php:13
+#: ../../mod/editlayout.php:64 ../../mod/editlayout.php:89
+#: ../../mod/chat.php:90 ../../mod/chat.php:95 ../../mod/editwebpage.php:64
+#: ../../mod/editwebpage.php:86 ../../mod/editwebpage.php:118
+#: ../../mod/rate.php:110 ../../mod/regmod.php:17 ../../mod/invite.php:13
+#: ../../mod/invite.php:104 ../../mod/locs.php:77 ../../mod/sources.php:66
+#: ../../mod/menu.php:61 ../../mod/filestorage.php:18
#: ../../mod/filestorage.php:72 ../../mod/filestorage.php:87
#: ../../mod/filestorage.php:114 ../../mod/fsuggest.php:78
#: ../../mod/poke.php:128 ../../mod/profiles.php:188
#: ../../mod/profiles.php:576 ../../mod/viewsrc.php:14
-#: ../../mod/webpages.php:67 ../../mod/delegate.php:6
-#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
-#: ../../mod/regmod.php:17 ../../mod/message.php:16 ../../mod/mitem.php:106
+#: ../../mod/webpages.php:67 ../../mod/viewconnections.php:22
+#: ../../mod/viewconnections.php:27 ../../mod/register.php:72
+#: ../../mod/photos.php:68 ../../mod/message.php:16 ../../mod/mitem.php:106
#: ../../mod/mood.php:111 ../../mod/layouts.php:67 ../../mod/layouts.php:74
-#: ../../mod/layouts.php:85 ../../mod/like.php:178 ../../mod/mail.php:114
+#: ../../mod/layouts.php:85 ../../mod/mail.php:114
#: ../../mod/notifications.php:66 ../../mod/new_channel.php:68
-#: ../../mod/new_channel.php:99 ../../mod/photos.php:68 ../../mod/page.php:28
+#: ../../mod/new_channel.php:99 ../../mod/appman.php:66 ../../mod/page.php:28
#: ../../mod/page.php:78 ../../mod/bookmarks.php:46 ../../mod/channel.php:90
#: ../../mod/channel.php:199 ../../mod/channel.php:242
-#: ../../mod/register.php:72 ../../mod/service_limits.php:7
-#: ../../mod/sharedwithme.php:7 ../../index.php:190 ../../index.php:390
+#: ../../mod/settings.php:560 ../../mod/suggest.php:26
+#: ../../mod/service_limits.php:7 ../../mod/sharedwithme.php:7
+#: ../../index.php:190 ../../index.php:393
msgid "Permission denied."
msgstr ""
@@ -105,6 +106,319 @@ msgstr ""
msgid "commented on %s's post"
msgstr ""
+#: ../../include/group.php:26
+msgid ""
+"A deleted group with this name was revived. Existing item permissions "
+"<strong>may</strong> apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
+msgstr ""
+
+#: ../../include/group.php:235
+msgid "Default privacy group for new contacts"
+msgstr ""
+
+#: ../../include/group.php:254 ../../mod/admin.php:764
+msgid "All Channels"
+msgstr ""
+
+#: ../../include/group.php:276
+msgid "edit"
+msgstr ""
+
+#: ../../include/group.php:298
+msgid "Collections"
+msgstr ""
+
+#: ../../include/group.php:299
+msgid "Edit collection"
+msgstr ""
+
+#: ../../include/group.php:300
+msgid "Create a new collection"
+msgstr ""
+
+#: ../../include/group.php:301
+msgid "Channels not in any collection"
+msgstr ""
+
+#: ../../include/group.php:303 ../../include/widgets.php:273
+msgid "add"
+msgstr ""
+
+#: ../../include/identity.php:31 ../../mod/item.php:1078
+msgid "Unable to obtain identity information from database"
+msgstr ""
+
+#: ../../include/identity.php:66
+msgid "Empty name"
+msgstr ""
+
+#: ../../include/identity.php:68
+msgid "Name too long"
+msgstr ""
+
+#: ../../include/identity.php:169
+msgid "No account identifier"
+msgstr ""
+
+#: ../../include/identity.php:182
+msgid "Nickname is required."
+msgstr ""
+
+#: ../../include/identity.php:196
+msgid "Reserved nickname. Please choose another."
+msgstr ""
+
+#: ../../include/identity.php:201 ../../include/dimport.php:34
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
+msgstr ""
+
+#: ../../include/identity.php:283
+msgid "Unable to retrieve created identity"
+msgstr ""
+
+#: ../../include/identity.php:343
+msgid "Default Profile"
+msgstr ""
+
+#: ../../include/identity.php:387 ../../include/identity.php:388
+#: ../../include/identity.php:395 ../../include/widgets.php:428
+#: ../../include/profile_selectors.php:80 ../../mod/connedit.php:567
+#: ../../mod/settings.php:335 ../../mod/settings.php:339
+#: ../../mod/settings.php:340 ../../mod/settings.php:343
+#: ../../mod/settings.php:354
+msgid "Friends"
+msgstr ""
+
+#: ../../include/identity.php:643
+msgid "Requested channel is not available."
+msgstr ""
+
+#: ../../include/identity.php:691 ../../mod/profile.php:16
+#: ../../mod/achievements.php:11 ../../mod/editblock.php:29
+#: ../../mod/blocks.php:29 ../../mod/connect.php:13 ../../mod/hcard.php:8
+#: ../../mod/editlayout.php:28 ../../mod/editwebpage.php:28
+#: ../../mod/filestorage.php:53 ../../mod/webpages.php:29
+#: ../../mod/layouts.php:29
+msgid "Requested profile is not available."
+msgstr ""
+
+#: ../../include/identity.php:840 ../../include/widgets.php:136
+#: ../../include/widgets.php:175 ../../include/Contact.php:107
+#: ../../include/conversation.php:940 ../../mod/match.php:62
+#: ../../mod/directory.php:276 ../../mod/suggest.php:51
+msgid "Connect"
+msgstr ""
+
+#: ../../include/identity.php:854 ../../mod/profiles.php:774
+msgid "Change profile photo"
+msgstr ""
+
+#: ../../include/identity.php:861
+msgid "Profiles"
+msgstr ""
+
+#: ../../include/identity.php:861
+msgid "Manage/edit profiles"
+msgstr ""
+
+#: ../../include/identity.php:862 ../../mod/profiles.php:775
+msgid "Create New Profile"
+msgstr ""
+
+#: ../../include/identity.php:865 ../../include/nav.php:95
+msgid "Edit Profile"
+msgstr ""
+
+#: ../../include/identity.php:878 ../../mod/profiles.php:786
+msgid "Profile Image"
+msgstr ""
+
+#: ../../include/identity.php:881
+msgid "visible to everybody"
+msgstr ""
+
+#: ../../include/identity.php:882 ../../mod/profiles.php:669
+#: ../../mod/profiles.php:790
+msgid "Edit visibility"
+msgstr ""
+
+#: ../../include/identity.php:894 ../../include/bb2diaspora.php:450
+#: ../../include/event.php:40 ../../mod/events.php:645
+#: ../../mod/directory.php:208
+msgid "Location:"
+msgstr ""
+
+#: ../../include/identity.php:898 ../../include/identity.php:1139
+msgid "Gender:"
+msgstr ""
+
+#: ../../include/identity.php:899 ../../include/identity.php:1183
+msgid "Status:"
+msgstr ""
+
+#: ../../include/identity.php:900 ../../include/identity.php:1194
+msgid "Homepage:"
+msgstr ""
+
+#: ../../include/identity.php:901
+msgid "Online Now"
+msgstr ""
+
+#: ../../include/identity.php:983 ../../include/identity.php:1063
+#: ../../mod/ping.php:324
+msgid "g A l F d"
+msgstr ""
+
+#: ../../include/identity.php:984 ../../include/identity.php:1064
+msgid "F d"
+msgstr ""
+
+#: ../../include/identity.php:1029 ../../include/identity.php:1104
+#: ../../mod/ping.php:346
+msgid "[today]"
+msgstr ""
+
+#: ../../include/identity.php:1041
+msgid "Birthday Reminders"
+msgstr ""
+
+#: ../../include/identity.php:1042
+msgid "Birthdays this week:"
+msgstr ""
+
+#: ../../include/identity.php:1097
+msgid "[No description]"
+msgstr ""
+
+#: ../../include/identity.php:1115
+msgid "Event Reminders"
+msgstr ""
+
+#: ../../include/identity.php:1116
+msgid "Events this week:"
+msgstr ""
+
+#: ../../include/identity.php:1129 ../../include/identity.php:1246
+#: ../../include/apps.php:138 ../../mod/profperm.php:112
+msgid "Profile"
+msgstr ""
+
+#: ../../include/identity.php:1137 ../../mod/settings.php:1044
+msgid "Full Name:"
+msgstr ""
+
+#: ../../include/identity.php:1144
+msgid "Like this channel"
+msgstr ""
+
+#: ../../include/identity.php:1155 ../../include/taxonomy.php:385
+#: ../../include/ItemObject.php:179 ../../include/conversation.php:1692
+#: ../../mod/photos.php:1001
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/identity.php:1168
+msgid "j F, Y"
+msgstr ""
+
+#: ../../include/identity.php:1169
+msgid "j F"
+msgstr ""
+
+#: ../../include/identity.php:1176
+msgid "Birthday:"
+msgstr ""
+
+#: ../../include/identity.php:1180
+msgid "Age:"
+msgstr ""
+
+#: ../../include/identity.php:1189
+#, php-format
+msgid "for %1$d %2$s"
+msgstr ""
+
+#: ../../include/identity.php:1192 ../../mod/profiles.php:691
+msgid "Sexual Preference:"
+msgstr ""
+
+#: ../../include/identity.php:1196 ../../mod/profiles.php:693
+msgid "Hometown:"
+msgstr ""
+
+#: ../../include/identity.php:1198
+msgid "Tags:"
+msgstr ""
+
+#: ../../include/identity.php:1200 ../../mod/profiles.php:694
+msgid "Political Views:"
+msgstr ""
+
+#: ../../include/identity.php:1202
+msgid "Religion:"
+msgstr ""
+
+#: ../../include/identity.php:1204
+msgid "About:"
+msgstr ""
+
+#: ../../include/identity.php:1206
+msgid "Hobbies/Interests:"
+msgstr ""
+
+#: ../../include/identity.php:1208 ../../mod/profiles.php:697
+msgid "Likes:"
+msgstr ""
+
+#: ../../include/identity.php:1210 ../../mod/profiles.php:698
+msgid "Dislikes:"
+msgstr ""
+
+#: ../../include/identity.php:1212
+msgid "Contact information and Social Networks:"
+msgstr ""
+
+#: ../../include/identity.php:1214
+msgid "My other channels:"
+msgstr ""
+
+#: ../../include/identity.php:1216
+msgid "Musical interests:"
+msgstr ""
+
+#: ../../include/identity.php:1218
+msgid "Books, literature:"
+msgstr ""
+
+#: ../../include/identity.php:1220
+msgid "Television:"
+msgstr ""
+
+#: ../../include/identity.php:1222
+msgid "Film/dance/culture/entertainment:"
+msgstr ""
+
+#: ../../include/identity.php:1224
+msgid "Love/Romance:"
+msgstr ""
+
+#: ../../include/identity.php:1226
+msgid "Work/employment:"
+msgstr ""
+
+#: ../../include/identity.php:1228
+msgid "School/education:"
+msgstr ""
+
+#: ../../include/identity.php:1248
+msgid "Like this thing"
+msgstr ""
+
#: ../../include/page_widgets.php:6
msgid "New Page"
msgstr ""
@@ -113,11 +427,12 @@ msgstr ""
#: ../../include/RedDAV/RedBrowser.php:267 ../../include/ItemObject.php:100
#: ../../include/apps.php:254 ../../include/menu.php:42
#: ../../mod/editblock.php:143 ../../mod/blocks.php:132
-#: ../../mod/editpost.php:113 ../../mod/settings.php:645
-#: ../../mod/connections.php:382 ../../mod/connections.php:395
-#: ../../mod/connections.php:414 ../../mod/thing.php:233
-#: ../../mod/editlayout.php:139 ../../mod/editwebpage.php:174
-#: ../../mod/menu.php:78 ../../mod/webpages.php:162 ../../mod/layouts.php:167
+#: ../../mod/editpost.php:113 ../../mod/connections.php:382
+#: ../../mod/connections.php:395 ../../mod/connections.php:414
+#: ../../mod/thing.php:233 ../../mod/editlayout.php:139
+#: ../../mod/editwebpage.php:174 ../../mod/menu.php:78
+#: ../../mod/webpages.php:162 ../../mod/layouts.php:167
+#: ../../mod/settings.php:645
msgid "Edit"
msgstr ""
@@ -178,13 +493,6 @@ msgstr ""
msgid "Edit Personal App"
msgstr ""
-#: ../../include/widgets.php:136 ../../include/widgets.php:175
-#: ../../include/identity.php:840 ../../include/Contact.php:107
-#: ../../include/conversation.php:940 ../../mod/suggest.php:51
-#: ../../mod/directory.php:272 ../../mod/match.php:62
-msgid "Connect"
-msgstr ""
-
#: ../../include/widgets.php:138 ../../mod/suggest.php:53
msgid "Ignore/Hide"
msgstr ""
@@ -219,8 +527,8 @@ msgid "Notes"
msgstr ""
#: ../../include/widgets.php:192 ../../include/text.php:838
-#: ../../include/text.php:850 ../../mod/filer.php:50 ../../mod/rbmark.php:28
-#: ../../mod/rbmark.php:98 ../../mod/admin.php:1344 ../../mod/admin.php:1365
+#: ../../include/text.php:850 ../../mod/rbmark.php:28 ../../mod/rbmark.php:98
+#: ../../mod/filer.php:50 ../../mod/admin.php:1368 ../../mod/admin.php:1389
msgid "Save"
msgstr ""
@@ -232,10 +540,6 @@ msgstr ""
msgid "Saved Searches"
msgstr ""
-#: ../../include/widgets.php:273 ../../include/group.php:303
-msgid "add"
-msgstr ""
-
#: ../../include/widgets.php:302 ../../include/features.php:84
#: ../../include/contact_widgets.php:57
msgid "Saved Folders"
@@ -262,15 +566,6 @@ msgstr ""
msgid "Best Friends"
msgstr ""
-#: ../../include/widgets.php:428 ../../include/identity.php:387
-#: ../../include/identity.php:388 ../../include/identity.php:395
-#: ../../include/profile_selectors.php:80 ../../mod/connedit.php:567
-#: ../../mod/settings.php:335 ../../mod/settings.php:339
-#: ../../mod/settings.php:340 ../../mod/settings.php:343
-#: ../../mod/settings.php:354
-msgid "Friends"
-msgstr ""
-
#: ../../include/widgets.php:429
msgid "Co-workers"
msgstr ""
@@ -329,7 +624,7 @@ msgid "Channel Sources"
msgstr ""
#: ../../include/widgets.php:535 ../../include/nav.php:210
-#: ../../include/apps.php:134 ../../mod/admin.php:956 ../../mod/admin.php:1161
+#: ../../include/apps.php:134 ../../mod/admin.php:980 ../../mod/admin.php:1185
msgid "Settings"
msgstr ""
@@ -374,201 +669,6 @@ msgstr ""
msgid "Public Hubs"
msgstr ""
-#: ../../include/enotify.php:41
-msgid "Red Matrix Notification"
-msgstr ""
-
-#: ../../include/enotify.php:42
-msgid "redmatrix"
-msgstr ""
-
-#: ../../include/enotify.php:44
-msgid "Thank You,"
-msgstr ""
-
-#: ../../include/enotify.php:46
-#, php-format
-msgid "%s Administrator"
-msgstr ""
-
-#: ../../include/enotify.php:81
-#, php-format
-msgid "%s <!item_type!>"
-msgstr ""
-
-#: ../../include/enotify.php:85
-#, php-format
-msgid "[Red:Notify] New mail received at %s"
-msgstr ""
-
-#: ../../include/enotify.php:87
-#, php-format
-msgid "%1$s, %2$s sent you a new private message at %3$s."
-msgstr ""
-
-#: ../../include/enotify.php:88
-#, php-format
-msgid "%1$s sent you %2$s."
-msgstr ""
-
-#: ../../include/enotify.php:88
-msgid "a private message"
-msgstr ""
-
-#: ../../include/enotify.php:89
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
-msgstr ""
-
-#: ../../include/enotify.php:144
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
-msgstr ""
-
-#: ../../include/enotify.php:152
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
-msgstr ""
-
-#: ../../include/enotify.php:161
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
-msgstr ""
-
-#: ../../include/enotify.php:172
-#, php-format
-msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
-msgstr ""
-
-#: ../../include/enotify.php:173
-#, php-format
-msgid "%1$s, %2$s commented on an item/conversation you have been following."
-msgstr ""
-
-#: ../../include/enotify.php:176 ../../include/enotify.php:191
-#: ../../include/enotify.php:217 ../../include/enotify.php:236
-#: ../../include/enotify.php:250
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
-msgstr ""
-
-#: ../../include/enotify.php:182
-#, php-format
-msgid "[Red:Notify] %s posted to your profile wall"
-msgstr ""
-
-#: ../../include/enotify.php:184
-#, php-format
-msgid "%1$s, %2$s posted to your profile wall at %3$s"
-msgstr ""
-
-#: ../../include/enotify.php:186
-#, php-format
-msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
-msgstr ""
-
-#: ../../include/enotify.php:210
-#, php-format
-msgid "[Red:Notify] %s tagged you"
-msgstr ""
-
-#: ../../include/enotify.php:211
-#, php-format
-msgid "%1$s, %2$s tagged you at %3$s"
-msgstr ""
-
-#: ../../include/enotify.php:212
-#, php-format
-msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
-msgstr ""
-
-#: ../../include/enotify.php:225
-#, php-format
-msgid "[Red:Notify] %1$s poked you"
-msgstr ""
-
-#: ../../include/enotify.php:226
-#, php-format
-msgid "%1$s, %2$s poked you at %3$s"
-msgstr ""
-
-#: ../../include/enotify.php:227
-#, php-format
-msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
-msgstr ""
-
-#: ../../include/enotify.php:243
-#, php-format
-msgid "[Red:Notify] %s tagged your post"
-msgstr ""
-
-#: ../../include/enotify.php:244
-#, php-format
-msgid "%1$s, %2$s tagged your post at %3$s"
-msgstr ""
-
-#: ../../include/enotify.php:245
-#, php-format
-msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
-msgstr ""
-
-#: ../../include/enotify.php:257
-msgid "[Red:Notify] Introduction received"
-msgstr ""
-
-#: ../../include/enotify.php:258
-#, php-format
-msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
-msgstr ""
-
-#: ../../include/enotify.php:259
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
-msgstr ""
-
-#: ../../include/enotify.php:263 ../../include/enotify.php:282
-#, php-format
-msgid "You may visit their profile at %s"
-msgstr ""
-
-#: ../../include/enotify.php:265
-#, php-format
-msgid "Please visit %s to approve or reject the connection request."
-msgstr ""
-
-#: ../../include/enotify.php:272
-msgid "[Red:Notify] Friend suggestion received"
-msgstr ""
-
-#: ../../include/enotify.php:273
-#, php-format
-msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
-msgstr ""
-
-#: ../../include/enotify.php:274
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s."
-msgstr ""
-
-#: ../../include/enotify.php:280
-msgid "Name:"
-msgstr ""
-
-#: ../../include/enotify.php:281
-msgid "Photo:"
-msgstr ""
-
-#: ../../include/enotify.php:284
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
-msgstr ""
-
-#: ../../include/enotify.php:499
-msgid "[Red:Notify]"
-msgstr ""
-
#: ../../include/text.php:320
msgid "prev"
msgstr ""
@@ -864,19 +964,21 @@ msgid "Select an alternate language"
msgstr ""
#: ../../include/text.php:1753 ../../include/diaspora.php:1909
-#: ../../include/conversation.php:120 ../../mod/subthread.php:72
-#: ../../mod/subthread.php:174 ../../mod/tagger.php:43 ../../mod/like.php:335
+#: ../../include/conversation.php:120 ../../mod/like.php:335
+#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
+#: ../../mod/tagger.php:43
msgid "photo"
msgstr ""
#: ../../include/text.php:1756 ../../include/conversation.php:123
-#: ../../mod/tagger.php:47 ../../mod/like.php:337
+#: ../../mod/like.php:337 ../../mod/tagger.php:47
msgid "event"
msgstr ""
#: ../../include/text.php:1759 ../../include/diaspora.php:1909
-#: ../../include/conversation.php:148 ../../mod/subthread.php:72
-#: ../../mod/subthread.php:174 ../../mod/tagger.php:51 ../../mod/like.php:335
+#: ../../include/conversation.php:148 ../../mod/like.php:335
+#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
+#: ../../mod/tagger.php:51
msgid "status"
msgstr ""
@@ -1041,22 +1143,22 @@ msgid "Describe (optional)"
msgstr ""
#: ../../include/js_strings.php:22 ../../include/ItemObject.php:668
-#: ../../mod/xchan.php:11 ../../mod/connedit.php:653 ../../mod/connect.php:93
-#: ../../mod/events.php:654 ../../mod/settings.php:583
+#: ../../mod/xchan.php:11 ../../mod/connect.php:93 ../../mod/events.php:654
+#: ../../mod/connedit.php:653 ../../mod/group.php:81 ../../mod/setup.php:313
+#: ../../mod/setup.php:358 ../../mod/thing.php:284 ../../mod/thing.php:327
+#: ../../mod/pdledit.php:58 ../../mod/import.php:504 ../../mod/chat.php:177
+#: ../../mod/chat.php:211 ../../mod/rate.php:167 ../../mod/invite.php:142
+#: ../../mod/locs.php:105 ../../mod/sources.php:104 ../../mod/sources.php:138
+#: ../../mod/filestorage.php:155 ../../mod/fsuggest.php:108
+#: ../../mod/poke.php:166 ../../mod/profiles.php:667 ../../mod/admin.php:420
+#: ../../mod/admin.php:752 ../../mod/admin.php:888 ../../mod/admin.php:1021
+#: ../../mod/admin.php:1220 ../../mod/admin.php:1307 ../../mod/photos.php:565
+#: ../../mod/photos.php:642 ../../mod/photos.php:923 ../../mod/photos.php:963
+#: ../../mod/photos.php:1081 ../../mod/mood.php:134 ../../mod/mail.php:355
+#: ../../mod/appman.php:99 ../../mod/settings.php:583
#: ../../mod/settings.php:708 ../../mod/settings.php:737
#: ../../mod/settings.php:760 ../../mod/settings.php:842
-#: ../../mod/settings.php:1038 ../../mod/group.php:81 ../../mod/setup.php:313
-#: ../../mod/setup.php:358 ../../mod/thing.php:284 ../../mod/thing.php:327
-#: ../../mod/pdledit.php:58 ../../mod/appman.php:99 ../../mod/import.php:504
-#: ../../mod/chat.php:177 ../../mod/chat.php:211 ../../mod/rate.php:167
-#: ../../mod/invite.php:142 ../../mod/locs.php:105 ../../mod/sources.php:104
-#: ../../mod/sources.php:138 ../../mod/filestorage.php:155
-#: ../../mod/fsuggest.php:108 ../../mod/poke.php:166
-#: ../../mod/profiles.php:667 ../../mod/admin.php:416 ../../mod/admin.php:728
-#: ../../mod/admin.php:864 ../../mod/admin.php:997 ../../mod/admin.php:1196
-#: ../../mod/admin.php:1283 ../../mod/mood.php:134 ../../mod/mail.php:355
-#: ../../mod/photos.php:565 ../../mod/photos.php:642 ../../mod/photos.php:923
-#: ../../mod/photos.php:963 ../../mod/photos.php:1081 ../../mod/poll.php:68
+#: ../../mod/settings.php:1038 ../../mod/poll.php:68
#: ../../view/theme/apw/php/config.php:256
#: ../../view/theme/redbasic/php/config.php:99
msgid "Submit"
@@ -1160,8 +1262,8 @@ msgstr ""
msgid "Schedule Outbox"
msgstr ""
-#: ../../include/RedDAV/RedBrowser.php:163 ../../include/apps.php:336
-#: ../../include/apps.php:387 ../../include/conversation.php:1019
+#: ../../include/RedDAV/RedBrowser.php:163 ../../include/conversation.php:1019
+#: ../../include/apps.php:336 ../../include/apps.php:387
#: ../../mod/connedit.php:570 ../../mod/photos.php:681
#: ../../mod/photos.php:1113
msgid "Unknown"
@@ -1178,7 +1280,7 @@ msgid "%1$s used of %2$s (%3$s&#37;)"
msgstr ""
#: ../../include/RedDAV/RedBrowser.php:249 ../../include/nav.php:98
-#: ../../include/apps.php:135 ../../include/conversation.php:1595
+#: ../../include/conversation.php:1595 ../../include/apps.php:135
#: ../../mod/fbrowser.php:114
msgid "Files"
msgstr ""
@@ -1203,8 +1305,8 @@ msgstr ""
msgid "Upload"
msgstr ""
-#: ../../include/RedDAV/RedBrowser.php:262 ../../mod/settings.php:585
-#: ../../mod/settings.php:611 ../../mod/admin.php:871
+#: ../../include/RedDAV/RedBrowser.php:262 ../../mod/admin.php:895
+#: ../../mod/settings.php:585 ../../mod/settings.php:611
#: ../../mod/sharedwithme.php:100
msgid "Name"
msgstr ""
@@ -1222,10 +1324,10 @@ msgid "Last Modified"
msgstr ""
#: ../../include/RedDAV/RedBrowser.php:268 ../../include/ItemObject.php:120
-#: ../../include/apps.php:255 ../../include/conversation.php:645
-#: ../../mod/connedit.php:533 ../../mod/settings.php:646
-#: ../../mod/group.php:176 ../../mod/thing.php:234 ../../mod/admin.php:735
-#: ../../mod/admin.php:866 ../../mod/photos.php:1044
+#: ../../include/conversation.php:645 ../../include/apps.php:255
+#: ../../mod/connedit.php:533 ../../mod/group.php:176 ../../mod/thing.php:234
+#: ../../mod/admin.php:759 ../../mod/admin.php:890 ../../mod/photos.php:1044
+#: ../../mod/settings.php:646
msgid "Delete"
msgstr ""
@@ -1282,15 +1384,6 @@ msgstr ""
msgid "dislikes"
msgstr ""
-#: ../../include/taxonomy.php:385 ../../include/identity.php:1155
-#: ../../include/ItemObject.php:179 ../../include/conversation.php:1692
-#: ../../mod/photos.php:1001
-msgctxt "noun"
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] ""
-msgstr[1] ""
-
#: ../../include/features.php:38
msgid "General Features"
msgstr ""
@@ -1534,16 +1627,76 @@ msgstr ""
msgid "Provide a personal tag cloud on your channel page"
msgstr ""
-#: ../../include/auth.php:130
-msgid "Logged out."
+#: ../../include/items.php:382 ../../mod/like.php:270
+#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/profperm.php:23
+#: ../../index.php:392
+msgid "Permission denied"
msgstr ""
-#: ../../include/auth.php:271
-msgid "Failed authentication"
+#: ../../include/items.php:979 ../../include/items.php:1024
+msgid "(Unknown)"
msgstr ""
-#: ../../include/auth.php:285 ../../mod/openid.php:190
-msgid "Login failed."
+#: ../../include/items.php:1181
+msgid "Visible to anybody on the internet."
+msgstr ""
+
+#: ../../include/items.php:1183
+msgid "Visible to you only."
+msgstr ""
+
+#: ../../include/items.php:1185
+msgid "Visible to anybody in this network."
+msgstr ""
+
+#: ../../include/items.php:1187
+msgid "Visible to anybody authenticated."
+msgstr ""
+
+#: ../../include/items.php:1189
+#, php-format
+msgid "Visible to anybody on %s."
+msgstr ""
+
+#: ../../include/items.php:1191
+msgid "Visible to all connections."
+msgstr ""
+
+#: ../../include/items.php:1193
+msgid "Visible to approved connections."
+msgstr ""
+
+#: ../../include/items.php:1195
+msgid "Visible to specific connections."
+msgstr ""
+
+#: ../../include/items.php:4013 ../../mod/thing.php:76
+#: ../../mod/display.php:32 ../../mod/filestorage.php:27
+#: ../../mod/viewsrc.php:20 ../../mod/admin.php:172 ../../mod/admin.php:925
+#: ../../mod/admin.php:1128
+msgid "Item not found."
+msgstr ""
+
+#: ../../include/items.php:4466 ../../mod/group.php:38 ../../mod/group.php:140
+msgid "Collection not found."
+msgstr ""
+
+#: ../../include/items.php:4481
+msgid "Collection is empty."
+msgstr ""
+
+#: ../../include/items.php:4488
+#, php-format
+msgid "Collection: %s"
+msgstr ""
+
+#: ../../include/items.php:4499
+#, php-format
+msgid "Connection: %s"
+msgstr ""
+
+#: ../../include/items.php:4502
+msgid "Connection not found."
msgstr ""
#: ../../include/contact_selectors.php:56
@@ -1582,8 +1735,8 @@ msgstr ""
msgid "RSS/Atom"
msgstr ""
-#: ../../include/contact_selectors.php:79 ../../mod/admin.php:731
-#: ../../mod/admin.php:740 ../../boot.php:1554
+#: ../../include/contact_selectors.php:79 ../../mod/admin.php:755
+#: ../../mod/admin.php:764 ../../boot.php:1554
msgid "Email"
msgstr ""
@@ -1611,290 +1764,6 @@ msgstr ""
msgid "MySpace"
msgstr ""
-#: ../../include/group.php:26
-msgid ""
-"A deleted group with this name was revived. Existing item permissions "
-"<strong>may</strong> apply to this group and any future members. If this is "
-"not what you intended, please create another group with a different name."
-msgstr ""
-
-#: ../../include/group.php:235
-msgid "Default privacy group for new contacts"
-msgstr ""
-
-#: ../../include/group.php:254 ../../mod/admin.php:740
-msgid "All Channels"
-msgstr ""
-
-#: ../../include/group.php:276
-msgid "edit"
-msgstr ""
-
-#: ../../include/group.php:298
-msgid "Collections"
-msgstr ""
-
-#: ../../include/group.php:299
-msgid "Edit collection"
-msgstr ""
-
-#: ../../include/group.php:300
-msgid "Create a new collection"
-msgstr ""
-
-#: ../../include/group.php:301
-msgid "Channels not in any collection"
-msgstr ""
-
-#: ../../include/identity.php:31 ../../mod/item.php:1078
-msgid "Unable to obtain identity information from database"
-msgstr ""
-
-#: ../../include/identity.php:66
-msgid "Empty name"
-msgstr ""
-
-#: ../../include/identity.php:68
-msgid "Name too long"
-msgstr ""
-
-#: ../../include/identity.php:169
-msgid "No account identifier"
-msgstr ""
-
-#: ../../include/identity.php:182
-msgid "Nickname is required."
-msgstr ""
-
-#: ../../include/identity.php:196
-msgid "Reserved nickname. Please choose another."
-msgstr ""
-
-#: ../../include/identity.php:201 ../../include/dimport.php:34
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
-msgstr ""
-
-#: ../../include/identity.php:283
-msgid "Unable to retrieve created identity"
-msgstr ""
-
-#: ../../include/identity.php:343
-msgid "Default Profile"
-msgstr ""
-
-#: ../../include/identity.php:643
-msgid "Requested channel is not available."
-msgstr ""
-
-#: ../../include/identity.php:691 ../../mod/profile.php:16
-#: ../../mod/achievements.php:11 ../../mod/editblock.php:29
-#: ../../mod/blocks.php:29 ../../mod/connect.php:13 ../../mod/hcard.php:8
-#: ../../mod/editlayout.php:28 ../../mod/editwebpage.php:28
-#: ../../mod/filestorage.php:53 ../../mod/webpages.php:29
-#: ../../mod/layouts.php:29
-msgid "Requested profile is not available."
-msgstr ""
-
-#: ../../include/identity.php:854 ../../mod/profiles.php:774
-msgid "Change profile photo"
-msgstr ""
-
-#: ../../include/identity.php:861
-msgid "Profiles"
-msgstr ""
-
-#: ../../include/identity.php:861
-msgid "Manage/edit profiles"
-msgstr ""
-
-#: ../../include/identity.php:862 ../../mod/profiles.php:775
-msgid "Create New Profile"
-msgstr ""
-
-#: ../../include/identity.php:865 ../../include/nav.php:95
-msgid "Edit Profile"
-msgstr ""
-
-#: ../../include/identity.php:878 ../../mod/profiles.php:786
-msgid "Profile Image"
-msgstr ""
-
-#: ../../include/identity.php:881
-msgid "visible to everybody"
-msgstr ""
-
-#: ../../include/identity.php:882 ../../mod/profiles.php:669
-#: ../../mod/profiles.php:790
-msgid "Edit visibility"
-msgstr ""
-
-#: ../../include/identity.php:894 ../../include/bb2diaspora.php:450
-#: ../../include/event.php:40 ../../mod/events.php:645
-#: ../../mod/directory.php:204
-msgid "Location:"
-msgstr ""
-
-#: ../../include/identity.php:898 ../../include/identity.php:1139
-msgid "Gender:"
-msgstr ""
-
-#: ../../include/identity.php:899 ../../include/identity.php:1183
-msgid "Status:"
-msgstr ""
-
-#: ../../include/identity.php:900 ../../include/identity.php:1194
-msgid "Homepage:"
-msgstr ""
-
-#: ../../include/identity.php:901
-msgid "Online Now"
-msgstr ""
-
-#: ../../include/identity.php:983 ../../include/identity.php:1063
-#: ../../mod/ping.php:324
-msgid "g A l F d"
-msgstr ""
-
-#: ../../include/identity.php:984 ../../include/identity.php:1064
-msgid "F d"
-msgstr ""
-
-#: ../../include/identity.php:1029 ../../include/identity.php:1104
-#: ../../mod/ping.php:346
-msgid "[today]"
-msgstr ""
-
-#: ../../include/identity.php:1041
-msgid "Birthday Reminders"
-msgstr ""
-
-#: ../../include/identity.php:1042
-msgid "Birthdays this week:"
-msgstr ""
-
-#: ../../include/identity.php:1097
-msgid "[No description]"
-msgstr ""
-
-#: ../../include/identity.php:1115
-msgid "Event Reminders"
-msgstr ""
-
-#: ../../include/identity.php:1116
-msgid "Events this week:"
-msgstr ""
-
-#: ../../include/identity.php:1129 ../../include/identity.php:1246
-#: ../../include/apps.php:138 ../../mod/profperm.php:112
-msgid "Profile"
-msgstr ""
-
-#: ../../include/identity.php:1137 ../../mod/settings.php:1044
-msgid "Full Name:"
-msgstr ""
-
-#: ../../include/identity.php:1144
-msgid "Like this channel"
-msgstr ""
-
-#: ../../include/identity.php:1168
-msgid "j F, Y"
-msgstr ""
-
-#: ../../include/identity.php:1169
-msgid "j F"
-msgstr ""
-
-#: ../../include/identity.php:1176
-msgid "Birthday:"
-msgstr ""
-
-#: ../../include/identity.php:1180
-msgid "Age:"
-msgstr ""
-
-#: ../../include/identity.php:1189
-#, php-format
-msgid "for %1$d %2$s"
-msgstr ""
-
-#: ../../include/identity.php:1192 ../../mod/profiles.php:691
-msgid "Sexual Preference:"
-msgstr ""
-
-#: ../../include/identity.php:1196 ../../mod/profiles.php:693
-msgid "Hometown:"
-msgstr ""
-
-#: ../../include/identity.php:1198
-msgid "Tags:"
-msgstr ""
-
-#: ../../include/identity.php:1200 ../../mod/profiles.php:694
-msgid "Political Views:"
-msgstr ""
-
-#: ../../include/identity.php:1202
-msgid "Religion:"
-msgstr ""
-
-#: ../../include/identity.php:1204
-msgid "About:"
-msgstr ""
-
-#: ../../include/identity.php:1206
-msgid "Hobbies/Interests:"
-msgstr ""
-
-#: ../../include/identity.php:1208 ../../mod/profiles.php:697
-msgid "Likes:"
-msgstr ""
-
-#: ../../include/identity.php:1210 ../../mod/profiles.php:698
-msgid "Dislikes:"
-msgstr ""
-
-#: ../../include/identity.php:1212
-msgid "Contact information and Social Networks:"
-msgstr ""
-
-#: ../../include/identity.php:1214
-msgid "My other channels:"
-msgstr ""
-
-#: ../../include/identity.php:1216
-msgid "Musical interests:"
-msgstr ""
-
-#: ../../include/identity.php:1218
-msgid "Books, literature:"
-msgstr ""
-
-#: ../../include/identity.php:1220
-msgid "Television:"
-msgstr ""
-
-#: ../../include/identity.php:1222
-msgid "Film/dance/culture/entertainment:"
-msgstr ""
-
-#: ../../include/identity.php:1224
-msgid "Love/Romance:"
-msgstr ""
-
-#: ../../include/identity.php:1226
-msgid "Work/employment:"
-msgstr ""
-
-#: ../../include/identity.php:1228
-msgid "School/education:"
-msgstr ""
-
-#: ../../include/identity.php:1248
-msgid "Like this thing"
-msgstr ""
-
#: ../../include/message.php:18
msgid "No recipient provided."
msgstr ""
@@ -1943,7 +1812,7 @@ msgstr ""
msgid "Cannot connect to yourself."
msgstr ""
-#: ../../include/comanche.php:35 ../../mod/admin.php:357
+#: ../../include/comanche.php:35 ../../mod/admin.php:361
#: ../../view/theme/apw/php/config.php:185
msgid "Default"
msgstr ""
@@ -2040,6 +1909,19 @@ msgstr ""
msgid "Happy Birthday %1$s"
msgstr ""
+#: ../../include/Contact.php:124
+msgid "New window"
+msgstr ""
+
+#: ../../include/Contact.php:125
+msgid "Open the selected location in a different window or browser tab"
+msgstr ""
+
+#: ../../include/Contact.php:215 ../../mod/admin.php:675
+#, php-format
+msgid "User '%s' deleted"
+msgstr ""
+
#: ../../include/bb2diaspora.php:349
msgid "Attachments:"
msgstr ""
@@ -2060,6 +1942,19 @@ msgstr ""
msgid "Finishes:"
msgstr ""
+#: ../../include/zot.php:673
+msgid "Invalid data packet"
+msgstr ""
+
+#: ../../include/zot.php:689
+msgid "Unable to verify channel signature"
+msgstr ""
+
+#: ../../include/zot.php:2063
+#, php-format
+msgid "Unable to verify site signature for %s"
+msgstr ""
+
#: ../../include/chat.php:10
msgid "Missing room name"
msgstr ""
@@ -2117,8 +2012,8 @@ msgstr ""
msgid "Edit your profile"
msgstr ""
-#: ../../include/nav.php:97 ../../include/apps.php:139
-#: ../../include/conversation.php:1586 ../../mod/fbrowser.php:25
+#: ../../include/nav.php:97 ../../include/conversation.php:1586
+#: ../../include/apps.php:139 ../../mod/fbrowser.php:25
msgid "Photos"
msgstr ""
@@ -2138,8 +2033,8 @@ msgstr ""
msgid "Your chatrooms"
msgstr ""
-#: ../../include/nav.php:109 ../../include/apps.php:129
-#: ../../include/conversation.php:1621
+#: ../../include/nav.php:109 ../../include/conversation.php:1621
+#: ../../include/apps.php:129
msgid "Bookmarks"
msgstr ""
@@ -2147,8 +2042,8 @@ msgstr ""
msgid "Your bookmarks"
msgstr ""
-#: ../../include/nav.php:113 ../../include/apps.php:136
-#: ../../include/conversation.php:1632 ../../mod/webpages.php:160
+#: ../../include/nav.php:113 ../../include/conversation.php:1632
+#: ../../include/apps.php:136 ../../mod/webpages.php:160
msgid "Webpages"
msgstr ""
@@ -2207,7 +2102,7 @@ msgid "Search site content"
msgstr ""
#: ../../include/nav.php:168 ../../include/apps.php:141
-#: ../../mod/directory.php:334
+#: ../../mod/directory.php:338
msgid "Directory"
msgstr ""
@@ -2313,7 +2208,7 @@ msgstr ""
msgid "Account/Channel Settings"
msgstr ""
-#: ../../include/nav.php:218 ../../mod/admin.php:123
+#: ../../include/nav.php:218 ../../mod/admin.php:124
msgid "Admin"
msgstr ""
@@ -2339,6 +2234,73 @@ msgid ""
"form has been opened for too long (>3 hours) before submitting it."
msgstr ""
+#: ../../include/activities.php:39
+msgid " and "
+msgstr ""
+
+#: ../../include/activities.php:47
+msgid "public profile"
+msgstr ""
+
+#: ../../include/activities.php:56
+#, php-format
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+msgstr ""
+
+#: ../../include/activities.php:57
+#, php-format
+msgid "Visit %1$s's %2$s"
+msgstr ""
+
+#: ../../include/activities.php:60
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
+msgstr ""
+
+#: ../../include/dir_fns.php:96
+msgid "Directory Options"
+msgstr ""
+
+#: ../../include/dir_fns.php:97
+msgid "Alphabetic"
+msgstr ""
+
+#: ../../include/dir_fns.php:98
+msgid "Reverse Alphabetic"
+msgstr ""
+
+#: ../../include/dir_fns.php:99
+msgid "Newest to Oldest"
+msgstr ""
+
+#: ../../include/dir_fns.php:100
+msgid "Oldest to Newest"
+msgstr ""
+
+#: ../../include/dir_fns.php:101
+msgid "Public Forums Only"
+msgstr ""
+
+#: ../../include/dir_fns.php:103
+msgid "Sort"
+msgstr ""
+
+#: ../../include/dir_fns.php:119
+msgid "Enable Safe Search"
+msgstr ""
+
+#: ../../include/dir_fns.php:121
+msgid "Disable Safe Search"
+msgstr ""
+
+#: ../../include/dir_fns.php:123
+msgid "Safe Mode"
+msgstr ""
+
+#: ../../include/event.php:376
+msgid "This event has been added to your calendar."
+msgstr ""
+
#: ../../include/ItemObject.php:89 ../../include/conversation.php:652
msgid "Private Message"
msgstr ""
@@ -2506,8 +2468,8 @@ msgstr ""
#: ../../include/ItemObject.php:364 ../../include/conversation.php:725
#: ../../include/conversation.php:1198 ../../mod/editblock.php:152
#: ../../mod/editpost.php:125 ../../mod/editlayout.php:148
-#: ../../mod/editwebpage.php:183 ../../mod/mail.php:241 ../../mod/mail.php:356
-#: ../../mod/photos.php:944
+#: ../../mod/editwebpage.php:183 ../../mod/photos.php:944
+#: ../../mod/mail.php:241 ../../mod/mail.php:356
msgid "Please wait"
msgstr ""
@@ -2553,156 +2515,8 @@ msgstr ""
msgid "Encrypt text"
msgstr ""
-#: ../../include/activities.php:39
-msgid " and "
-msgstr ""
-
-#: ../../include/activities.php:47
-msgid "public profile"
-msgstr ""
-
-#: ../../include/activities.php:56
-#, php-format
-msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
-msgstr ""
-
-#: ../../include/activities.php:57
-#, php-format
-msgid "Visit %1$s's %2$s"
-msgstr ""
-
-#: ../../include/activities.php:60
-#, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
-msgstr ""
-
-#: ../../include/dir_fns.php:96
-msgid "Directory Options"
-msgstr ""
-
-#: ../../include/dir_fns.php:97
-msgid "Alphabetic"
-msgstr ""
-
-#: ../../include/dir_fns.php:98
-msgid "Reverse Alphabetic"
-msgstr ""
-
-#: ../../include/dir_fns.php:99
-msgid "Newest to Oldest"
-msgstr ""
-
-#: ../../include/dir_fns.php:100
-msgid "Oldest to Newest"
-msgstr ""
-
-#: ../../include/dir_fns.php:101
-msgid "Public Forums Only"
-msgstr ""
-
-#: ../../include/dir_fns.php:103
-msgid "Sort"
-msgstr ""
-
-#: ../../include/dir_fns.php:119
-msgid "Enable Safe Search"
-msgstr ""
-
-#: ../../include/dir_fns.php:121
-msgid "Disable Safe Search"
-msgstr ""
-
-#: ../../include/dir_fns.php:123
-msgid "Safe Mode"
-msgstr ""
-
-#: ../../include/items.php:382 ../../mod/subthread.php:49
-#: ../../mod/group.php:68 ../../mod/profperm.php:23 ../../mod/like.php:270
-#: ../../index.php:389
-msgid "Permission denied"
-msgstr ""
-
-#: ../../include/items.php:979 ../../include/items.php:1024
-msgid "(Unknown)"
-msgstr ""
-
-#: ../../include/items.php:1181
-msgid "Visible to anybody on the internet."
-msgstr ""
-
-#: ../../include/items.php:1183
-msgid "Visible to you only."
-msgstr ""
-
-#: ../../include/items.php:1185
-msgid "Visible to anybody in this network."
-msgstr ""
-
-#: ../../include/items.php:1187
-msgid "Visible to anybody authenticated."
-msgstr ""
-
-#: ../../include/items.php:1189
-#, php-format
-msgid "Visible to anybody on %s."
-msgstr ""
-
-#: ../../include/items.php:1191
-msgid "Visible to all connections."
-msgstr ""
-
-#: ../../include/items.php:1193
-msgid "Visible to approved connections."
-msgstr ""
-
-#: ../../include/items.php:1195
-msgid "Visible to specific connections."
-msgstr ""
-
-#: ../../include/items.php:4002 ../../mod/thing.php:76
-#: ../../mod/display.php:32 ../../mod/filestorage.php:27
-#: ../../mod/viewsrc.php:20 ../../mod/admin.php:168 ../../mod/admin.php:901
-#: ../../mod/admin.php:1104
-msgid "Item not found."
-msgstr ""
-
-#: ../../include/items.php:4455 ../../mod/group.php:38 ../../mod/group.php:140
-msgid "Collection not found."
-msgstr ""
-
-#: ../../include/items.php:4470
-msgid "Collection is empty."
-msgstr ""
-
-#: ../../include/items.php:4477
-#, php-format
-msgid "Collection: %s"
-msgstr ""
-
-#: ../../include/items.php:4488
-#, php-format
-msgid "Connection: %s"
-msgstr ""
-
-#: ../../include/items.php:4491
-msgid "Connection not found."
-msgstr ""
-
-#: ../../include/event.php:376
-msgid "This event has been added to your calendar."
-msgstr ""
-
-#: ../../include/Contact.php:124
-msgid "New window"
-msgstr ""
-
-#: ../../include/Contact.php:125
-msgid "Open the selected location in a different window or browser tab"
-msgstr ""
-
-#: ../../include/Contact.php:215 ../../mod/admin.php:651
-#, php-format
-msgid "User '%s' deleted"
+#: ../../include/api.php:1081
+msgid "Public Timeline"
msgstr ""
#: ../../include/network.php:613
@@ -2758,480 +2572,289 @@ msgstr ""
msgid "$1 wrote:"
msgstr ""
-#: ../../include/contact_widgets.php:14
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/contact_widgets.php:19 ../../mod/admin.php:420
-msgid "Advanced"
-msgstr ""
-
-#: ../../include/contact_widgets.php:22
-msgid "Find Channels"
-msgstr ""
-
-#: ../../include/contact_widgets.php:23
-msgid "Enter name or interest"
-msgstr ""
-
-#: ../../include/contact_widgets.php:24
-msgid "Connect/Follow"
-msgstr ""
-
-#: ../../include/contact_widgets.php:25
-msgid "Examples: Robert Morgenstein, Fishing"
+#: ../../include/auth.php:130
+msgid "Logged out."
msgstr ""
-#: ../../include/contact_widgets.php:26 ../../mod/connections.php:413
-#: ../../mod/directory.php:330 ../../mod/directory.php:335
-msgid "Find"
+#: ../../include/auth.php:271
+msgid "Failed authentication"
msgstr ""
-#: ../../include/contact_widgets.php:27 ../../mod/suggest.php:59
-#: ../../mod/directory.php:334
-msgid "Channel Suggestions"
+#: ../../include/auth.php:285 ../../mod/openid.php:190
+msgid "Login failed."
msgstr ""
-#: ../../include/contact_widgets.php:29
-msgid "Random Profile"
+#: ../../include/enotify.php:41
+msgid "Red Matrix Notification"
msgstr ""
-#: ../../include/contact_widgets.php:30
-msgid "Invite Friends"
+#: ../../include/enotify.php:42
+msgid "redmatrix"
msgstr ""
-#: ../../include/contact_widgets.php:32
-msgid "Advanced example: name=fred and country=iceland"
+#: ../../include/enotify.php:44
+msgid "Thank You,"
msgstr ""
-#: ../../include/contact_widgets.php:125
+#: ../../include/enotify.php:46
#, php-format
-msgid "%d connection in common"
-msgid_plural "%d connections in common"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/contact_widgets.php:130
-msgid "show more"
-msgstr ""
-
-#: ../../include/acl_selectors.php:240
-msgid "Visible to your default audience"
-msgstr ""
-
-#: ../../include/acl_selectors.php:241
-msgid "Show"
-msgstr ""
-
-#: ../../include/acl_selectors.php:242
-msgid "Don't show"
-msgstr ""
-
-#: ../../include/acl_selectors.php:248 ../../mod/events.php:652
-#: ../../mod/chat.php:209 ../../mod/filestorage.php:146
-#: ../../mod/photos.php:559 ../../mod/photos.php:916
-msgid "Permissions"
-msgstr ""
-
-#: ../../include/api.php:1081
-msgid "Public Timeline"
-msgstr ""
-
-#: ../../include/zot.php:673
-msgid "Invalid data packet"
-msgstr ""
-
-#: ../../include/zot.php:689
-msgid "Unable to verify channel signature"
+msgid "%s Administrator"
msgstr ""
-#: ../../include/zot.php:1961
+#: ../../include/enotify.php:81
#, php-format
-msgid "Unable to verify site signature for %s"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23
-msgid "Male"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23
-msgid "Female"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Currently Male"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Currently Female"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Male"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Mostly Female"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Transgender"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Intersex"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Transsexual"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Hermaphrodite"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Neuter"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Non-specific"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23
-#: ../../include/profile_selectors.php:61
-#: ../../include/profile_selectors.php:97 ../../include/permissions.php:814
-msgid "Other"
-msgstr ""
-
-#: ../../include/profile_selectors.php:6
-msgid "Undecided"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-#: ../../include/profile_selectors.php:61
-msgid "Males"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-#: ../../include/profile_selectors.php:61
-msgid "Females"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Gay"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Lesbian"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "No Preference"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Bisexual"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Autosexual"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Abstinent"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Virgin"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Deviant"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Fetish"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Oodles"
-msgstr ""
-
-#: ../../include/profile_selectors.php:42
-msgid "Nonsexual"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Single"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Lonely"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Available"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Unavailable"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Has crush"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Infatuated"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Dating"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Unfaithful"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Sex Addict"
-msgstr ""
-
-#: ../../include/profile_selectors.php:80
-msgid "Friends/Benefits"
+msgid "%s <!item_type!>"
msgstr ""
-#: ../../include/profile_selectors.php:80
-msgid "Casual"
+#: ../../include/enotify.php:85
+#, php-format
+msgid "[Red:Notify] New mail received at %s"
msgstr ""
-#: ../../include/profile_selectors.php:80
-msgid "Engaged"
+#: ../../include/enotify.php:87
+#, php-format
+msgid "%1$s, %2$s sent you a new private message at %3$s."
msgstr ""
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Married"
+#: ../../include/enotify.php:88
+#, php-format
+msgid "%1$s sent you %2$s."
msgstr ""
-#: ../../include/profile_selectors.php:80
-msgid "Imaginarily married"
+#: ../../include/enotify.php:88
+msgid "a private message"
msgstr ""
-#: ../../include/profile_selectors.php:80
-msgid "Partners"
+#: ../../include/enotify.php:89
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
msgstr ""
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Cohabiting"
+#: ../../include/enotify.php:144
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
msgstr ""
-#: ../../include/profile_selectors.php:80
-msgid "Common law"
+#: ../../include/enotify.php:152
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
msgstr ""
-#: ../../include/profile_selectors.php:80
-msgid "Happy"
+#: ../../include/enotify.php:161
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
msgstr ""
-#: ../../include/profile_selectors.php:80
-msgid "Not looking"
+#: ../../include/enotify.php:172
+#, php-format
+msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
msgstr ""
-#: ../../include/profile_selectors.php:80
-msgid "Swinger"
+#: ../../include/enotify.php:173
+#, php-format
+msgid "%1$s, %2$s commented on an item/conversation you have been following."
msgstr ""
-#: ../../include/profile_selectors.php:80
-msgid "Betrayed"
+#: ../../include/enotify.php:176 ../../include/enotify.php:191
+#: ../../include/enotify.php:217 ../../include/enotify.php:236
+#: ../../include/enotify.php:250
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
msgstr ""
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Separated"
+#: ../../include/enotify.php:182
+#, php-format
+msgid "[Red:Notify] %s posted to your profile wall"
msgstr ""
-#: ../../include/profile_selectors.php:80
-msgid "Unstable"
+#: ../../include/enotify.php:184
+#, php-format
+msgid "%1$s, %2$s posted to your profile wall at %3$s"
msgstr ""
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Divorced"
+#: ../../include/enotify.php:186
+#, php-format
+msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
msgstr ""
-#: ../../include/profile_selectors.php:80
-msgid "Imaginarily divorced"
+#: ../../include/enotify.php:210
+#, php-format
+msgid "[Red:Notify] %s tagged you"
msgstr ""
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "Widowed"
+#: ../../include/enotify.php:211
+#, php-format
+msgid "%1$s, %2$s tagged you at %3$s"
msgstr ""
-#: ../../include/profile_selectors.php:80
-msgid "Uncertain"
+#: ../../include/enotify.php:212
+#, php-format
+msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
msgstr ""
-#: ../../include/profile_selectors.php:80
-#: ../../include/profile_selectors.php:97
-msgid "It's complicated"
+#: ../../include/enotify.php:225
+#, php-format
+msgid "[Red:Notify] %1$s poked you"
msgstr ""
-#: ../../include/profile_selectors.php:80
-msgid "Don't care"
+#: ../../include/enotify.php:226
+#, php-format
+msgid "%1$s, %2$s poked you at %3$s"
msgstr ""
-#: ../../include/profile_selectors.php:80
-msgid "Ask me"
+#: ../../include/enotify.php:227
+#, php-format
+msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
msgstr ""
-#: ../../include/apps.php:128
-msgid "Site Admin"
+#: ../../include/enotify.php:243
+#, php-format
+msgid "[Red:Notify] %s tagged your post"
msgstr ""
-#: ../../include/apps.php:130
-msgid "Address Book"
+#: ../../include/enotify.php:244
+#, php-format
+msgid "%1$s, %2$s tagged your post at %3$s"
msgstr ""
-#: ../../include/apps.php:144 ../../mod/mood.php:130
-msgid "Mood"
+#: ../../include/enotify.php:245
+#, php-format
+msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
msgstr ""
-#: ../../include/apps.php:145 ../../include/conversation.php:943
-msgid "Poke"
+#: ../../include/enotify.php:257
+msgid "[Red:Notify] Introduction received"
msgstr ""
-#: ../../include/apps.php:148
-msgid "Probe"
+#: ../../include/enotify.php:258
+#, php-format
+msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
msgstr ""
-#: ../../include/apps.php:149
-msgid "Suggest"
+#: ../../include/enotify.php:259
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
msgstr ""
-#: ../../include/apps.php:150
-msgid "Random Channel"
+#: ../../include/enotify.php:263 ../../include/enotify.php:282
+#, php-format
+msgid "You may visit their profile at %s"
msgstr ""
-#: ../../include/apps.php:151
-msgid "Invite"
+#: ../../include/enotify.php:265
+#, php-format
+msgid "Please visit %s to approve or reject the connection request."
msgstr ""
-#: ../../include/apps.php:152
-msgid "Features"
+#: ../../include/enotify.php:272
+msgid "[Red:Notify] Friend suggestion received"
msgstr ""
-#: ../../include/apps.php:153
-msgid "Language"
+#: ../../include/enotify.php:273
+#, php-format
+msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
msgstr ""
-#: ../../include/apps.php:154
-msgid "Post"
+#: ../../include/enotify.php:274
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s."
msgstr ""
-#: ../../include/apps.php:155
-msgid "Profile Photo"
+#: ../../include/enotify.php:280
+msgid "Name:"
msgstr ""
-#: ../../include/apps.php:247 ../../mod/settings.php:81
-#: ../../mod/settings.php:609
-msgid "Update"
+#: ../../include/enotify.php:281
+msgid "Photo:"
msgstr ""
-#: ../../include/apps.php:247
-msgid "Install"
+#: ../../include/enotify.php:284
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
msgstr ""
-#: ../../include/apps.php:252
-msgid "Purchase"
+#: ../../include/enotify.php:499
+msgid "[Red:Notify]"
msgstr ""
-#: ../../include/account.php:23
-msgid "Not a valid email address"
-msgstr ""
+#: ../../include/contact_widgets.php:14
+#, php-format
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] ""
+msgstr[1] ""
-#: ../../include/account.php:25
-msgid "Your email domain is not among those allowed on this site"
+#: ../../include/contact_widgets.php:19 ../../mod/admin.php:424
+msgid "Advanced"
msgstr ""
-#: ../../include/account.php:31
-msgid "Your email address is already registered at this site."
+#: ../../include/contact_widgets.php:22
+msgid "Find Channels"
msgstr ""
-#: ../../include/account.php:64
-msgid "An invitation is required."
+#: ../../include/contact_widgets.php:23
+msgid "Enter name or interest"
msgstr ""
-#: ../../include/account.php:68
-msgid "Invitation could not be verified."
+#: ../../include/contact_widgets.php:24
+msgid "Connect/Follow"
msgstr ""
-#: ../../include/account.php:119
-msgid "Please enter the required information."
+#: ../../include/contact_widgets.php:25
+msgid "Examples: Robert Morgenstein, Fishing"
msgstr ""
-#: ../../include/account.php:187
-msgid "Failed to store account information."
+#: ../../include/contact_widgets.php:26 ../../mod/connections.php:413
+#: ../../mod/directory.php:334 ../../mod/directory.php:339
+msgid "Find"
msgstr ""
-#: ../../include/account.php:245
-#, php-format
-msgid "Registration confirmation for %s"
+#: ../../include/contact_widgets.php:27 ../../mod/directory.php:338
+#: ../../mod/suggest.php:59
+msgid "Channel Suggestions"
msgstr ""
-#: ../../include/account.php:313
-#, php-format
-msgid "Registration request at %s"
+#: ../../include/contact_widgets.php:29
+msgid "Random Profile"
msgstr ""
-#: ../../include/account.php:315 ../../include/account.php:342
-#: ../../include/account.php:399
-msgid "Administrator"
+#: ../../include/contact_widgets.php:30
+msgid "Invite Friends"
msgstr ""
-#: ../../include/account.php:337
-msgid "your registration password"
+#: ../../include/contact_widgets.php:32
+msgid "Advanced example: name=fred and country=iceland"
msgstr ""
-#: ../../include/account.php:340 ../../include/account.php:397
+#: ../../include/contact_widgets.php:125
#, php-format
-msgid "Registration details for %s"
-msgstr ""
-
-#: ../../include/account.php:406
-msgid "Account approved."
-msgstr ""
+msgid "%d connection in common"
+msgid_plural "%d connections in common"
+msgstr[0] ""
+msgstr[1] ""
-#: ../../include/account.php:440
-#, php-format
-msgid "Registration revoked for %s"
+#: ../../include/contact_widgets.php:130
+msgid "show more"
msgstr ""
-#: ../../include/account.php:486
-msgid "Account verified. Please login."
+#: ../../include/acl_selectors.php:240
+msgid "Visible to your default audience"
msgstr ""
-#: ../../include/account.php:674 ../../include/account.php:676
-msgid "Click here to upgrade."
+#: ../../include/acl_selectors.php:241
+msgid "Show"
msgstr ""
-#: ../../include/account.php:682
-msgid "This action exceeds the limits set by your subscription plan."
+#: ../../include/acl_selectors.php:242
+msgid "Don't show"
msgstr ""
-#: ../../include/account.php:687
-msgid "This action is not available under your subscription plan."
+#: ../../include/acl_selectors.php:248 ../../mod/events.php:652
+#: ../../mod/chat.php:209 ../../mod/filestorage.php:146
+#: ../../mod/photos.php:559 ../../mod/photos.php:916
+msgid "Permissions"
msgstr ""
#: ../../include/conversation.php:126 ../../mod/like.php:113
@@ -3352,6 +2975,10 @@ msgstr ""
msgid "Send PM"
msgstr ""
+#: ../../include/conversation.php:943 ../../include/apps.php:145
+msgid "Poke"
+msgstr ""
+
#: ../../include/conversation.php:1061
#, php-format
msgid "%s likes this."
@@ -3433,7 +3060,7 @@ msgstr ""
#: ../../include/conversation.php:1170 ../../mod/editblock.php:198
#: ../../mod/editlayout.php:193 ../../mod/editwebpage.php:230
-#: ../../mod/layouts.php:168 ../../mod/photos.php:943
+#: ../../mod/photos.php:943 ../../mod/layouts.php:168
msgid "Share"
msgstr ""
@@ -3555,15 +3182,15 @@ msgstr ""
msgid "Set expiration date"
msgstr ""
-#: ../../include/conversation.php:1226 ../../mod/editpost.php:154
-#: ../../mod/events.php:635
+#: ../../include/conversation.php:1226 ../../mod/events.php:635
+#: ../../mod/editpost.php:154
msgid "OK"
msgstr ""
-#: ../../include/conversation.php:1227 ../../mod/editpost.php:155
-#: ../../mod/events.php:634 ../../mod/fbrowser.php:82
-#: ../../mod/fbrowser.php:117 ../../mod/settings.php:584
-#: ../../mod/settings.php:610 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
+#: ../../include/conversation.php:1227 ../../mod/tagrm.php:11
+#: ../../mod/tagrm.php:134 ../../mod/events.php:634 ../../mod/fbrowser.php:82
+#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:155
+#: ../../mod/settings.php:584 ../../mod/settings.php:610
msgid "Cancel"
msgstr ""
@@ -3620,7 +3247,7 @@ msgstr ""
msgid "Posts flagged as SPAM"
msgstr ""
-#: ../../include/conversation.php:1565 ../../mod/admin.php:870
+#: ../../include/conversation.php:1565 ../../mod/admin.php:894
msgid "Channel"
msgstr ""
@@ -3694,609 +3321,690 @@ msgid_plural "Abstains"
msgstr[0] ""
msgstr[1] ""
-#: ../../include/oembed.php:171
-msgid "Embedded content"
+#: ../../include/profile_selectors.php:6
+#: ../../include/profile_selectors.php:23
+msgid "Male"
msgstr ""
-#: ../../include/oembed.php:180
-msgid "Embedding disabled"
+#: ../../include/profile_selectors.php:6
+#: ../../include/profile_selectors.php:23
+msgid "Female"
msgstr ""
-#: ../../include/permissions.php:26
-msgid "Can view my normal stream and posts"
+#: ../../include/profile_selectors.php:6
+msgid "Currently Male"
msgstr ""
-#: ../../include/permissions.php:27
-msgid "Can view my default channel profile"
+#: ../../include/profile_selectors.php:6
+msgid "Currently Female"
msgstr ""
-#: ../../include/permissions.php:28
-msgid "Can view my photo albums"
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Male"
msgstr ""
-#: ../../include/permissions.php:29
-msgid "Can view my connections"
+#: ../../include/profile_selectors.php:6
+msgid "Mostly Female"
msgstr ""
-#: ../../include/permissions.php:30
-msgid "Can view my file storage"
+#: ../../include/profile_selectors.php:6
+msgid "Transgender"
msgstr ""
-#: ../../include/permissions.php:31
-msgid "Can view my webpages"
+#: ../../include/profile_selectors.php:6
+msgid "Intersex"
msgstr ""
-#: ../../include/permissions.php:34
-msgid "Can send me their channel stream and posts"
+#: ../../include/profile_selectors.php:6
+msgid "Transsexual"
msgstr ""
-#: ../../include/permissions.php:35
-msgid "Can post on my channel page (\"wall\")"
+#: ../../include/profile_selectors.php:6
+msgid "Hermaphrodite"
msgstr ""
-#: ../../include/permissions.php:36
-msgid "Can comment on or like my posts"
+#: ../../include/profile_selectors.php:6
+msgid "Neuter"
msgstr ""
-#: ../../include/permissions.php:37
-msgid "Can send me private mail messages"
+#: ../../include/profile_selectors.php:6
+msgid "Non-specific"
msgstr ""
-#: ../../include/permissions.php:38
-msgid "Can post photos to my photo albums"
+#: ../../include/profile_selectors.php:6
+#: ../../include/profile_selectors.php:23
+#: ../../include/profile_selectors.php:61
+#: ../../include/profile_selectors.php:97 ../../include/permissions.php:814
+msgid "Other"
msgstr ""
-#: ../../include/permissions.php:39
-msgid "Can like/dislike stuff"
+#: ../../include/profile_selectors.php:6
+msgid "Undecided"
msgstr ""
-#: ../../include/permissions.php:39
-msgid "Profiles and things other than posts/comments"
+#: ../../include/profile_selectors.php:42
+#: ../../include/profile_selectors.php:61
+msgid "Males"
msgstr ""
-#: ../../include/permissions.php:41
-msgid "Can forward to all my channel contacts via post @mentions"
+#: ../../include/profile_selectors.php:42
+#: ../../include/profile_selectors.php:61
+msgid "Females"
msgstr ""
-#: ../../include/permissions.php:41
-msgid "Advanced - useful for creating group forum channels"
+#: ../../include/profile_selectors.php:42
+msgid "Gay"
msgstr ""
-#: ../../include/permissions.php:42
-msgid "Can chat with me (when available)"
+#: ../../include/profile_selectors.php:42
+msgid "Lesbian"
msgstr ""
-#: ../../include/permissions.php:43
-msgid "Can write to my file storage"
+#: ../../include/profile_selectors.php:42
+msgid "No Preference"
msgstr ""
-#: ../../include/permissions.php:44
-msgid "Can edit my webpages"
+#: ../../include/profile_selectors.php:42
+msgid "Bisexual"
msgstr ""
-#: ../../include/permissions.php:46
-msgid "Can source my public posts in derived channels"
+#: ../../include/profile_selectors.php:42
+msgid "Autosexual"
msgstr ""
-#: ../../include/permissions.php:46
-msgid "Somewhat advanced - very useful in open communities"
+#: ../../include/profile_selectors.php:42
+msgid "Abstinent"
msgstr ""
-#: ../../include/permissions.php:48
-msgid "Can administer my channel resources"
+#: ../../include/profile_selectors.php:42
+msgid "Virgin"
msgstr ""
-#: ../../include/permissions.php:48
-msgid "Extremely advanced. Leave this alone unless you know what you are doing"
+#: ../../include/profile_selectors.php:42
+msgid "Deviant"
msgstr ""
-#: ../../include/permissions.php:810
-msgid "Social Networking"
+#: ../../include/profile_selectors.php:42
+msgid "Fetish"
msgstr ""
-#: ../../include/permissions.php:810 ../../include/permissions.php:811
-#: ../../include/permissions.php:812
-msgid "Mostly Public"
+#: ../../include/profile_selectors.php:42
+msgid "Oodles"
msgstr ""
-#: ../../include/permissions.php:810 ../../include/permissions.php:811
-#: ../../include/permissions.php:812
-msgid "Restricted"
+#: ../../include/profile_selectors.php:42
+msgid "Nonsexual"
msgstr ""
-#: ../../include/permissions.php:810 ../../include/permissions.php:811
-msgid "Private"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Single"
msgstr ""
-#: ../../include/permissions.php:811
-msgid "Community Forum"
+#: ../../include/profile_selectors.php:80
+msgid "Lonely"
msgstr ""
-#: ../../include/permissions.php:812
-msgid "Feed Republish"
+#: ../../include/profile_selectors.php:80
+msgid "Available"
msgstr ""
-#: ../../include/permissions.php:813
-msgid "Special Purpose"
+#: ../../include/profile_selectors.php:80
+msgid "Unavailable"
msgstr ""
-#: ../../include/permissions.php:813
-msgid "Celebrity/Soapbox"
+#: ../../include/profile_selectors.php:80
+msgid "Has crush"
msgstr ""
-#: ../../include/permissions.php:813
-msgid "Group Repository"
+#: ../../include/profile_selectors.php:80
+msgid "Infatuated"
msgstr ""
-#: ../../include/permissions.php:814
-msgid "Custom/Expert Mode"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Dating"
msgstr ""
-#: ../../mod/achievements.php:34
-msgid "Some blurb about what to do when you're new here"
+#: ../../include/profile_selectors.php:80
+msgid "Unfaithful"
msgstr ""
-#: ../../mod/editblock.php:79 ../../mod/editblock.php:95
-#: ../../mod/editpost.php:20 ../../mod/editlayout.php:78
-#: ../../mod/editwebpage.php:77
-msgid "Item not found"
+#: ../../include/profile_selectors.php:80
+msgid "Sex Addict"
msgstr ""
-#: ../../mod/editblock.php:115
-msgid "Edit Block"
+#: ../../include/profile_selectors.php:80
+msgid "Friends/Benefits"
msgstr ""
-#: ../../mod/editblock.php:125
-msgid "Delete block?"
+#: ../../include/profile_selectors.php:80
+msgid "Casual"
msgstr ""
-#: ../../mod/editblock.php:147 ../../mod/editpost.php:117
-#: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:178
-msgid "Insert YouTube video"
+#: ../../include/profile_selectors.php:80
+msgid "Engaged"
msgstr ""
-#: ../../mod/editblock.php:148 ../../mod/editpost.php:118
-#: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:179
-msgid "Insert Vorbis [.ogg] video"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Married"
msgstr ""
-#: ../../mod/editblock.php:149 ../../mod/editpost.php:119
-#: ../../mod/editlayout.php:145 ../../mod/editwebpage.php:180
-msgid "Insert Vorbis [.ogg] audio"
+#: ../../include/profile_selectors.php:80
+msgid "Imaginarily married"
msgstr ""
-#: ../../mod/editblock.php:183
-msgid "Delete Block"
+#: ../../include/profile_selectors.php:80
+msgid "Partners"
msgstr ""
-#: ../../mod/manage.php:136
-#, php-format
-msgid "You have created %1$.0f of %2$.0f allowed channels."
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Cohabiting"
msgstr ""
-#: ../../mod/manage.php:144
-msgid "Create a new channel"
+#: ../../include/profile_selectors.php:80
+msgid "Common law"
msgstr ""
-#: ../../mod/manage.php:149
-msgid "Current Channel"
+#: ../../include/profile_selectors.php:80
+msgid "Happy"
msgstr ""
-#: ../../mod/manage.php:151
-msgid "Switch to one of your channels by selecting it."
+#: ../../include/profile_selectors.php:80
+msgid "Not looking"
msgstr ""
-#: ../../mod/manage.php:152
-msgid "Default Channel"
+#: ../../include/profile_selectors.php:80
+msgid "Swinger"
msgstr ""
-#: ../../mod/manage.php:153
-msgid "Make Default"
+#: ../../include/profile_selectors.php:80
+msgid "Betrayed"
msgstr ""
-#: ../../mod/manage.php:156
-#, php-format
-msgid "%d new messages"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Separated"
msgstr ""
-#: ../../mod/manage.php:157
-#, php-format
-msgid "%d new introductions"
+#: ../../include/profile_selectors.php:80
+msgid "Unstable"
msgstr ""
-#: ../../mod/xchan.php:6
-msgid "Xchan Lookup"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Divorced"
msgstr ""
-#: ../../mod/xchan.php:9
-msgid "Lookup xchan beginning with (or webbie): "
+#: ../../include/profile_selectors.php:80
+msgid "Imaginarily divorced"
msgstr ""
-#: ../../mod/xchan.php:37 ../../mod/menu.php:136 ../../mod/mitem.php:111
-msgid "Not found."
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "Widowed"
msgstr ""
-#: ../../mod/api.php:76 ../../mod/api.php:102
-msgid "Authorize application connection"
+#: ../../include/profile_selectors.php:80
+msgid "Uncertain"
msgstr ""
-#: ../../mod/api.php:77
-msgid "Return to your app and insert this Securty Code:"
+#: ../../include/profile_selectors.php:80
+#: ../../include/profile_selectors.php:97
+msgid "It's complicated"
msgstr ""
-#: ../../mod/api.php:89
-msgid "Please login to continue."
+#: ../../include/profile_selectors.php:80
+msgid "Don't care"
msgstr ""
-#: ../../mod/api.php:104
-msgid ""
-"Do you want to authorize this application to access your posts and contacts, "
-"and/or create new posts for you?"
+#: ../../include/profile_selectors.php:80
+msgid "Ask me"
msgstr ""
-#: ../../mod/api.php:105 ../../mod/settings.php:974 ../../mod/settings.php:979
-#: ../../mod/settings.php:1064 ../../mod/admin.php:396
-msgid "Yes"
+#: ../../include/apps.php:128
+msgid "Site Admin"
msgstr ""
-#: ../../mod/api.php:106 ../../mod/settings.php:974 ../../mod/settings.php:979
-#: ../../mod/settings.php:1064 ../../mod/admin.php:394
-msgid "No"
+#: ../../include/apps.php:130
+msgid "Address Book"
msgstr ""
-#: ../../mod/blocks.php:99
-msgid "Block Name"
+#: ../../include/apps.php:144 ../../mod/mood.php:130
+msgid "Mood"
msgstr ""
-#: ../../mod/connedit.php:75 ../../mod/connections.php:37
-msgid "Could not access contact record."
+#: ../../include/apps.php:148
+msgid "Probe"
msgstr ""
-#: ../../mod/connedit.php:99 ../../mod/connections.php:51
-msgid "Could not locate selected profile."
+#: ../../include/apps.php:149
+msgid "Suggest"
msgstr ""
-#: ../../mod/connedit.php:204 ../../mod/connections.php:94
-msgid "Connection updated."
+#: ../../include/apps.php:150
+msgid "Random Channel"
msgstr ""
-#: ../../mod/connedit.php:206 ../../mod/connections.php:96
-msgid "Failed to update connection record."
+#: ../../include/apps.php:151
+msgid "Invite"
msgstr ""
-#: ../../mod/connedit.php:252
-msgid "is now connected to"
+#: ../../include/apps.php:152
+msgid "Features"
msgstr ""
-#: ../../mod/connedit.php:365
-msgid "Could not access address book record."
+#: ../../include/apps.php:153
+msgid "Language"
msgstr ""
-#: ../../mod/connedit.php:379
-msgid "Refresh failed - channel is currently unavailable."
+#: ../../include/apps.php:154
+msgid "Post"
msgstr ""
-#: ../../mod/connedit.php:386
-msgid "Channel has been unblocked"
+#: ../../include/apps.php:155
+msgid "Profile Photo"
msgstr ""
-#: ../../mod/connedit.php:387
-msgid "Channel has been blocked"
+#: ../../include/apps.php:247 ../../mod/settings.php:81
+#: ../../mod/settings.php:609
+msgid "Update"
msgstr ""
-#: ../../mod/connedit.php:391 ../../mod/connedit.php:403
-#: ../../mod/connedit.php:415 ../../mod/connedit.php:427
-#: ../../mod/connedit.php:443
-msgid "Unable to set address book parameters."
+#: ../../include/apps.php:247
+msgid "Install"
msgstr ""
-#: ../../mod/connedit.php:398
-msgid "Channel has been unignored"
+#: ../../include/apps.php:252
+msgid "Purchase"
msgstr ""
-#: ../../mod/connedit.php:399
-msgid "Channel has been ignored"
+#: ../../include/account.php:23
+msgid "Not a valid email address"
msgstr ""
-#: ../../mod/connedit.php:410
-msgid "Channel has been unarchived"
+#: ../../include/account.php:25
+msgid "Your email domain is not among those allowed on this site"
msgstr ""
-#: ../../mod/connedit.php:411
-msgid "Channel has been archived"
+#: ../../include/account.php:31
+msgid "Your email address is already registered at this site."
msgstr ""
-#: ../../mod/connedit.php:422
-msgid "Channel has been unhidden"
+#: ../../include/account.php:64
+msgid "An invitation is required."
msgstr ""
-#: ../../mod/connedit.php:423
-msgid "Channel has been hidden"
+#: ../../include/account.php:68
+msgid "Invitation could not be verified."
msgstr ""
-#: ../../mod/connedit.php:438
-msgid "Channel has been approved"
+#: ../../include/account.php:119
+msgid "Please enter the required information."
msgstr ""
-#: ../../mod/connedit.php:439
-msgid "Channel has been unapproved"
+#: ../../include/account.php:187
+msgid "Failed to store account information."
msgstr ""
-#: ../../mod/connedit.php:467
-msgid "Connection has been removed."
+#: ../../include/account.php:245
+#, php-format
+msgid "Registration confirmation for %s"
msgstr ""
-#: ../../mod/connedit.php:487
+#: ../../include/account.php:313
#, php-format
-msgid "View %s's profile"
+msgid "Registration request at %s"
msgstr ""
-#: ../../mod/connedit.php:491
-msgid "Refresh Permissions"
+#: ../../include/account.php:315 ../../include/account.php:342
+#: ../../include/account.php:399
+msgid "Administrator"
msgstr ""
-#: ../../mod/connedit.php:494
-msgid "Fetch updated permissions"
+#: ../../include/account.php:337
+msgid "your registration password"
msgstr ""
-#: ../../mod/connedit.php:498
-msgid "Recent Activity"
+#: ../../include/account.php:340 ../../include/account.php:397
+#, php-format
+msgid "Registration details for %s"
msgstr ""
-#: ../../mod/connedit.php:501
-msgid "View recent posts and comments"
+#: ../../include/account.php:406
+msgid "Account approved."
msgstr ""
-#: ../../mod/connedit.php:507 ../../mod/connedit.php:694
-#: ../../mod/admin.php:737
-msgid "Unblock"
+#: ../../include/account.php:440
+#, php-format
+msgid "Registration revoked for %s"
msgstr ""
-#: ../../mod/connedit.php:507 ../../mod/connedit.php:694
-#: ../../mod/admin.php:736
-msgid "Block"
+#: ../../include/account.php:486
+msgid "Account verified. Please login."
msgstr ""
-#: ../../mod/connedit.php:510
-msgid "Block (or Unblock) all communications with this connection"
+#: ../../include/account.php:674 ../../include/account.php:676
+msgid "Click here to upgrade."
msgstr ""
-#: ../../mod/connedit.php:514 ../../mod/connedit.php:695
-msgid "Unignore"
+#: ../../include/account.php:682
+msgid "This action exceeds the limits set by your subscription plan."
msgstr ""
-#: ../../mod/connedit.php:514 ../../mod/connedit.php:695
-#: ../../mod/notifications.php:51
-msgid "Ignore"
+#: ../../include/account.php:687
+msgid "This action is not available under your subscription plan."
msgstr ""
-#: ../../mod/connedit.php:517
-msgid "Ignore (or Unignore) all inbound communications from this connection"
+#: ../../include/oembed.php:171
+msgid "Embedded content"
msgstr ""
-#: ../../mod/connedit.php:520
-msgid "Unarchive"
+#: ../../include/oembed.php:180
+msgid "Embedding disabled"
msgstr ""
-#: ../../mod/connedit.php:520
-msgid "Archive"
+#: ../../include/permissions.php:26
+msgid "Can view my normal stream and posts"
msgstr ""
-#: ../../mod/connedit.php:523
-msgid ""
-"Archive (or Unarchive) this connection - mark channel dead but keep content"
+#: ../../include/permissions.php:27
+msgid "Can view my default channel profile"
msgstr ""
-#: ../../mod/connedit.php:526
-msgid "Unhide"
+#: ../../include/permissions.php:28
+msgid "Can view my photo albums"
msgstr ""
-#: ../../mod/connedit.php:526
-msgid "Hide"
+#: ../../include/permissions.php:29
+msgid "Can view my connections"
msgstr ""
-#: ../../mod/connedit.php:529
-msgid "Hide or Unhide this connection from your other connections"
+#: ../../include/permissions.php:30
+msgid "Can view my file storage"
msgstr ""
-#: ../../mod/connedit.php:536
-msgid "Delete this connection"
+#: ../../include/permissions.php:31
+msgid "Can view my webpages"
msgstr ""
-#: ../../mod/connedit.php:611 ../../mod/connedit.php:649
-msgid "Approve this connection"
+#: ../../include/permissions.php:34
+msgid "Can send me their channel stream and posts"
msgstr ""
-#: ../../mod/connedit.php:611
-msgid "Accept connection to allow communication"
+#: ../../include/permissions.php:35
+msgid "Can post on my channel page (\"wall\")"
msgstr ""
-#: ../../mod/connedit.php:627
-#, php-format
-msgid "Connections: settings for %s"
+#: ../../include/permissions.php:36
+msgid "Can comment on or like my posts"
msgstr ""
-#: ../../mod/connedit.php:628
-msgid "Apply these permissions automatically"
+#: ../../include/permissions.php:37
+msgid "Can send me private mail messages"
msgstr ""
-#: ../../mod/connedit.php:632
-msgid "Apply the permissions indicated on this page to all new connections."
+#: ../../include/permissions.php:38
+msgid "Can post photos to my photo albums"
msgstr ""
-#: ../../mod/connedit.php:636
-msgid "Slide to adjust your degree of friendship"
+#: ../../include/permissions.php:39
+msgid "Can like/dislike stuff"
msgstr ""
-#: ../../mod/connedit.php:637 ../../mod/rate.php:161
-msgid "Rating (this information is public)"
+#: ../../include/permissions.php:39
+msgid "Profiles and things other than posts/comments"
msgstr ""
-#: ../../mod/connedit.php:638 ../../mod/rate.php:162
-msgid "Optionally explain your rating (this information is public)"
+#: ../../include/permissions.php:41
+msgid "Can forward to all my channel contacts via post @mentions"
msgstr ""
-#: ../../mod/connedit.php:645
-msgid ""
-"Default permissions for your channel type have (just) been applied. They "
-"have not yet been submitted. Please review the permissions on this page and "
-"make any desired changes at this time. This new connection may <em>not</em> "
-"be able to communicate with you until you submit this page, which will "
-"install and apply the selected permissions."
+#: ../../include/permissions.php:41
+msgid "Advanced - useful for creating group forum channels"
msgstr ""
-#: ../../mod/connedit.php:648
-msgid "inherited"
+#: ../../include/permissions.php:42
+msgid "Can chat with me (when available)"
msgstr ""
-#: ../../mod/connedit.php:651
-msgid "Connection has no individual permissions!"
+#: ../../include/permissions.php:43
+msgid "Can write to my file storage"
msgstr ""
-#: ../../mod/connedit.php:652
-msgid ""
-"This may be appropriate based on your <a href=\"settings\">privacy settings</"
-"a>, though you may wish to review the \"Advanced Permissions\"."
+#: ../../include/permissions.php:44
+msgid "Can edit my webpages"
msgstr ""
-#: ../../mod/connedit.php:654
-msgid "Profile Visibility"
+#: ../../include/permissions.php:46
+msgid "Can source my public posts in derived channels"
msgstr ""
-#: ../../mod/connedit.php:655
-#, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
+#: ../../include/permissions.php:46
+msgid "Somewhat advanced - very useful in open communities"
msgstr ""
-#: ../../mod/connedit.php:656
-msgid "Contact Information / Notes"
+#: ../../include/permissions.php:48
+msgid "Can administer my channel resources"
msgstr ""
-#: ../../mod/connedit.php:657
-msgid "Edit contact notes"
+#: ../../include/permissions.php:48
+msgid "Extremely advanced. Leave this alone unless you know what you are doing"
msgstr ""
-#: ../../mod/connedit.php:659
-msgid "Their Settings"
+#: ../../include/permissions.php:810
+msgid "Social Networking"
msgstr ""
-#: ../../mod/connedit.php:660
-msgid "My Settings"
+#: ../../include/permissions.php:810 ../../include/permissions.php:811
+#: ../../include/permissions.php:812
+msgid "Mostly Public"
msgstr ""
-#: ../../mod/connedit.php:662
-msgid ""
-"Default permissions for this channel type have (just) been applied. They "
-"have <em>not</em> been saved and there are currently no stored default "
-"permissions. Please review/edit the applied settings and click [Submit] to "
-"finalize."
+#: ../../include/permissions.php:810 ../../include/permissions.php:811
+#: ../../include/permissions.php:812
+msgid "Restricted"
msgstr ""
-#: ../../mod/connedit.php:663
-msgid "Clear/Disable Automatic Permissions"
+#: ../../include/permissions.php:810 ../../include/permissions.php:811
+msgid "Private"
msgstr ""
-#: ../../mod/connedit.php:664
-msgid "Forum Members"
+#: ../../include/permissions.php:811
+msgid "Community Forum"
msgstr ""
-#: ../../mod/connedit.php:665
-msgid "Soapbox"
+#: ../../include/permissions.php:812
+msgid "Feed Republish"
msgstr ""
-#: ../../mod/connedit.php:666
-msgid "Full Sharing (typical social network permissions)"
+#: ../../include/permissions.php:813
+msgid "Special Purpose"
msgstr ""
-#: ../../mod/connedit.php:667
-msgid "Cautious Sharing "
+#: ../../include/permissions.php:813
+msgid "Celebrity/Soapbox"
msgstr ""
-#: ../../mod/connedit.php:668
-msgid "Follow Only"
+#: ../../include/permissions.php:813
+msgid "Group Repository"
msgstr ""
-#: ../../mod/connedit.php:669
-msgid "Individual Permissions"
+#: ../../include/permissions.php:814
+msgid "Custom/Expert Mode"
msgstr ""
-#: ../../mod/connedit.php:670
-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."
+#: ../../mod/achievements.php:34
+msgid "Some blurb about what to do when you're new here"
msgstr ""
-#: ../../mod/connedit.php:671
-msgid "Advanced Permissions"
+#: ../../mod/editblock.php:79 ../../mod/editblock.php:95
+#: ../../mod/editpost.php:20 ../../mod/editlayout.php:78
+#: ../../mod/editwebpage.php:77
+msgid "Item not found"
msgstr ""
-#: ../../mod/connedit.php:672
-msgid "Simple Permissions (select one and submit)"
+#: ../../mod/editblock.php:115
+msgid "Edit Block"
msgstr ""
-#: ../../mod/connedit.php:676
+#: ../../mod/editblock.php:125
+msgid "Delete block?"
+msgstr ""
+
+#: ../../mod/editblock.php:147 ../../mod/editpost.php:117
+#: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:178
+msgid "Insert YouTube video"
+msgstr ""
+
+#: ../../mod/editblock.php:148 ../../mod/editpost.php:118
+#: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:179
+msgid "Insert Vorbis [.ogg] video"
+msgstr ""
+
+#: ../../mod/editblock.php:149 ../../mod/editpost.php:119
+#: ../../mod/editlayout.php:145 ../../mod/editwebpage.php:180
+msgid "Insert Vorbis [.ogg] audio"
+msgstr ""
+
+#: ../../mod/editblock.php:183
+msgid "Delete Block"
+msgstr ""
+
+#: ../../mod/manage.php:136
#, php-format
-msgid "Visit %s's profile - %s"
+msgid "You have created %1$.0f of %2$.0f allowed channels."
msgstr ""
-#: ../../mod/connedit.php:677
-msgid "Block/Unblock contact"
+#: ../../mod/manage.php:144
+msgid "Create a new channel"
msgstr ""
-#: ../../mod/connedit.php:678
-msgid "Ignore contact"
+#: ../../mod/manage.php:149
+msgid "Current Channel"
msgstr ""
-#: ../../mod/connedit.php:679
-msgid "Repair URL settings"
+#: ../../mod/manage.php:151
+msgid "Switch to one of your channels by selecting it."
msgstr ""
-#: ../../mod/connedit.php:680
-msgid "View conversations"
+#: ../../mod/manage.php:152
+msgid "Default Channel"
msgstr ""
-#: ../../mod/connedit.php:682
-msgid "Delete contact"
+#: ../../mod/manage.php:153
+msgid "Make Default"
msgstr ""
-#: ../../mod/connedit.php:686
-msgid "Last update:"
+#: ../../mod/manage.php:156
+#, php-format
+msgid "%d new messages"
msgstr ""
-#: ../../mod/connedit.php:688
-msgid "Update public posts"
+#: ../../mod/manage.php:157
+#, php-format
+msgid "%d new introductions"
msgstr ""
-#: ../../mod/connedit.php:690
-msgid "Update now"
+#: ../../mod/delegate.php:95
+msgid "No potential page delegates located."
msgstr ""
-#: ../../mod/connedit.php:696
-msgid "Currently blocked"
+#: ../../mod/delegate.php:121
+msgid "Delegate Page Management"
msgstr ""
-#: ../../mod/connedit.php:697
-msgid "Currently ignored"
+#: ../../mod/delegate.php:123
+msgid ""
+"Delegates are able to manage all aspects of this account/page except for "
+"basic account settings. Please do not delegate your personal account to "
+"anybody that you do not trust completely."
msgstr ""
-#: ../../mod/connedit.php:698
-msgid "Currently archived"
+#: ../../mod/delegate.php:124
+msgid "Existing Page Managers"
msgstr ""
-#: ../../mod/connedit.php:699
-msgid "Currently pending"
+#: ../../mod/delegate.php:126
+msgid "Existing Page Delegates"
msgstr ""
-#: ../../mod/home.php:48
-msgid "Red Matrix - &quot;The Network&quot;"
+#: ../../mod/delegate.php:128
+msgid "Potential Delegates"
msgstr ""
-#: ../../mod/home.php:101
-#, php-format
-msgid "Welcome to %s"
+#: ../../mod/delegate.php:130 ../../mod/tagrm.php:133 ../../mod/photos.php:873
+msgid "Remove"
+msgstr ""
+
+#: ../../mod/delegate.php:131
+msgid "Add"
+msgstr ""
+
+#: ../../mod/delegate.php:132
+msgid "No entries."
+msgstr ""
+
+#: ../../mod/xchan.php:6
+msgid "Xchan Lookup"
+msgstr ""
+
+#: ../../mod/xchan.php:9
+msgid "Lookup xchan beginning with (or webbie): "
+msgstr ""
+
+#: ../../mod/xchan.php:37 ../../mod/menu.php:136 ../../mod/mitem.php:111
+msgid "Not found."
+msgstr ""
+
+#: ../../mod/api.php:76 ../../mod/api.php:102
+msgid "Authorize application connection"
+msgstr ""
+
+#: ../../mod/api.php:77
+msgid "Return to your app and insert this Securty Code:"
+msgstr ""
+
+#: ../../mod/api.php:89
+msgid "Please login to continue."
+msgstr ""
+
+#: ../../mod/api.php:104
+msgid ""
+"Do you want to authorize this application to access your posts and contacts, "
+"and/or create new posts for you?"
+msgstr ""
+
+#: ../../mod/api.php:105 ../../mod/admin.php:400 ../../mod/settings.php:974
+#: ../../mod/settings.php:979 ../../mod/settings.php:1064
+msgid "Yes"
+msgstr ""
+
+#: ../../mod/api.php:106 ../../mod/admin.php:398 ../../mod/settings.php:974
+#: ../../mod/settings.php:979 ../../mod/settings.php:1064
+msgid "No"
+msgstr ""
+
+#: ../../mod/blocks.php:99
+msgid "Block Name"
+msgstr ""
+
+#: ../../mod/follow.php:25
+msgid "Channel added."
+msgstr ""
+
+#: ../../mod/tagrm.php:44 ../../mod/tagrm.php:94
+msgid "Tag removed"
+msgstr ""
+
+#: ../../mod/tagrm.php:119
+msgid "Remove Item Tag"
+msgstr ""
+
+#: ../../mod/tagrm.php:121
+msgid "Select a tag to remove: "
msgstr ""
#: ../../mod/connect.php:56 ../../mod/connect.php:104
@@ -4342,16 +4050,20 @@ msgstr ""
msgid "Restricted or Premium Channel"
msgstr ""
-#: ../../mod/editpost.php:31
-msgid "Item is not editable"
+#: ../../mod/match.php:16
+msgid "Profile Match"
msgstr ""
-#: ../../mod/editpost.php:42 ../../mod/rpost.php:97
-msgid "Edit post"
+#: ../../mod/match.php:24
+msgid "No keywords to match. Please add keywords to your default profile."
msgstr ""
-#: ../../mod/editpost.php:53
-msgid "Delete item?"
+#: ../../mod/match.php:61
+msgid "is interested in:"
+msgstr ""
+
+#: ../../mod/match.php:69
+msgid "No matches"
msgstr ""
#: ../../mod/attach.php:9
@@ -4363,8 +4075,13 @@ msgstr ""
msgid "Fetching URL returns error: %1$s"
msgstr ""
-#: ../../mod/dav.php:121
-msgid "RedMatrix channel"
+#: ../../mod/home.php:48
+msgid "Red Matrix - &quot;The Network&quot;"
+msgstr ""
+
+#: ../../mod/home.php:101
+#, php-format
+msgid "Welcome to %s"
msgstr ""
#: ../../mod/profile_photo.php:108
@@ -4456,28 +4173,72 @@ msgstr ""
msgid "Page not found."
msgstr ""
-#: ../../mod/network.php:84
-msgid "No such group"
+#: ../../mod/like.php:15
+msgid "Like/Dislike"
msgstr ""
-#: ../../mod/network.php:122
-msgid "Search Results For:"
+#: ../../mod/like.php:20
+msgid "This action is restricted to members."
msgstr ""
-#: ../../mod/network.php:176
-msgid "Collection is empty"
+#: ../../mod/like.php:21
+msgid ""
+"Please <a href=\"rmagic\">login with your RedMatrix ID</a> or <a href="
+"\"register\">register as a new RedMatrix member</a> to continue."
msgstr ""
-#: ../../mod/network.php:184
-msgid "Collection: "
+#: ../../mod/like.php:101 ../../mod/like.php:128 ../../mod/like.php:166
+msgid "Invalid request."
msgstr ""
-#: ../../mod/network.php:197
-msgid "Connection: "
+#: ../../mod/like.php:143
+msgid "thing"
msgstr ""
-#: ../../mod/network.php:200
-msgid "Invalid connection."
+#: ../../mod/like.php:189
+msgid "Channel unavailable."
+msgstr ""
+
+#: ../../mod/like.php:228
+msgid "Previous action reversed."
+msgstr ""
+
+#: ../../mod/like.php:387
+#, php-format
+msgid "%1$s agrees with %2$s's %3$s"
+msgstr ""
+
+#: ../../mod/like.php:389
+#, php-format
+msgid "%1$s doesn't agree with %2$s's %3$s"
+msgstr ""
+
+#: ../../mod/like.php:391
+#, php-format
+msgid "%1$s abstains from a decision on %2$s's %3$s"
+msgstr ""
+
+#: ../../mod/like.php:393
+#, php-format
+msgid "%1$s is attending %2$s's %3$s"
+msgstr ""
+
+#: ../../mod/like.php:395
+#, php-format
+msgid "%1$s is not attending %2$s's %3$s"
+msgstr ""
+
+#: ../../mod/like.php:397
+#, php-format
+msgid "%1$s may attend %2$s's %3$s"
+msgstr ""
+
+#: ../../mod/like.php:481
+msgid "Action completed."
+msgstr ""
+
+#: ../../mod/like.php:482
+msgid "Thank you."
msgstr ""
#: ../../mod/events.php:87
@@ -4628,597 +4389,374 @@ msgstr ""
msgid "View ratings"
msgstr ""
-#: ../../mod/settings.php:73
-msgid "Name is required"
-msgstr ""
-
-#: ../../mod/settings.php:77
-msgid "Key and Secret are required"
-msgstr ""
-
-#: ../../mod/settings.php:120
-msgid "Diaspora Policy Settings updated."
-msgstr ""
-
-#: ../../mod/settings.php:228
-msgid "Passwords do not match. Password unchanged."
-msgstr ""
-
-#: ../../mod/settings.php:232
-msgid "Empty passwords are not allowed. Password unchanged."
-msgstr ""
-
-#: ../../mod/settings.php:246
-msgid "Password changed."
-msgstr ""
-
-#: ../../mod/settings.php:248
-msgid "Password update failed. Please try again."
-msgstr ""
-
-#: ../../mod/settings.php:262
-msgid "Not valid email."
-msgstr ""
-
-#: ../../mod/settings.php:265
-msgid "Protected email address. Cannot change to that email."
-msgstr ""
-
-#: ../../mod/settings.php:274
-msgid "System failure storing new email. Please try again."
-msgstr ""
-
-#: ../../mod/settings.php:513
-msgid "Settings updated."
-msgstr ""
-
-#: ../../mod/settings.php:582 ../../mod/settings.php:608
-#: ../../mod/settings.php:644
-msgid "Add application"
-msgstr ""
-
-#: ../../mod/settings.php:585
-msgid "Name of application"
-msgstr ""
-
-#: ../../mod/settings.php:586 ../../mod/settings.php:612
-msgid "Consumer Key"
-msgstr ""
-
-#: ../../mod/settings.php:586 ../../mod/settings.php:587
-msgid "Automatically generated - change if desired. Max length 20"
-msgstr ""
-
-#: ../../mod/settings.php:587 ../../mod/settings.php:613
-msgid "Consumer Secret"
-msgstr ""
-
-#: ../../mod/settings.php:588 ../../mod/settings.php:614
-msgid "Redirect"
-msgstr ""
-
-#: ../../mod/settings.php:588
-msgid ""
-"Redirect URI - leave blank unless your application specifically requires this"
-msgstr ""
-
-#: ../../mod/settings.php:589 ../../mod/settings.php:615
-msgid "Icon url"
-msgstr ""
-
-#: ../../mod/settings.php:589
-msgid "Optional"
+#: ../../mod/network.php:84
+msgid "No such group"
msgstr ""
-#: ../../mod/settings.php:600
-msgid "You can't edit this application."
+#: ../../mod/network.php:122
+msgid "Search Results For:"
msgstr ""
-#: ../../mod/settings.php:643
-msgid "Connected Apps"
+#: ../../mod/network.php:176
+msgid "Collection is empty"
msgstr ""
-#: ../../mod/settings.php:647
-msgid "Client key starts with"
+#: ../../mod/network.php:184
+msgid "Collection: "
msgstr ""
-#: ../../mod/settings.php:648
-msgid "No name"
+#: ../../mod/network.php:197
+msgid "Connection: "
msgstr ""
-#: ../../mod/settings.php:649
-msgid "Remove authorization"
+#: ../../mod/network.php:200
+msgid "Invalid connection."
msgstr ""
-#: ../../mod/settings.php:663
-msgid "No feature settings configured"
+#: ../../mod/connedit.php:75 ../../mod/connections.php:37
+msgid "Could not access contact record."
msgstr ""
-#: ../../mod/settings.php:676
-msgid "Feature Settings"
+#: ../../mod/connedit.php:99 ../../mod/connections.php:51
+msgid "Could not locate selected profile."
msgstr ""
-#: ../../mod/settings.php:679
-msgid "Diaspora Policy Settings"
+#: ../../mod/connedit.php:204 ../../mod/connections.php:94
+msgid "Connection updated."
msgstr ""
-#: ../../mod/settings.php:680
-msgid "Allow any Diaspora member to comment on your public posts."
+#: ../../mod/connedit.php:206 ../../mod/connections.php:96
+msgid "Failed to update connection record."
msgstr ""
-#: ../../mod/settings.php:681
-msgid "Submit Diaspora Policy Settings"
+#: ../../mod/connedit.php:252
+msgid "is now connected to"
msgstr ""
-#: ../../mod/settings.php:704
-msgid "Account Settings"
+#: ../../mod/connedit.php:365
+msgid "Could not access address book record."
msgstr ""
-#: ../../mod/settings.php:705
-msgid "Password Settings"
+#: ../../mod/connedit.php:379
+msgid "Refresh failed - channel is currently unavailable."
msgstr ""
-#: ../../mod/settings.php:706
-msgid "New Password:"
+#: ../../mod/connedit.php:386
+msgid "Channel has been unblocked"
msgstr ""
-#: ../../mod/settings.php:707
-msgid "Confirm:"
+#: ../../mod/connedit.php:387
+msgid "Channel has been blocked"
msgstr ""
-#: ../../mod/settings.php:707
-msgid "Leave password fields blank unless changing"
+#: ../../mod/connedit.php:391 ../../mod/connedit.php:403
+#: ../../mod/connedit.php:415 ../../mod/connedit.php:427
+#: ../../mod/connedit.php:443
+msgid "Unable to set address book parameters."
msgstr ""
-#: ../../mod/settings.php:709 ../../mod/settings.php:1045
-msgid "Email Address:"
+#: ../../mod/connedit.php:398
+msgid "Channel has been unignored"
msgstr ""
-#: ../../mod/settings.php:710 ../../mod/removeaccount.php:61
-msgid "Remove Account"
+#: ../../mod/connedit.php:399
+msgid "Channel has been ignored"
msgstr ""
-#: ../../mod/settings.php:711
-msgid "Remove this account from this server including all its channels"
+#: ../../mod/connedit.php:410
+msgid "Channel has been unarchived"
msgstr ""
-#: ../../mod/settings.php:712 ../../mod/settings.php:1126
-msgid "Warning: This action is permanent and cannot be reversed."
+#: ../../mod/connedit.php:411
+msgid "Channel has been archived"
msgstr ""
-#: ../../mod/settings.php:728
-msgid "Off"
+#: ../../mod/connedit.php:422
+msgid "Channel has been unhidden"
msgstr ""
-#: ../../mod/settings.php:728
-msgid "On"
+#: ../../mod/connedit.php:423
+msgid "Channel has been hidden"
msgstr ""
-#: ../../mod/settings.php:735
-msgid "Additional Features"
+#: ../../mod/connedit.php:438
+msgid "Channel has been approved"
msgstr ""
-#: ../../mod/settings.php:759
-msgid "Connector Settings"
+#: ../../mod/connedit.php:439
+msgid "Channel has been unapproved"
msgstr ""
-#: ../../mod/settings.php:798
-msgid "No special theme for mobile devices"
+#: ../../mod/connedit.php:467
+msgid "Connection has been removed."
msgstr ""
-#: ../../mod/settings.php:801
+#: ../../mod/connedit.php:487
#, php-format
-msgid "%s - (Experimental)"
-msgstr ""
-
-#: ../../mod/settings.php:804 ../../mod/admin.php:367
-msgid "mobile"
-msgstr ""
-
-#: ../../mod/settings.php:840
-msgid "Display Settings"
-msgstr ""
-
-#: ../../mod/settings.php:846
-msgid "Display Theme:"
-msgstr ""
-
-#: ../../mod/settings.php:847
-msgid "Mobile Theme:"
-msgstr ""
-
-#: ../../mod/settings.php:848
-msgid "Enable user zoom on mobile devices"
-msgstr ""
-
-#: ../../mod/settings.php:849
-msgid "Update browser every xx seconds"
-msgstr ""
-
-#: ../../mod/settings.php:849
-msgid "Minimum of 10 seconds, no maximum"
-msgstr ""
-
-#: ../../mod/settings.php:850
-msgid "Maximum number of conversations to load at any time:"
-msgstr ""
-
-#: ../../mod/settings.php:850
-msgid "Maximum of 100 items"
-msgstr ""
-
-#: ../../mod/settings.php:851
-msgid "Don't show emoticons"
-msgstr ""
-
-#: ../../mod/settings.php:852
-msgid "Link post titles to source"
+msgid "View %s's profile"
msgstr ""
-#: ../../mod/settings.php:853
-msgid "System Page Layout Editor - (advanced)"
+#: ../../mod/connedit.php:491
+msgid "Refresh Permissions"
msgstr ""
-#: ../../mod/settings.php:856
-msgid "Use blog/list mode on channel page"
+#: ../../mod/connedit.php:494
+msgid "Fetch updated permissions"
msgstr ""
-#: ../../mod/settings.php:856 ../../mod/settings.php:857
-msgid "(comments displayed separately)"
+#: ../../mod/connedit.php:498
+msgid "Recent Activity"
msgstr ""
-#: ../../mod/settings.php:857
-msgid "Use blog/list mode on matrix page"
+#: ../../mod/connedit.php:501
+msgid "View recent posts and comments"
msgstr ""
-#: ../../mod/settings.php:858
-msgid "Channel page max height of content (in pixels)"
+#: ../../mod/connedit.php:507 ../../mod/connedit.php:694
+#: ../../mod/admin.php:761
+msgid "Unblock"
msgstr ""
-#: ../../mod/settings.php:858 ../../mod/settings.php:859
-msgid "click to expand content exceeding this height"
+#: ../../mod/connedit.php:507 ../../mod/connedit.php:694
+#: ../../mod/admin.php:760
+msgid "Block"
msgstr ""
-#: ../../mod/settings.php:859
-msgid "Matrix page max height of content (in pixels)"
+#: ../../mod/connedit.php:510
+msgid "Block (or Unblock) all communications with this connection"
msgstr ""
-#: ../../mod/settings.php:893
-msgid "Nobody except yourself"
+#: ../../mod/connedit.php:514 ../../mod/connedit.php:695
+msgid "Unignore"
msgstr ""
-#: ../../mod/settings.php:894
-msgid "Only those you specifically allow"
+#: ../../mod/connedit.php:514 ../../mod/connedit.php:695
+#: ../../mod/notifications.php:51
+msgid "Ignore"
msgstr ""
-#: ../../mod/settings.php:895
-msgid "Approved connections"
+#: ../../mod/connedit.php:517
+msgid "Ignore (or Unignore) all inbound communications from this connection"
msgstr ""
-#: ../../mod/settings.php:896
-msgid "Any connections"
+#: ../../mod/connedit.php:520
+msgid "Unarchive"
msgstr ""
-#: ../../mod/settings.php:897
-msgid "Anybody on this website"
+#: ../../mod/connedit.php:520
+msgid "Archive"
msgstr ""
-#: ../../mod/settings.php:898
-msgid "Anybody in this network"
+#: ../../mod/connedit.php:523
+msgid ""
+"Archive (or Unarchive) this connection - mark channel dead but keep content"
msgstr ""
-#: ../../mod/settings.php:899
-msgid "Anybody authenticated"
+#: ../../mod/connedit.php:526
+msgid "Unhide"
msgstr ""
-#: ../../mod/settings.php:900
-msgid "Anybody on the internet"
+#: ../../mod/connedit.php:526
+msgid "Hide"
msgstr ""
-#: ../../mod/settings.php:974
-msgid "Publish your default profile in the network directory"
+#: ../../mod/connedit.php:529
+msgid "Hide or Unhide this connection from your other connections"
msgstr ""
-#: ../../mod/settings.php:979
-msgid "Allow us to suggest you as a potential friend to new members?"
+#: ../../mod/connedit.php:536
+msgid "Delete this connection"
msgstr ""
-#: ../../mod/settings.php:988
-msgid "Your channel address is"
+#: ../../mod/connedit.php:611 ../../mod/connedit.php:649
+msgid "Approve this connection"
msgstr ""
-#: ../../mod/settings.php:1036
-msgid "Channel Settings"
+#: ../../mod/connedit.php:611
+msgid "Accept connection to allow communication"
msgstr ""
-#: ../../mod/settings.php:1043
-msgid "Basic Settings"
+#: ../../mod/connedit.php:627
+#, php-format
+msgid "Connections: settings for %s"
msgstr ""
-#: ../../mod/settings.php:1046
-msgid "Your Timezone:"
+#: ../../mod/connedit.php:628
+msgid "Apply these permissions automatically"
msgstr ""
-#: ../../mod/settings.php:1047
-msgid "Default Post Location:"
+#: ../../mod/connedit.php:632
+msgid "Apply the permissions indicated on this page to all new connections."
msgstr ""
-#: ../../mod/settings.php:1047
-msgid "Geographical location to display on your posts"
+#: ../../mod/connedit.php:636
+msgid "Slide to adjust your degree of friendship"
msgstr ""
-#: ../../mod/settings.php:1048
-msgid "Use Browser Location:"
+#: ../../mod/connedit.php:637 ../../mod/rate.php:161
+msgid "Rating (this information is public)"
msgstr ""
-#: ../../mod/settings.php:1050
-msgid "Adult Content"
+#: ../../mod/connedit.php:638 ../../mod/rate.php:162
+msgid "Optionally explain your rating (this information is public)"
msgstr ""
-#: ../../mod/settings.php:1050
+#: ../../mod/connedit.php:645
msgid ""
-"This channel frequently or regularly publishes adult content. (Please tag "
-"any adult material and/or nudity with #NSFW)"
-msgstr ""
-
-#: ../../mod/settings.php:1052
-msgid "Security and Privacy Settings"
-msgstr ""
-
-#: ../../mod/settings.php:1054
-msgid "Your permissions are already configured. Click to view/adjust"
-msgstr ""
-
-#: ../../mod/settings.php:1056
-msgid "Hide my online presence"
-msgstr ""
-
-#: ../../mod/settings.php:1056
-msgid "Prevents displaying in your profile that you are online"
+"Default permissions for your channel type have (just) been applied. They "
+"have not yet been submitted. Please review the permissions on this page and "
+"make any desired changes at this time. This new connection may <em>not</em> "
+"be able to communicate with you until you submit this page, which will "
+"install and apply the selected permissions."
msgstr ""
-#: ../../mod/settings.php:1058
-msgid "Simple Privacy Settings:"
+#: ../../mod/connedit.php:648
+msgid "inherited"
msgstr ""
-#: ../../mod/settings.php:1059
-msgid ""
-"Very Public - <em>extremely permissive (should be used with caution)</em>"
+#: ../../mod/connedit.php:651
+msgid "Connection has no individual permissions!"
msgstr ""
-#: ../../mod/settings.php:1060
+#: ../../mod/connedit.php:652
msgid ""
-"Typical - <em>default public, privacy when desired (similar to social "
-"network permissions but with improved privacy)</em>"
-msgstr ""
-
-#: ../../mod/settings.php:1061
-msgid "Private - <em>default private, never open or public</em>"
-msgstr ""
-
-#: ../../mod/settings.php:1062
-msgid "Blocked - <em>default blocked to/from everybody</em>"
+"This may be appropriate based on your <a href=\"settings\">privacy settings</"
+"a>, though you may wish to review the \"Advanced Permissions\"."
msgstr ""
-#: ../../mod/settings.php:1064
-msgid "Allow others to tag your posts"
+#: ../../mod/connedit.php:654
+msgid "Profile Visibility"
msgstr ""
-#: ../../mod/settings.php:1064
+#: ../../mod/connedit.php:655
+#, php-format
msgid ""
-"Often used by the community to retro-actively flag inappropriate content"
-msgstr ""
-
-#: ../../mod/settings.php:1066
-msgid "Advanced Privacy Settings"
-msgstr ""
-
-#: ../../mod/settings.php:1068
-msgid "Expire other channel content after this many days"
-msgstr ""
-
-#: ../../mod/settings.php:1068
-msgid "0 or blank prevents expiration"
-msgstr ""
-
-#: ../../mod/settings.php:1069
-msgid "Maximum Friend Requests/Day:"
-msgstr ""
-
-#: ../../mod/settings.php:1069
-msgid "May reduce spam activity"
-msgstr ""
-
-#: ../../mod/settings.php:1070
-msgid "Default Post Permissions"
-msgstr ""
-
-#: ../../mod/settings.php:1071 ../../mod/mitem.php:161 ../../mod/mitem.php:204
-msgid "(click to open/close)"
-msgstr ""
-
-#: ../../mod/settings.php:1075
-msgid "Channel permissions category:"
-msgstr ""
-
-#: ../../mod/settings.php:1081
-msgid "Maximum private messages per day from unknown people:"
-msgstr ""
-
-#: ../../mod/settings.php:1081
-msgid "Useful to reduce spamming"
-msgstr ""
-
-#: ../../mod/settings.php:1084
-msgid "Notification Settings"
-msgstr ""
-
-#: ../../mod/settings.php:1085
-msgid "By default post a status message when:"
-msgstr ""
-
-#: ../../mod/settings.php:1086
-msgid "accepting a friend request"
-msgstr ""
-
-#: ../../mod/settings.php:1087
-msgid "joining a forum/community"
-msgstr ""
-
-#: ../../mod/settings.php:1088
-msgid "making an <em>interesting</em> profile change"
-msgstr ""
-
-#: ../../mod/settings.php:1089
-msgid "Send a notification email when:"
-msgstr ""
-
-#: ../../mod/settings.php:1090
-msgid "You receive a connection request"
-msgstr ""
-
-#: ../../mod/settings.php:1091
-msgid "Your connections are confirmed"
-msgstr ""
-
-#: ../../mod/settings.php:1092
-msgid "Someone writes on your profile wall"
-msgstr ""
-
-#: ../../mod/settings.php:1093
-msgid "Someone writes a followup comment"
-msgstr ""
-
-#: ../../mod/settings.php:1094
-msgid "You receive a private message"
-msgstr ""
-
-#: ../../mod/settings.php:1095
-msgid "You receive a friend suggestion"
-msgstr ""
-
-#: ../../mod/settings.php:1096
-msgid "You are tagged in a post"
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
msgstr ""
-#: ../../mod/settings.php:1097
-msgid "You are poked/prodded/etc. in a post"
+#: ../../mod/connedit.php:656
+msgid "Contact Information / Notes"
msgstr ""
-#: ../../mod/settings.php:1100
-msgid "Show visual notifications including:"
+#: ../../mod/connedit.php:657
+msgid "Edit contact notes"
msgstr ""
-#: ../../mod/settings.php:1102
-msgid "Unseen matrix activity"
+#: ../../mod/connedit.php:659
+msgid "Their Settings"
msgstr ""
-#: ../../mod/settings.php:1103
-msgid "Unseen channel activity"
+#: ../../mod/connedit.php:660
+msgid "My Settings"
msgstr ""
-#: ../../mod/settings.php:1104
-msgid "Unseen private messages"
+#: ../../mod/connedit.php:662
+msgid ""
+"Default permissions for this channel type have (just) been applied. They "
+"have <em>not</em> been saved and there are currently no stored default "
+"permissions. Please review/edit the applied settings and click [Submit] to "
+"finalize."
msgstr ""
-#: ../../mod/settings.php:1104 ../../mod/settings.php:1109
-#: ../../mod/settings.php:1110 ../../mod/settings.php:1111
-msgid "Recommended"
+#: ../../mod/connedit.php:663
+msgid "Clear/Disable Automatic Permissions"
msgstr ""
-#: ../../mod/settings.php:1105
-msgid "Upcoming events"
+#: ../../mod/connedit.php:664
+msgid "Forum Members"
msgstr ""
-#: ../../mod/settings.php:1106
-msgid "Events today"
+#: ../../mod/connedit.php:665
+msgid "Soapbox"
msgstr ""
-#: ../../mod/settings.php:1107
-msgid "Upcoming birthdays"
+#: ../../mod/connedit.php:666
+msgid "Full Sharing (typical social network permissions)"
msgstr ""
-#: ../../mod/settings.php:1107
-msgid "Not available in all themes"
+#: ../../mod/connedit.php:667
+msgid "Cautious Sharing "
msgstr ""
-#: ../../mod/settings.php:1108
-msgid "System (personal) notifications"
+#: ../../mod/connedit.php:668
+msgid "Follow Only"
msgstr ""
-#: ../../mod/settings.php:1109
-msgid "System info messages"
+#: ../../mod/connedit.php:669
+msgid "Individual Permissions"
msgstr ""
-#: ../../mod/settings.php:1110
-msgid "System critical alerts"
+#: ../../mod/connedit.php:670
+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/settings.php:1111
-msgid "New connections"
+#: ../../mod/connedit.php:671
+msgid "Advanced Permissions"
msgstr ""
-#: ../../mod/settings.php:1112
-msgid "System Registrations"
+#: ../../mod/connedit.php:672
+msgid "Simple Permissions (select one and submit)"
msgstr ""
-#: ../../mod/settings.php:1113
-msgid ""
-"Also show new wall posts, private messages and connections under Notices"
+#: ../../mod/connedit.php:676
+#, php-format
+msgid "Visit %s's profile - %s"
msgstr ""
-#: ../../mod/settings.php:1115
-msgid "Notify me of events this many days in advance"
+#: ../../mod/connedit.php:677
+msgid "Block/Unblock contact"
msgstr ""
-#: ../../mod/settings.php:1115
-msgid "Must be greater than 0"
+#: ../../mod/connedit.php:678
+msgid "Ignore contact"
msgstr ""
-#: ../../mod/settings.php:1117
-msgid "Advanced Account/Page Type Settings"
+#: ../../mod/connedit.php:679
+msgid "Repair URL settings"
msgstr ""
-#: ../../mod/settings.php:1118
-msgid "Change the behaviour of this account for special situations"
+#: ../../mod/connedit.php:680
+msgid "View conversations"
msgstr ""
-#: ../../mod/settings.php:1121
-msgid ""
-"Please enable expert mode (in <a href=\"settings/features\">Settings > "
-"Additional features</a>) to adjust!"
+#: ../../mod/connedit.php:682
+msgid "Delete contact"
msgstr ""
-#: ../../mod/settings.php:1122
-msgid "Miscellaneous Settings"
+#: ../../mod/connedit.php:686
+msgid "Last update:"
msgstr ""
-#: ../../mod/settings.php:1124
-msgid "Personal menu to display in your channel pages"
+#: ../../mod/connedit.php:688
+msgid "Update public posts"
msgstr ""
-#: ../../mod/settings.php:1125
-msgid "Remove this channel"
+#: ../../mod/connedit.php:690
+msgid "Update now"
msgstr ""
-#: ../../mod/cloud.php:120
-msgid "RedMatrix - Guests: Username: {your email address}, Password: +++"
+#: ../../mod/connedit.php:696
+msgid "Currently blocked"
msgstr ""
-#: ../../mod/tagrm.php:44 ../../mod/tagrm.php:94
-msgid "Tag removed"
+#: ../../mod/connedit.php:697
+msgid "Currently ignored"
msgstr ""
-#: ../../mod/tagrm.php:119
-msgid "Remove Item Tag"
+#: ../../mod/connedit.php:698
+msgid "Currently archived"
msgstr ""
-#: ../../mod/tagrm.php:121
-msgid "Select a tag to remove: "
+#: ../../mod/connedit.php:699
+msgid "Currently pending"
msgstr ""
-#: ../../mod/tagrm.php:133 ../../mod/delegate.php:130 ../../mod/photos.php:873
-msgid "Remove"
+#: ../../mod/dav.php:121
+msgid "RedMatrix channel"
msgstr ""
#: ../../mod/group.php:20
@@ -5269,57 +4807,57 @@ msgstr ""
msgid "Click on a channel to add or remove."
msgstr ""
-#: ../../mod/siteinfo.php:93
+#: ../../mod/siteinfo.php:106
#, php-format
msgid "Version %s"
msgstr ""
-#: ../../mod/siteinfo.php:114
+#: ../../mod/siteinfo.php:127
msgid "Installed plugins/addons/apps:"
msgstr ""
-#: ../../mod/siteinfo.php:127
+#: ../../mod/siteinfo.php:140
msgid "No installed plugins/addons/apps"
msgstr ""
-#: ../../mod/siteinfo.php:136
+#: ../../mod/siteinfo.php:149
msgid "Red"
msgstr ""
-#: ../../mod/siteinfo.php:137
+#: ../../mod/siteinfo.php:150
msgid ""
"This is a hub of the Red Matrix - a global cooperative network of "
"decentralized privacy enhanced websites."
msgstr ""
-#: ../../mod/siteinfo.php:139
+#: ../../mod/siteinfo.php:152
msgid "Tag: "
msgstr ""
-#: ../../mod/siteinfo.php:141
+#: ../../mod/siteinfo.php:154
msgid "Last background fetch: "
msgstr ""
-#: ../../mod/siteinfo.php:144
+#: ../../mod/siteinfo.php:157
msgid "Running at web location"
msgstr ""
-#: ../../mod/siteinfo.php:145
+#: ../../mod/siteinfo.php:158
msgid ""
"Please visit <a href=\"https://redmatrix.me\">RedMatrix.me</a> to learn more "
"about the Red Matrix."
msgstr ""
-#: ../../mod/siteinfo.php:146
+#: ../../mod/siteinfo.php:159
msgid "Bug reports and issues: please visit"
msgstr ""
-#: ../../mod/siteinfo.php:149
+#: ../../mod/siteinfo.php:162
msgid ""
"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"
msgstr ""
-#: ../../mod/siteinfo.php:151
+#: ../../mod/siteinfo.php:164
msgid "Site Administrators"
msgstr ""
@@ -5726,10 +5264,16 @@ msgstr ""
msgid "No connections in common."
msgstr ""
-#: ../../mod/suggest.php:35
-msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
+#: ../../mod/editpost.php:31
+msgid "Item is not editable"
+msgstr ""
+
+#: ../../mod/editpost.php:42 ../../mod/rpost.php:97
+msgid "Edit post"
+msgstr ""
+
+#: ../../mod/editpost.php:53
+msgid "Delete item?"
msgstr ""
#: ../../mod/connections.php:192 ../../mod/connections.php:293
@@ -5835,6 +5379,10 @@ msgstr ""
msgid "%1$s tagged %2$s's %3$s with %4$s"
msgstr ""
+#: ../../mod/cloud.php:120
+msgid "RedMatrix - Guests: Username: {your email address}, Password: +++"
+msgstr ""
+
#: ../../mod/item.php:165
msgid "Unable to locate original post."
msgstr ""
@@ -5932,8 +5480,24 @@ msgstr ""
msgid "Online"
msgstr ""
-#: ../../mod/follow.php:25
-msgid "Channel added."
+#: ../../mod/rbmark.php:88
+msgid "Select a bookmark folder"
+msgstr ""
+
+#: ../../mod/rbmark.php:93
+msgid "Save Bookmark"
+msgstr ""
+
+#: ../../mod/rbmark.php:94
+msgid "URL of bookmark"
+msgstr ""
+
+#: ../../mod/rbmark.php:95 ../../mod/appman.php:93
+msgid "Description"
+msgstr ""
+
+#: ../../mod/rbmark.php:99
+msgid "Or enter new bookmark folder name"
msgstr ""
#: ../../mod/notify.php:53 ../../mod/notifications.php:94
@@ -5972,58 +5536,6 @@ msgstr ""
msgid "Layout Help"
msgstr ""
-#: ../../mod/appman.php:28 ../../mod/appman.php:44
-msgid "App installed."
-msgstr ""
-
-#: ../../mod/appman.php:37
-msgid "Malformed app."
-msgstr ""
-
-#: ../../mod/appman.php:80
-msgid "Embed code"
-msgstr ""
-
-#: ../../mod/appman.php:86
-msgid "Edit App"
-msgstr ""
-
-#: ../../mod/appman.php:86
-msgid "Create App"
-msgstr ""
-
-#: ../../mod/appman.php:91
-msgid "Name of app"
-msgstr ""
-
-#: ../../mod/appman.php:92
-msgid "Location (URL) of app"
-msgstr ""
-
-#: ../../mod/appman.php:93 ../../mod/rbmark.php:95
-msgid "Description"
-msgstr ""
-
-#: ../../mod/appman.php:94
-msgid "Photo icon URL"
-msgstr ""
-
-#: ../../mod/appman.php:94
-msgid "80 x 80 pixels - optional"
-msgstr ""
-
-#: ../../mod/appman.php:95
-msgid "Version ID"
-msgstr ""
-
-#: ../../mod/appman.php:96
-msgid "Price of app"
-msgstr ""
-
-#: ../../mod/appman.php:97
-msgid "Location (URL) to purchase app"
-msgstr ""
-
#: ../../mod/filer.php:49
msgid "- select -"
msgstr ""
@@ -6183,10 +5695,14 @@ msgstr ""
msgid "Delete Webpage"
msgstr ""
-#: ../../mod/dirsearch.php:20 ../../mod/regdir.php:22
+#: ../../mod/dirsearch.php:19 ../../mod/regdir.php:47
msgid "This site is not a directory server"
msgstr ""
+#: ../../mod/dirsearch.php:27
+msgid "This directory server requires an access token"
+msgstr ""
+
#: ../../mod/lostpass.php:15
msgid "No valid account found."
msgstr ""
@@ -6269,6 +5785,10 @@ msgstr ""
msgid "Remote Channel [%s] (not yet known on this site)"
msgstr ""
+#: ../../mod/regmod.php:11
+msgid "Please login."
+msgstr ""
+
#: ../../mod/invite.php:25
msgid "Total invitation limit exceeded."
msgstr ""
@@ -6707,7 +6227,7 @@ msgstr ""
msgid "Interests"
msgstr ""
-#: ../../mod/profiles.php:447 ../../mod/admin.php:871
+#: ../../mod/profiles.php:447 ../../mod/admin.php:895
msgid "Address"
msgstr ""
@@ -6875,7 +6395,7 @@ msgstr ""
msgid "This is your default profile."
msgstr ""
-#: ../../mod/profiles.php:728 ../../mod/directory.php:188
+#: ../../mod/profiles.php:728 ../../mod/directory.php:192
msgid "Age: "
msgstr ""
@@ -6911,108 +6431,66 @@ msgstr ""
msgid "Description: "
msgstr ""
-#: ../../mod/delegate.php:95
-msgid "No potential page delegates located."
-msgstr ""
-
-#: ../../mod/delegate.php:121
-msgid "Delegate Page Management"
-msgstr ""
-
-#: ../../mod/delegate.php:123
-msgid ""
-"Delegates are able to manage all aspects of this account/page except for "
-"basic account settings. Please do not delegate your personal account to "
-"anybody that you do not trust completely."
-msgstr ""
-
-#: ../../mod/delegate.php:124
-msgid "Existing Page Managers"
-msgstr ""
-
-#: ../../mod/delegate.php:126
-msgid "Existing Page Delegates"
-msgstr ""
-
-#: ../../mod/delegate.php:128
-msgid "Potential Delegates"
-msgstr ""
-
-#: ../../mod/delegate.php:131
-msgid "Add"
+#: ../../mod/openid.php:26
+msgid "OpenID protocol error. No ID returned."
msgstr ""
-#: ../../mod/delegate.php:132
-msgid "No entries."
+#: ../../mod/openid.php:72 ../../mod/openid.php:180 ../../mod/post.php:261
+#, php-format
+msgid "Welcome %s. Remote authentication successful."
msgstr ""
-#: ../../mod/directory.php:194
+#: ../../mod/directory.php:198
#, php-format
msgid "%d rating"
msgid_plural "%d ratings"
msgstr[0] ""
msgstr[1] ""
-#: ../../mod/directory.php:206
+#: ../../mod/directory.php:210
msgid "Gender: "
msgstr ""
-#: ../../mod/directory.php:208
+#: ../../mod/directory.php:212
msgid "Status: "
msgstr ""
-#: ../../mod/directory.php:210
+#: ../../mod/directory.php:214
msgid "Homepage: "
msgstr ""
-#: ../../mod/directory.php:213
+#: ../../mod/directory.php:217
msgid "Hometown: "
msgstr ""
-#: ../../mod/directory.php:215
+#: ../../mod/directory.php:219
msgid "About: "
msgstr ""
-#: ../../mod/directory.php:273
+#: ../../mod/directory.php:277
msgid "Public Forum:"
msgstr ""
-#: ../../mod/directory.php:276
+#: ../../mod/directory.php:280
msgid "Keywords: "
msgstr ""
-#: ../../mod/directory.php:331
+#: ../../mod/directory.php:335
msgid "Finding:"
msgstr ""
-#: ../../mod/directory.php:336
+#: ../../mod/directory.php:340
msgid "next page"
msgstr ""
-#: ../../mod/directory.php:336
+#: ../../mod/directory.php:340
msgid "previous page"
msgstr ""
-#: ../../mod/directory.php:353
+#: ../../mod/directory.php:357
msgid "No entries (some entries may be hidden)."
msgstr ""
-#: ../../mod/rbmark.php:88
-msgid "Select a bookmark folder"
-msgstr ""
-
-#: ../../mod/rbmark.php:93
-msgid "Save Bookmark"
-msgstr ""
-
-#: ../../mod/rbmark.php:94
-msgid "URL of bookmark"
-msgstr ""
-
-#: ../../mod/rbmark.php:99
-msgid "Or enter new bookmark folder name"
-msgstr ""
-
#: ../../mod/uexport.php:33 ../../mod/uexport.php:34
msgid "Export Channel"
msgstr ""
@@ -7054,7 +6532,7 @@ msgstr ""
msgid "Theme settings updated."
msgstr ""
-#: ../../mod/admin.php:97 ../../mod/admin.php:415
+#: ../../mod/admin.php:97 ../../mod/admin.php:419
msgid "Site"
msgstr ""
@@ -7062,646 +6540,666 @@ msgstr ""
msgid "Accounts"
msgstr ""
-#: ../../mod/admin.php:99 ../../mod/admin.php:863
+#: ../../mod/admin.php:99 ../../mod/admin.php:887
msgid "Channels"
msgstr ""
-#: ../../mod/admin.php:100 ../../mod/admin.php:954 ../../mod/admin.php:996
+#: ../../mod/admin.php:100 ../../mod/admin.php:978 ../../mod/admin.php:1020
msgid "Plugins"
msgstr ""
-#: ../../mod/admin.php:101 ../../mod/admin.php:1159 ../../mod/admin.php:1195
+#: ../../mod/admin.php:101 ../../mod/admin.php:1183 ../../mod/admin.php:1219
msgid "Themes"
msgstr ""
-#: ../../mod/admin.php:102 ../../mod/admin.php:517
-msgid "Server"
+#: ../../mod/admin.php:102
+msgid "Inspect queue"
msgstr ""
-#: ../../mod/admin.php:103
+#: ../../mod/admin.php:104
msgid "Profile Config"
msgstr ""
-#: ../../mod/admin.php:104
+#: ../../mod/admin.php:105
msgid "DB updates"
msgstr ""
-#: ../../mod/admin.php:118 ../../mod/admin.php:125 ../../mod/admin.php:1282
+#: ../../mod/admin.php:119 ../../mod/admin.php:126 ../../mod/admin.php:1306
msgid "Logs"
msgstr ""
-#: ../../mod/admin.php:124
+#: ../../mod/admin.php:125
msgid "Plugin Features"
msgstr ""
-#: ../../mod/admin.php:126
+#: ../../mod/admin.php:127
msgid "User registrations waiting for confirmation"
msgstr ""
-#: ../../mod/admin.php:206
+#: ../../mod/admin.php:210
msgid "Message queues"
msgstr ""
-#: ../../mod/admin.php:211 ../../mod/admin.php:414 ../../mod/admin.php:516
-#: ../../mod/admin.php:726 ../../mod/admin.php:862 ../../mod/admin.php:953
-#: ../../mod/admin.php:995 ../../mod/admin.php:1158 ../../mod/admin.php:1194
-#: ../../mod/admin.php:1281
+#: ../../mod/admin.php:215 ../../mod/admin.php:418 ../../mod/admin.php:520
+#: ../../mod/admin.php:750 ../../mod/admin.php:886 ../../mod/admin.php:977
+#: ../../mod/admin.php:1019 ../../mod/admin.php:1182 ../../mod/admin.php:1218
+#: ../../mod/admin.php:1305
msgid "Administration"
msgstr ""
-#: ../../mod/admin.php:212
+#: ../../mod/admin.php:216
msgid "Summary"
msgstr ""
-#: ../../mod/admin.php:214
+#: ../../mod/admin.php:218
msgid "Registered users"
msgstr ""
-#: ../../mod/admin.php:216 ../../mod/admin.php:520
+#: ../../mod/admin.php:220 ../../mod/admin.php:524
msgid "Pending registrations"
msgstr ""
-#: ../../mod/admin.php:217
+#: ../../mod/admin.php:221
msgid "Version"
msgstr ""
-#: ../../mod/admin.php:219 ../../mod/admin.php:521
+#: ../../mod/admin.php:223 ../../mod/admin.php:525
msgid "Active plugins"
msgstr ""
-#: ../../mod/admin.php:330
+#: ../../mod/admin.php:334
msgid "Site settings updated."
msgstr ""
-#: ../../mod/admin.php:369
+#: ../../mod/admin.php:371 ../../mod/settings.php:804
+msgid "mobile"
+msgstr ""
+
+#: ../../mod/admin.php:373
msgid "experimental"
msgstr ""
-#: ../../mod/admin.php:371
+#: ../../mod/admin.php:375
msgid "unsupported"
msgstr ""
-#: ../../mod/admin.php:395
+#: ../../mod/admin.php:399
msgid "Yes - with approval"
msgstr ""
-#: ../../mod/admin.php:401
+#: ../../mod/admin.php:405
msgid "My site is not a public server"
msgstr ""
-#: ../../mod/admin.php:402
+#: ../../mod/admin.php:406
msgid "My site has paid access only"
msgstr ""
-#: ../../mod/admin.php:403
+#: ../../mod/admin.php:407
msgid "My site has free access only"
msgstr ""
-#: ../../mod/admin.php:404
+#: ../../mod/admin.php:408
msgid "My site offers free accounts with optional paid upgrades"
msgstr ""
-#: ../../mod/admin.php:417 ../../mod/register.php:207
+#: ../../mod/admin.php:421 ../../mod/register.php:207
msgid "Registration"
msgstr ""
-#: ../../mod/admin.php:418
+#: ../../mod/admin.php:422
msgid "File upload"
msgstr ""
-#: ../../mod/admin.php:419
+#: ../../mod/admin.php:423
msgid "Policies"
msgstr ""
-#: ../../mod/admin.php:424
+#: ../../mod/admin.php:428
msgid "Site name"
msgstr ""
-#: ../../mod/admin.php:425
+#: ../../mod/admin.php:429
msgid "Banner/Logo"
msgstr ""
-#: ../../mod/admin.php:426
+#: ../../mod/admin.php:430
msgid "Administrator Information"
msgstr ""
-#: ../../mod/admin.php:426
+#: ../../mod/admin.php:430
msgid ""
"Contact information for site administrators. Displayed on siteinfo page. "
"BBCode can be used here"
msgstr ""
-#: ../../mod/admin.php:427
+#: ../../mod/admin.php:431
msgid "System language"
msgstr ""
-#: ../../mod/admin.php:428
+#: ../../mod/admin.php:432
msgid "System theme"
msgstr ""
-#: ../../mod/admin.php:428
+#: ../../mod/admin.php:432
msgid ""
"Default system theme - may be over-ridden by user profiles - <a href='#' "
"id='cnftheme'>change theme settings</a>"
msgstr ""
-#: ../../mod/admin.php:429
+#: ../../mod/admin.php:433
msgid "Mobile system theme"
msgstr ""
-#: ../../mod/admin.php:429
+#: ../../mod/admin.php:433
msgid "Theme for mobile devices"
msgstr ""
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:435
msgid "Enable Diaspora Protocol"
msgstr ""
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:435
msgid "Communicate with Diaspora and Friendica - experimental"
msgstr ""
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:436
msgid "Allow Feeds as Connections"
msgstr ""
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:436
msgid "(Heavy system resource usage)"
msgstr ""
-#: ../../mod/admin.php:433
+#: ../../mod/admin.php:437
msgid "Maximum image size"
msgstr ""
-#: ../../mod/admin.php:433
+#: ../../mod/admin.php:437
msgid ""
"Maximum size in bytes of uploaded images. Default is 0, which means no "
"limits."
msgstr ""
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:438
msgid "Does this site allow new member registration?"
msgstr ""
-#: ../../mod/admin.php:435
+#: ../../mod/admin.php:439
msgid "Which best describes the types of account offered by this hub?"
msgstr ""
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:440
msgid "Register text"
msgstr ""
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:440
msgid "Will be displayed prominently on the registration page."
msgstr ""
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:441
msgid "Accounts abandoned after x days"
msgstr ""
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:441
msgid ""
"Will not waste system resources polling external sites for abandonded "
"accounts. Enter 0 for no time limit."
msgstr ""
-#: ../../mod/admin.php:438
+#: ../../mod/admin.php:442
msgid "Allowed friend domains"
msgstr ""
-#: ../../mod/admin.php:438
+#: ../../mod/admin.php:442
msgid ""
"Comma separated list of domains which are allowed to establish friendships "
"with this site. Wildcards are accepted. Empty to allow any domains"
msgstr ""
-#: ../../mod/admin.php:439
+#: ../../mod/admin.php:443
msgid "Allowed email domains"
msgstr ""
-#: ../../mod/admin.php:439
+#: ../../mod/admin.php:443
msgid ""
"Comma separated list of domains which are allowed in email addresses for "
"registrations to this site. Wildcards are accepted. Empty to allow any "
"domains"
msgstr ""
-#: ../../mod/admin.php:440
+#: ../../mod/admin.php:444
msgid "Not allowed email domains"
msgstr ""
-#: ../../mod/admin.php:440
+#: ../../mod/admin.php:444
msgid ""
"Comma separated list of domains which are not allowed in email addresses for "
"registrations to this site. Wildcards are accepted. Empty to allow any "
"domains, unless allowed domains have been defined."
msgstr ""
-#: ../../mod/admin.php:441
+#: ../../mod/admin.php:445
msgid "Block public"
msgstr ""
-#: ../../mod/admin.php:441
+#: ../../mod/admin.php:445
msgid ""
"Check to block public access to all otherwise public personal pages on this "
"site unless you are currently logged in."
msgstr ""
-#: ../../mod/admin.php:442
+#: ../../mod/admin.php:446
msgid "Verify Email Addresses"
msgstr ""
-#: ../../mod/admin.php:442
+#: ../../mod/admin.php:446
msgid ""
"Check to verify email addresses used in account registration (recommended)."
msgstr ""
-#: ../../mod/admin.php:443
+#: ../../mod/admin.php:447
msgid "Force publish"
msgstr ""
-#: ../../mod/admin.php:443
+#: ../../mod/admin.php:447
msgid ""
"Check to force all profiles on this site to be listed in the site directory."
msgstr ""
-#: ../../mod/admin.php:444
+#: ../../mod/admin.php:448
msgid "Disable discovery tab"
msgstr ""
-#: ../../mod/admin.php:444
+#: ../../mod/admin.php:448
msgid ""
"Remove the tab in the network view with public content pulled from sources "
"chosen for this site."
msgstr ""
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:449
msgid "No login on Homepage"
msgstr ""
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:449
msgid ""
"Check to hide the login form from your sites homepage when visitors arrive "
"who are not logged in (e.g. when you put the content of the homepage in via "
"the site channel)."
msgstr ""
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:451
msgid "Proxy user"
msgstr ""
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:452
msgid "Proxy URL"
msgstr ""
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:453
msgid "Network timeout"
msgstr ""
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:453
msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
msgstr ""
-#: ../../mod/admin.php:450
+#: ../../mod/admin.php:454
msgid "Delivery interval"
msgstr ""
-#: ../../mod/admin.php:450
+#: ../../mod/admin.php:454
msgid ""
"Delay background delivery processes by this many seconds to reduce system "
"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
"for large dedicated servers."
msgstr ""
-#: ../../mod/admin.php:451
+#: ../../mod/admin.php:455
msgid "Poll interval"
msgstr ""
-#: ../../mod/admin.php:451
+#: ../../mod/admin.php:455
msgid ""
"Delay background polling processes by this many seconds to reduce system "
"load. If 0, use delivery interval."
msgstr ""
-#: ../../mod/admin.php:452
+#: ../../mod/admin.php:456
msgid "Maximum Load Average"
msgstr ""
-#: ../../mod/admin.php:452
+#: ../../mod/admin.php:456
msgid ""
"Maximum system load before delivery and poll processes are deferred - "
"default 50."
msgstr ""
-#: ../../mod/admin.php:508
+#: ../../mod/admin.php:512
msgid "No server found"
msgstr ""
-#: ../../mod/admin.php:515 ../../mod/admin.php:740
+#: ../../mod/admin.php:519 ../../mod/admin.php:764
msgid "ID"
msgstr ""
-#: ../../mod/admin.php:515
+#: ../../mod/admin.php:519
msgid "for channel"
msgstr ""
-#: ../../mod/admin.php:515
+#: ../../mod/admin.php:519
msgid "on server"
msgstr ""
-#: ../../mod/admin.php:515
+#: ../../mod/admin.php:519
msgid "Status"
msgstr ""
-#: ../../mod/admin.php:536
+#: ../../mod/admin.php:521
+msgid "Server"
+msgstr ""
+
+#: ../../mod/admin.php:540
msgid "Update has been marked successful"
msgstr ""
-#: ../../mod/admin.php:546
+#: ../../mod/admin.php:550
#, php-format
msgid "Executing %s failed. Check system logs."
msgstr ""
-#: ../../mod/admin.php:549
+#: ../../mod/admin.php:553
#, php-format
msgid "Update %s was successfully applied."
msgstr ""
-#: ../../mod/admin.php:553
+#: ../../mod/admin.php:557
#, php-format
msgid "Update %s did not return a status. Unknown if it succeeded."
msgstr ""
-#: ../../mod/admin.php:556
+#: ../../mod/admin.php:560
#, php-format
msgid "Update function %s could not be found."
msgstr ""
-#: ../../mod/admin.php:571
+#: ../../mod/admin.php:575
msgid "No failed updates."
msgstr ""
-#: ../../mod/admin.php:575
+#: ../../mod/admin.php:579
msgid "Failed Updates"
msgstr ""
-#: ../../mod/admin.php:577
+#: ../../mod/admin.php:581
msgid "Mark success (if update was manually applied)"
msgstr ""
-#: ../../mod/admin.php:578
+#: ../../mod/admin.php:582
msgid "Attempt to execute this update step automatically"
msgstr ""
-#: ../../mod/admin.php:604
+#: ../../mod/admin.php:596
+msgid "Queue Statistics"
+msgstr ""
+
+#: ../../mod/admin.php:599
+msgid "Total Entries"
+msgstr ""
+
+#: ../../mod/admin.php:599
+msgid "Destination URL"
+msgstr ""
+
+#: ../../mod/admin.php:628
#, php-format
msgid "%s user blocked/unblocked"
msgid_plural "%s users blocked/unblocked"
msgstr[0] ""
msgstr[1] ""
-#: ../../mod/admin.php:611
+#: ../../mod/admin.php:635
#, php-format
msgid "%s user deleted"
msgid_plural "%s users deleted"
msgstr[0] ""
msgstr[1] ""
-#: ../../mod/admin.php:640
+#: ../../mod/admin.php:664
msgid "Account not found"
msgstr ""
-#: ../../mod/admin.php:660
+#: ../../mod/admin.php:684
#, php-format
msgid "User '%s' unblocked"
msgstr ""
-#: ../../mod/admin.php:660
+#: ../../mod/admin.php:684
#, php-format
msgid "User '%s' blocked"
msgstr ""
-#: ../../mod/admin.php:727 ../../mod/admin.php:739
+#: ../../mod/admin.php:751 ../../mod/admin.php:763
msgid "Users"
msgstr ""
-#: ../../mod/admin.php:729 ../../mod/admin.php:865
+#: ../../mod/admin.php:753 ../../mod/admin.php:889
msgid "select all"
msgstr ""
-#: ../../mod/admin.php:730
+#: ../../mod/admin.php:754
msgid "User registrations waiting for confirm"
msgstr ""
-#: ../../mod/admin.php:731
+#: ../../mod/admin.php:755
msgid "Request date"
msgstr ""
-#: ../../mod/admin.php:732
+#: ../../mod/admin.php:756
msgid "No registrations."
msgstr ""
-#: ../../mod/admin.php:733
+#: ../../mod/admin.php:757
msgid "Approve"
msgstr ""
-#: ../../mod/admin.php:734
+#: ../../mod/admin.php:758
msgid "Deny"
msgstr ""
-#: ../../mod/admin.php:740
+#: ../../mod/admin.php:764
msgid "Register date"
msgstr ""
-#: ../../mod/admin.php:740
+#: ../../mod/admin.php:764
msgid "Last login"
msgstr ""
-#: ../../mod/admin.php:740
+#: ../../mod/admin.php:764
msgid "Expires"
msgstr ""
-#: ../../mod/admin.php:740
+#: ../../mod/admin.php:764
msgid "Service Class"
msgstr ""
-#: ../../mod/admin.php:742
+#: ../../mod/admin.php:766
msgid ""
"Selected users will be deleted!\\n\\nEverything these users had posted on "
"this site will be permanently deleted!\\n\\nAre you sure?"
msgstr ""
-#: ../../mod/admin.php:743
+#: ../../mod/admin.php:767
msgid ""
"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
"site will be permanently deleted!\\n\\nAre you sure?"
msgstr ""
-#: ../../mod/admin.php:776
+#: ../../mod/admin.php:800
#, php-format
msgid "%s channel censored/uncensored"
msgid_plural "%s channels censored/uncensored"
msgstr[0] ""
msgstr[1] ""
-#: ../../mod/admin.php:783
+#: ../../mod/admin.php:807
#, php-format
msgid "%s channel deleted"
msgid_plural "%s channels deleted"
msgstr[0] ""
msgstr[1] ""
-#: ../../mod/admin.php:802
+#: ../../mod/admin.php:826
msgid "Channel not found"
msgstr ""
-#: ../../mod/admin.php:813
+#: ../../mod/admin.php:837
#, php-format
msgid "Channel '%s' deleted"
msgstr ""
-#: ../../mod/admin.php:824
+#: ../../mod/admin.php:848
#, php-format
msgid "Channel '%s' uncensored"
msgstr ""
-#: ../../mod/admin.php:824
+#: ../../mod/admin.php:848
#, php-format
msgid "Channel '%s' censored"
msgstr ""
-#: ../../mod/admin.php:867
+#: ../../mod/admin.php:891
msgid "Censor"
msgstr ""
-#: ../../mod/admin.php:868
+#: ../../mod/admin.php:892
msgid "Uncensor"
msgstr ""
-#: ../../mod/admin.php:871
+#: ../../mod/admin.php:895
msgid "UID"
msgstr ""
-#: ../../mod/admin.php:873
+#: ../../mod/admin.php:897
msgid ""
"Selected channels will be deleted!\\n\\nEverything that was posted in these "
"channels on this site will be permanently deleted!\\n\\nAre you sure?"
msgstr ""
-#: ../../mod/admin.php:874
+#: ../../mod/admin.php:898
msgid ""
"The channel {0} will be deleted!\\n\\nEverything that was posted in this "
"channel on this site will be permanently deleted!\\n\\nAre you sure?"
msgstr ""
-#: ../../mod/admin.php:913
+#: ../../mod/admin.php:937
#, php-format
msgid "Plugin %s disabled."
msgstr ""
-#: ../../mod/admin.php:917
+#: ../../mod/admin.php:941
#, php-format
msgid "Plugin %s enabled."
msgstr ""
-#: ../../mod/admin.php:927 ../../mod/admin.php:1129
+#: ../../mod/admin.php:951 ../../mod/admin.php:1153
msgid "Disable"
msgstr ""
-#: ../../mod/admin.php:929 ../../mod/admin.php:1131
+#: ../../mod/admin.php:953 ../../mod/admin.php:1155
msgid "Enable"
msgstr ""
-#: ../../mod/admin.php:955 ../../mod/admin.php:1160
+#: ../../mod/admin.php:979 ../../mod/admin.php:1184
msgid "Toggle"
msgstr ""
-#: ../../mod/admin.php:963 ../../mod/admin.php:1170
+#: ../../mod/admin.php:987 ../../mod/admin.php:1194
msgid "Author: "
msgstr ""
-#: ../../mod/admin.php:964 ../../mod/admin.php:1171
+#: ../../mod/admin.php:988 ../../mod/admin.php:1195
msgid "Maintainer: "
msgstr ""
-#: ../../mod/admin.php:1093
+#: ../../mod/admin.php:1117
msgid "No themes found."
msgstr ""
-#: ../../mod/admin.php:1152
+#: ../../mod/admin.php:1176
msgid "Screenshot"
msgstr ""
-#: ../../mod/admin.php:1200
+#: ../../mod/admin.php:1224
msgid "[Experimental]"
msgstr ""
-#: ../../mod/admin.php:1201
+#: ../../mod/admin.php:1225
msgid "[Unsupported]"
msgstr ""
-#: ../../mod/admin.php:1228
+#: ../../mod/admin.php:1252
msgid "Log settings updated."
msgstr ""
-#: ../../mod/admin.php:1284
+#: ../../mod/admin.php:1308
msgid "Clear"
msgstr ""
-#: ../../mod/admin.php:1290
+#: ../../mod/admin.php:1314
msgid "Debugging"
msgstr ""
-#: ../../mod/admin.php:1291
+#: ../../mod/admin.php:1315
msgid "Log file"
msgstr ""
-#: ../../mod/admin.php:1291
+#: ../../mod/admin.php:1315
msgid ""
"Must be writable by web server. Relative to your Red top-level directory."
msgstr ""
-#: ../../mod/admin.php:1292
+#: ../../mod/admin.php:1316
msgid "Log level"
msgstr ""
-#: ../../mod/admin.php:1339
+#: ../../mod/admin.php:1363
msgid "New Profile Field"
msgstr ""
-#: ../../mod/admin.php:1340 ../../mod/admin.php:1361
+#: ../../mod/admin.php:1364 ../../mod/admin.php:1385
msgid "Field nickname"
msgstr ""
-#: ../../mod/admin.php:1340 ../../mod/admin.php:1361
+#: ../../mod/admin.php:1364 ../../mod/admin.php:1385
msgid "System name of field"
msgstr ""
-#: ../../mod/admin.php:1341 ../../mod/admin.php:1362
+#: ../../mod/admin.php:1365 ../../mod/admin.php:1386
msgid "Input type"
msgstr ""
-#: ../../mod/admin.php:1342 ../../mod/admin.php:1363
+#: ../../mod/admin.php:1366 ../../mod/admin.php:1387
msgid "Field Name"
msgstr ""
-#: ../../mod/admin.php:1342 ../../mod/admin.php:1363
+#: ../../mod/admin.php:1366 ../../mod/admin.php:1387
msgid "Label on profile pages"
msgstr ""
-#: ../../mod/admin.php:1343 ../../mod/admin.php:1364
+#: ../../mod/admin.php:1367 ../../mod/admin.php:1388
msgid "Help text"
msgstr ""
-#: ../../mod/admin.php:1343 ../../mod/admin.php:1364
+#: ../../mod/admin.php:1367 ../../mod/admin.php:1388
msgid "Additional info (optional)"
msgstr ""
-#: ../../mod/admin.php:1354
+#: ../../mod/admin.php:1378
msgid "Field definition not found"
msgstr ""
-#: ../../mod/admin.php:1360
+#: ../../mod/admin.php:1384
msgid "Edit Profile Field"
msgstr ""
@@ -7713,19 +7211,78 @@ msgstr ""
msgid "Post successful."
msgstr ""
-#: ../../mod/post.php:229
+#: ../../mod/register.php:44
+msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
+msgstr ""
+
+#: ../../mod/register.php:50
msgid ""
-"Remote authentication blocked. You are logged into this site locally. Please "
-"logout and retry."
+"Please indicate acceptance of the Terms of Service. Registration failed."
msgstr ""
-#: ../../mod/post.php:261 ../../mod/openid.php:72 ../../mod/openid.php:180
+#: ../../mod/register.php:84
+msgid "Passwords do not match."
+msgstr ""
+
+#: ../../mod/register.php:117
+msgid ""
+"Registration successful. Please check your email for validation instructions."
+msgstr ""
+
+#: ../../mod/register.php:123
+msgid "Your registration is pending approval by the site owner."
+msgstr ""
+
+#: ../../mod/register.php:126
+msgid "Your registration can not be processed."
+msgstr ""
+
+#: ../../mod/register.php:163
+msgid "Registration on this site/hub is by approval only."
+msgstr ""
+
+#: ../../mod/register.php:164
+msgid "<a href=\"pubsites\">Register at another affiliated site/hub</a>"
+msgstr ""
+
+#: ../../mod/register.php:174
+msgid ""
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
+msgstr ""
+
+#: ../../mod/register.php:185
+msgid "Terms of Service"
+msgstr ""
+
+#: ../../mod/register.php:191
#, php-format
-msgid "Welcome %s. Remote authentication successful."
+msgid "I accept the %s for this website"
msgstr ""
-#: ../../mod/regmod.php:11
-msgid "Please login."
+#: ../../mod/register.php:193
+#, php-format
+msgid "I am over 13 years of age and accept the %s for this website"
+msgstr ""
+
+#: ../../mod/register.php:212
+msgid "Membership on this site is by invitation only."
+msgstr ""
+
+#: ../../mod/register.php:213
+msgid "Please enter your invitation code"
+msgstr ""
+
+#: ../../mod/register.php:216
+msgid "Your email address"
+msgstr ""
+
+#: ../../mod/register.php:217
+msgid "Choose a password"
+msgstr ""
+
+#: ../../mod/register.php:218
+msgid "Please re-enter your password"
msgstr ""
#: ../../mod/removeaccount.php:30
@@ -7760,30 +7317,159 @@ msgid ""
"removed from the network"
msgstr ""
+#: ../../mod/removeaccount.php:61 ../../mod/settings.php:710
+msgid "Remove Account"
+msgstr ""
+
#: ../../mod/update_channel.php:43 ../../mod/update_display.php:25
#: ../../mod/update_network.php:23 ../../mod/update_search.php:46
#: ../../mod/update_home.php:21
msgid "[Embedded content - reload page to view]"
msgstr ""
-#: ../../mod/wall_upload.php:35
-msgid "Wall Photos"
+#: ../../mod/photos.php:77
+msgid "Page owner information could not be retrieved."
msgstr ""
-#: ../../mod/match.php:16
-msgid "Profile Match"
+#: ../../mod/photos.php:97
+msgid "Album not found."
msgstr ""
-#: ../../mod/match.php:24
-msgid "No keywords to match. Please add keywords to your default profile."
+#: ../../mod/photos.php:119 ../../mod/photos.php:643
+msgid "Delete Album"
msgstr ""
-#: ../../mod/match.php:61
-msgid "is interested in:"
+#: ../../mod/photos.php:159 ../../mod/photos.php:924
+msgid "Delete Photo"
msgstr ""
-#: ../../mod/match.php:69
-msgid "No matches"
+#: ../../mod/photos.php:440
+msgid "No photos selected"
+msgstr ""
+
+#: ../../mod/photos.php:484
+msgid "Access to this item is restricted."
+msgstr ""
+
+#: ../../mod/photos.php:523
+#, php-format
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
+msgstr ""
+
+#: ../../mod/photos.php:526
+#, php-format
+msgid "%1$.2f MB photo storage used."
+msgstr ""
+
+#: ../../mod/photos.php:550
+msgid "Upload Photos"
+msgstr ""
+
+#: ../../mod/photos.php:554 ../../mod/photos.php:636 ../../mod/photos.php:909
+msgid "Enter a new album name"
+msgstr ""
+
+#: ../../mod/photos.php:555 ../../mod/photos.php:637 ../../mod/photos.php:910
+msgid "or select an existing one (doubleclick)"
+msgstr ""
+
+#: ../../mod/photos.php:556
+msgid "Do not show a status post for this upload"
+msgstr ""
+
+#: ../../mod/photos.php:584
+msgid "Album name could not be decoded"
+msgstr ""
+
+#: ../../mod/photos.php:625 ../../mod/photos.php:1149
+#: ../../mod/photos.php:1165
+msgid "Contact Photos"
+msgstr ""
+
+#: ../../mod/photos.php:649
+msgid "Show Newest First"
+msgstr ""
+
+#: ../../mod/photos.php:651
+msgid "Show Oldest First"
+msgstr ""
+
+#: ../../mod/photos.php:675 ../../mod/photos.php:1197
+msgid "View Photo"
+msgstr ""
+
+#: ../../mod/photos.php:704
+msgid "Edit Album"
+msgstr ""
+
+#: ../../mod/photos.php:749
+msgid "Permission denied. Access to this item may be restricted."
+msgstr ""
+
+#: ../../mod/photos.php:751
+msgid "Photo not available"
+msgstr ""
+
+#: ../../mod/photos.php:809
+msgid "Use as profile photo"
+msgstr ""
+
+#: ../../mod/photos.php:816
+msgid "Private Photo"
+msgstr ""
+
+#: ../../mod/photos.php:831
+msgid "View Full Size"
+msgstr ""
+
+#: ../../mod/photos.php:903
+msgid "Edit photo"
+msgstr ""
+
+#: ../../mod/photos.php:905
+msgid "Rotate CW (right)"
+msgstr ""
+
+#: ../../mod/photos.php:906
+msgid "Rotate CCW (left)"
+msgstr ""
+
+#: ../../mod/photos.php:913
+msgid "Caption"
+msgstr ""
+
+#: ../../mod/photos.php:915
+msgid "Add a Tag"
+msgstr ""
+
+#: ../../mod/photos.php:919
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+msgstr ""
+
+#: ../../mod/photos.php:922
+msgid "Flag as adult in album view"
+msgstr ""
+
+#: ../../mod/photos.php:1114
+msgid "In This Photo:"
+msgstr ""
+
+#: ../../mod/photos.php:1203
+msgid "View Album"
+msgstr ""
+
+#: ../../mod/photos.php:1226
+msgid "Recent Photos"
+msgstr ""
+
+#: ../../mod/post.php:229
+msgid ""
+"Remote authentication blocked. You are logged into this site locally. Please "
+"logout and retry."
+msgstr ""
+
+#: ../../mod/wall_upload.php:35
+msgid "Wall Photos"
msgstr ""
#: ../../mod/message.php:41
@@ -7862,6 +7548,10 @@ msgstr ""
msgid "Menu Item Permissions"
msgstr ""
+#: ../../mod/mitem.php:161 ../../mod/mitem.php:204 ../../mod/settings.php:1071
+msgid "(click to open/close)"
+msgstr ""
+
#: ../../mod/mitem.php:163 ../../mod/mitem.php:207
msgid "Link text"
msgstr ""
@@ -7952,72 +7642,30 @@ msgstr ""
msgid "Layout Name"
msgstr ""
-#: ../../mod/like.php:15
-msgid "Like/Dislike"
-msgstr ""
-
-#: ../../mod/like.php:20
-msgid "This action is restricted to members."
-msgstr ""
-
-#: ../../mod/like.php:21
+#: ../../mod/rmagic.php:38
msgid ""
-"Please <a href=\"rmagic\">login with your RedMatrix ID</a> or <a href="
-"\"register\">register as a new RedMatrix member</a> to continue."
-msgstr ""
-
-#: ../../mod/like.php:101 ../../mod/like.php:128 ../../mod/like.php:166
-msgid "Invalid request."
-msgstr ""
-
-#: ../../mod/like.php:143
-msgid "thing"
-msgstr ""
-
-#: ../../mod/like.php:189
-msgid "Channel unavailable."
-msgstr ""
-
-#: ../../mod/like.php:228
-msgid "Previous action reversed."
-msgstr ""
-
-#: ../../mod/like.php:387
-#, php-format
-msgid "%1$s agrees with %2$s's %3$s"
-msgstr ""
-
-#: ../../mod/like.php:389
-#, php-format
-msgid "%1$s doesn't agree with %2$s's %3$s"
-msgstr ""
-
-#: ../../mod/like.php:391
-#, php-format
-msgid "%1$s abstains from a decision on %2$s's %3$s"
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
msgstr ""
-#: ../../mod/like.php:393
-#, php-format
-msgid "%1$s is attending %2$s's %3$s"
+#: ../../mod/rmagic.php:38
+msgid "The error message was:"
msgstr ""
-#: ../../mod/like.php:395
-#, php-format
-msgid "%1$s is not attending %2$s's %3$s"
+#: ../../mod/rmagic.php:42
+msgid "Authentication failed."
msgstr ""
-#: ../../mod/like.php:397
-#, php-format
-msgid "%1$s may attend %2$s's %3$s"
+#: ../../mod/rmagic.php:82
+msgid "Remote Authentication"
msgstr ""
-#: ../../mod/like.php:481
-msgid "Action completed."
+#: ../../mod/rmagic.php:83
+msgid "Enter your channel address (e.g. channel@example.com)"
msgstr ""
-#: ../../mod/like.php:482
-msgid "Thank you."
+#: ../../mod/rmagic.php:84
+msgid "Authenticate"
msgstr ""
#: ../../mod/mail.php:33
@@ -8145,271 +7793,647 @@ msgstr ""
msgid "Read more about roles"
msgstr ""
-#: ../../mod/openid.php:26
-msgid "OpenID protocol error. No ID returned."
+#: ../../mod/appman.php:28 ../../mod/appman.php:44
+msgid "App installed."
msgstr ""
-#: ../../mod/photos.php:77
-msgid "Page owner information could not be retrieved."
+#: ../../mod/appman.php:37
+msgid "Malformed app."
msgstr ""
-#: ../../mod/photos.php:97
-msgid "Album not found."
+#: ../../mod/appman.php:80
+msgid "Embed code"
msgstr ""
-#: ../../mod/photos.php:119 ../../mod/photos.php:643
-msgid "Delete Album"
+#: ../../mod/appman.php:86
+msgid "Edit App"
msgstr ""
-#: ../../mod/photos.php:159 ../../mod/photos.php:924
-msgid "Delete Photo"
+#: ../../mod/appman.php:86
+msgid "Create App"
msgstr ""
-#: ../../mod/photos.php:440
-msgid "No photos selected"
+#: ../../mod/appman.php:91
+msgid "Name of app"
msgstr ""
-#: ../../mod/photos.php:484
-msgid "Access to this item is restricted."
+#: ../../mod/appman.php:92
+msgid "Location (URL) of app"
msgstr ""
-#: ../../mod/photos.php:523
-#, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
+#: ../../mod/appman.php:94
+msgid "Photo icon URL"
msgstr ""
-#: ../../mod/photos.php:526
+#: ../../mod/appman.php:94
+msgid "80 x 80 pixels - optional"
+msgstr ""
+
+#: ../../mod/appman.php:95
+msgid "Version ID"
+msgstr ""
+
+#: ../../mod/appman.php:96
+msgid "Price of app"
+msgstr ""
+
+#: ../../mod/appman.php:97
+msgid "Location (URL) to purchase app"
+msgstr ""
+
+#: ../../mod/ping.php:263
+msgid "sent you a private message"
+msgstr ""
+
+#: ../../mod/ping.php:314
+msgid "added your channel"
+msgstr ""
+
+#: ../../mod/ping.php:355
+msgid "posted an event"
+msgstr ""
+
+#: ../../mod/bookmarks.php:38
+msgid "Bookmark added"
+msgstr ""
+
+#: ../../mod/bookmarks.php:60
+msgid "My Bookmarks"
+msgstr ""
+
+#: ../../mod/bookmarks.php:71
+msgid "My Connections Bookmarks"
+msgstr ""
+
+#: ../../mod/channel.php:87
+msgid "Insufficient permissions. Request redirected to profile page."
+msgstr ""
+
+#: ../../mod/settings.php:73
+msgid "Name is required"
+msgstr ""
+
+#: ../../mod/settings.php:77
+msgid "Key and Secret are required"
+msgstr ""
+
+#: ../../mod/settings.php:120
+msgid "Diaspora Policy Settings updated."
+msgstr ""
+
+#: ../../mod/settings.php:228
+msgid "Passwords do not match. Password unchanged."
+msgstr ""
+
+#: ../../mod/settings.php:232
+msgid "Empty passwords are not allowed. Password unchanged."
+msgstr ""
+
+#: ../../mod/settings.php:246
+msgid "Password changed."
+msgstr ""
+
+#: ../../mod/settings.php:248
+msgid "Password update failed. Please try again."
+msgstr ""
+
+#: ../../mod/settings.php:262
+msgid "Not valid email."
+msgstr ""
+
+#: ../../mod/settings.php:265
+msgid "Protected email address. Cannot change to that email."
+msgstr ""
+
+#: ../../mod/settings.php:274
+msgid "System failure storing new email. Please try again."
+msgstr ""
+
+#: ../../mod/settings.php:513
+msgid "Settings updated."
+msgstr ""
+
+#: ../../mod/settings.php:582 ../../mod/settings.php:608
+#: ../../mod/settings.php:644
+msgid "Add application"
+msgstr ""
+
+#: ../../mod/settings.php:585
+msgid "Name of application"
+msgstr ""
+
+#: ../../mod/settings.php:586 ../../mod/settings.php:612
+msgid "Consumer Key"
+msgstr ""
+
+#: ../../mod/settings.php:586 ../../mod/settings.php:587
+msgid "Automatically generated - change if desired. Max length 20"
+msgstr ""
+
+#: ../../mod/settings.php:587 ../../mod/settings.php:613
+msgid "Consumer Secret"
+msgstr ""
+
+#: ../../mod/settings.php:588 ../../mod/settings.php:614
+msgid "Redirect"
+msgstr ""
+
+#: ../../mod/settings.php:588
+msgid ""
+"Redirect URI - leave blank unless your application specifically requires this"
+msgstr ""
+
+#: ../../mod/settings.php:589 ../../mod/settings.php:615
+msgid "Icon url"
+msgstr ""
+
+#: ../../mod/settings.php:589
+msgid "Optional"
+msgstr ""
+
+#: ../../mod/settings.php:600
+msgid "You can't edit this application."
+msgstr ""
+
+#: ../../mod/settings.php:643
+msgid "Connected Apps"
+msgstr ""
+
+#: ../../mod/settings.php:647
+msgid "Client key starts with"
+msgstr ""
+
+#: ../../mod/settings.php:648
+msgid "No name"
+msgstr ""
+
+#: ../../mod/settings.php:649
+msgid "Remove authorization"
+msgstr ""
+
+#: ../../mod/settings.php:663
+msgid "No feature settings configured"
+msgstr ""
+
+#: ../../mod/settings.php:676
+msgid "Feature Settings"
+msgstr ""
+
+#: ../../mod/settings.php:679
+msgid "Diaspora Policy Settings"
+msgstr ""
+
+#: ../../mod/settings.php:680
+msgid "Allow any Diaspora member to comment on your public posts."
+msgstr ""
+
+#: ../../mod/settings.php:681
+msgid "Submit Diaspora Policy Settings"
+msgstr ""
+
+#: ../../mod/settings.php:704
+msgid "Account Settings"
+msgstr ""
+
+#: ../../mod/settings.php:705
+msgid "Password Settings"
+msgstr ""
+
+#: ../../mod/settings.php:706
+msgid "New Password:"
+msgstr ""
+
+#: ../../mod/settings.php:707
+msgid "Confirm:"
+msgstr ""
+
+#: ../../mod/settings.php:707
+msgid "Leave password fields blank unless changing"
+msgstr ""
+
+#: ../../mod/settings.php:709 ../../mod/settings.php:1045
+msgid "Email Address:"
+msgstr ""
+
+#: ../../mod/settings.php:711
+msgid "Remove this account from this server including all its channels"
+msgstr ""
+
+#: ../../mod/settings.php:712 ../../mod/settings.php:1126
+msgid "Warning: This action is permanent and cannot be reversed."
+msgstr ""
+
+#: ../../mod/settings.php:728
+msgid "Off"
+msgstr ""
+
+#: ../../mod/settings.php:728
+msgid "On"
+msgstr ""
+
+#: ../../mod/settings.php:735
+msgid "Additional Features"
+msgstr ""
+
+#: ../../mod/settings.php:759
+msgid "Connector Settings"
+msgstr ""
+
+#: ../../mod/settings.php:798
+msgid "No special theme for mobile devices"
+msgstr ""
+
+#: ../../mod/settings.php:801
#, php-format
-msgid "%1$.2f MB photo storage used."
+msgid "%s - (Experimental)"
msgstr ""
-#: ../../mod/photos.php:550
-msgid "Upload Photos"
+#: ../../mod/settings.php:840
+msgid "Display Settings"
msgstr ""
-#: ../../mod/photos.php:554 ../../mod/photos.php:636 ../../mod/photos.php:909
-msgid "Enter a new album name"
+#: ../../mod/settings.php:846
+msgid "Display Theme:"
msgstr ""
-#: ../../mod/photos.php:555 ../../mod/photos.php:637 ../../mod/photos.php:910
-msgid "or select an existing one (doubleclick)"
+#: ../../mod/settings.php:847
+msgid "Mobile Theme:"
msgstr ""
-#: ../../mod/photos.php:556
-msgid "Do not show a status post for this upload"
+#: ../../mod/settings.php:848
+msgid "Enable user zoom on mobile devices"
msgstr ""
-#: ../../mod/photos.php:584
-msgid "Album name could not be decoded"
+#: ../../mod/settings.php:849
+msgid "Update browser every xx seconds"
msgstr ""
-#: ../../mod/photos.php:625 ../../mod/photos.php:1149
-#: ../../mod/photos.php:1165
-msgid "Contact Photos"
+#: ../../mod/settings.php:849
+msgid "Minimum of 10 seconds, no maximum"
msgstr ""
-#: ../../mod/photos.php:649
-msgid "Show Newest First"
+#: ../../mod/settings.php:850
+msgid "Maximum number of conversations to load at any time:"
msgstr ""
-#: ../../mod/photos.php:651
-msgid "Show Oldest First"
+#: ../../mod/settings.php:850
+msgid "Maximum of 100 items"
msgstr ""
-#: ../../mod/photos.php:675 ../../mod/photos.php:1197
-msgid "View Photo"
+#: ../../mod/settings.php:851
+msgid "Don't show emoticons"
msgstr ""
-#: ../../mod/photos.php:704
-msgid "Edit Album"
+#: ../../mod/settings.php:852
+msgid "Link post titles to source"
msgstr ""
-#: ../../mod/photos.php:749
-msgid "Permission denied. Access to this item may be restricted."
+#: ../../mod/settings.php:853
+msgid "System Page Layout Editor - (advanced)"
msgstr ""
-#: ../../mod/photos.php:751
-msgid "Photo not available"
+#: ../../mod/settings.php:856
+msgid "Use blog/list mode on channel page"
msgstr ""
-#: ../../mod/photos.php:809
-msgid "Use as profile photo"
+#: ../../mod/settings.php:856 ../../mod/settings.php:857
+msgid "(comments displayed separately)"
msgstr ""
-#: ../../mod/photos.php:816
-msgid "Private Photo"
+#: ../../mod/settings.php:857
+msgid "Use blog/list mode on matrix page"
msgstr ""
-#: ../../mod/photos.php:831
-msgid "View Full Size"
+#: ../../mod/settings.php:858
+msgid "Channel page max height of content (in pixels)"
msgstr ""
-#: ../../mod/photos.php:903
-msgid "Edit photo"
+#: ../../mod/settings.php:858 ../../mod/settings.php:859
+msgid "click to expand content exceeding this height"
msgstr ""
-#: ../../mod/photos.php:905
-msgid "Rotate CW (right)"
+#: ../../mod/settings.php:859
+msgid "Matrix page max height of content (in pixels)"
msgstr ""
-#: ../../mod/photos.php:906
-msgid "Rotate CCW (left)"
+#: ../../mod/settings.php:893
+msgid "Nobody except yourself"
msgstr ""
-#: ../../mod/photos.php:913
-msgid "Caption"
+#: ../../mod/settings.php:894
+msgid "Only those you specifically allow"
msgstr ""
-#: ../../mod/photos.php:915
-msgid "Add a Tag"
+#: ../../mod/settings.php:895
+msgid "Approved connections"
msgstr ""
-#: ../../mod/photos.php:919
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+#: ../../mod/settings.php:896
+msgid "Any connections"
msgstr ""
-#: ../../mod/photos.php:922
-msgid "Flag as adult in album view"
+#: ../../mod/settings.php:897
+msgid "Anybody on this website"
msgstr ""
-#: ../../mod/photos.php:1114
-msgid "In This Photo:"
+#: ../../mod/settings.php:898
+msgid "Anybody in this network"
msgstr ""
-#: ../../mod/photos.php:1203
-msgid "View Album"
+#: ../../mod/settings.php:899
+msgid "Anybody authenticated"
msgstr ""
-#: ../../mod/photos.php:1226
-msgid "Recent Photos"
+#: ../../mod/settings.php:900
+msgid "Anybody on the internet"
msgstr ""
-#: ../../mod/ping.php:263
-msgid "sent you a private message"
+#: ../../mod/settings.php:974
+msgid "Publish your default profile in the network directory"
msgstr ""
-#: ../../mod/ping.php:314
-msgid "added your channel"
+#: ../../mod/settings.php:979
+msgid "Allow us to suggest you as a potential friend to new members?"
msgstr ""
-#: ../../mod/ping.php:355
-msgid "posted an event"
+#: ../../mod/settings.php:988
+msgid "Your channel address is"
msgstr ""
-#: ../../mod/bookmarks.php:38
-msgid "Bookmark added"
+#: ../../mod/settings.php:1036
+msgid "Channel Settings"
msgstr ""
-#: ../../mod/bookmarks.php:60
-msgid "My Bookmarks"
+#: ../../mod/settings.php:1043
+msgid "Basic Settings"
msgstr ""
-#: ../../mod/bookmarks.php:71
-msgid "My Connections Bookmarks"
+#: ../../mod/settings.php:1046
+msgid "Your Timezone:"
msgstr ""
-#: ../../mod/channel.php:87
-msgid "Insufficient permissions. Request redirected to profile page."
+#: ../../mod/settings.php:1047
+msgid "Default Post Location:"
msgstr ""
-#: ../../mod/register.php:44
-msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
+#: ../../mod/settings.php:1047
+msgid "Geographical location to display on your posts"
msgstr ""
-#: ../../mod/register.php:50
+#: ../../mod/settings.php:1048
+msgid "Use Browser Location:"
+msgstr ""
+
+#: ../../mod/settings.php:1050
+msgid "Adult Content"
+msgstr ""
+
+#: ../../mod/settings.php:1050
msgid ""
-"Please indicate acceptance of the Terms of Service. Registration failed."
+"This channel frequently or regularly publishes adult content. (Please tag "
+"any adult material and/or nudity with #NSFW)"
msgstr ""
-#: ../../mod/register.php:84
-msgid "Passwords do not match."
+#: ../../mod/settings.php:1052
+msgid "Security and Privacy Settings"
msgstr ""
-#: ../../mod/register.php:117
+#: ../../mod/settings.php:1054
+msgid "Your permissions are already configured. Click to view/adjust"
+msgstr ""
+
+#: ../../mod/settings.php:1056
+msgid "Hide my online presence"
+msgstr ""
+
+#: ../../mod/settings.php:1056
+msgid "Prevents displaying in your profile that you are online"
+msgstr ""
+
+#: ../../mod/settings.php:1058
+msgid "Simple Privacy Settings:"
+msgstr ""
+
+#: ../../mod/settings.php:1059
msgid ""
-"Registration successful. Please check your email for validation instructions."
+"Very Public - <em>extremely permissive (should be used with caution)</em>"
msgstr ""
-#: ../../mod/register.php:123
-msgid "Your registration is pending approval by the site owner."
+#: ../../mod/settings.php:1060
+msgid ""
+"Typical - <em>default public, privacy when desired (similar to social "
+"network permissions but with improved privacy)</em>"
msgstr ""
-#: ../../mod/register.php:126
-msgid "Your registration can not be processed."
+#: ../../mod/settings.php:1061
+msgid "Private - <em>default private, never open or public</em>"
msgstr ""
-#: ../../mod/register.php:163
-msgid "Registration on this site/hub is by approval only."
+#: ../../mod/settings.php:1062
+msgid "Blocked - <em>default blocked to/from everybody</em>"
msgstr ""
-#: ../../mod/register.php:164
-msgid "<a href=\"pubsites\">Register at another affiliated site/hub</a>"
+#: ../../mod/settings.php:1064
+msgid "Allow others to tag your posts"
msgstr ""
-#: ../../mod/register.php:174
+#: ../../mod/settings.php:1064
msgid ""
-"This site has exceeded the number of allowed daily account registrations. "
-"Please try again tomorrow."
+"Often used by the community to retro-actively flag inappropriate content"
msgstr ""
-#: ../../mod/register.php:185
-msgid "Terms of Service"
+#: ../../mod/settings.php:1066
+msgid "Advanced Privacy Settings"
msgstr ""
-#: ../../mod/register.php:191
-#, php-format
-msgid "I accept the %s for this website"
+#: ../../mod/settings.php:1068
+msgid "Expire other channel content after this many days"
msgstr ""
-#: ../../mod/register.php:193
-#, php-format
-msgid "I am over 13 years of age and accept the %s for this website"
+#: ../../mod/settings.php:1068
+msgid "0 or blank prevents expiration"
msgstr ""
-#: ../../mod/register.php:212
-msgid "Membership on this site is by invitation only."
+#: ../../mod/settings.php:1069
+msgid "Maximum Friend Requests/Day:"
msgstr ""
-#: ../../mod/register.php:213
-msgid "Please enter your invitation code"
+#: ../../mod/settings.php:1069
+msgid "May reduce spam activity"
msgstr ""
-#: ../../mod/register.php:216
-msgid "Your email address"
+#: ../../mod/settings.php:1070
+msgid "Default Post Permissions"
msgstr ""
-#: ../../mod/register.php:217
-msgid "Choose a password"
+#: ../../mod/settings.php:1075
+msgid "Channel permissions category:"
msgstr ""
-#: ../../mod/register.php:218
-msgid "Please re-enter your password"
+#: ../../mod/settings.php:1081
+msgid "Maximum private messages per day from unknown people:"
msgstr ""
-#: ../../mod/rmagic.php:38
+#: ../../mod/settings.php:1081
+msgid "Useful to reduce spamming"
+msgstr ""
+
+#: ../../mod/settings.php:1084
+msgid "Notification Settings"
+msgstr ""
+
+#: ../../mod/settings.php:1085
+msgid "By default post a status message when:"
+msgstr ""
+
+#: ../../mod/settings.php:1086
+msgid "accepting a friend request"
+msgstr ""
+
+#: ../../mod/settings.php:1087
+msgid "joining a forum/community"
+msgstr ""
+
+#: ../../mod/settings.php:1088
+msgid "making an <em>interesting</em> profile change"
+msgstr ""
+
+#: ../../mod/settings.php:1089
+msgid "Send a notification email when:"
+msgstr ""
+
+#: ../../mod/settings.php:1090
+msgid "You receive a connection request"
+msgstr ""
+
+#: ../../mod/settings.php:1091
+msgid "Your connections are confirmed"
+msgstr ""
+
+#: ../../mod/settings.php:1092
+msgid "Someone writes on your profile wall"
+msgstr ""
+
+#: ../../mod/settings.php:1093
+msgid "Someone writes a followup comment"
+msgstr ""
+
+#: ../../mod/settings.php:1094
+msgid "You receive a private message"
+msgstr ""
+
+#: ../../mod/settings.php:1095
+msgid "You receive a friend suggestion"
+msgstr ""
+
+#: ../../mod/settings.php:1096
+msgid "You are tagged in a post"
+msgstr ""
+
+#: ../../mod/settings.php:1097
+msgid "You are poked/prodded/etc. in a post"
+msgstr ""
+
+#: ../../mod/settings.php:1100
+msgid "Show visual notifications including:"
+msgstr ""
+
+#: ../../mod/settings.php:1102
+msgid "Unseen matrix activity"
+msgstr ""
+
+#: ../../mod/settings.php:1103
+msgid "Unseen channel activity"
+msgstr ""
+
+#: ../../mod/settings.php:1104
+msgid "Unseen private messages"
+msgstr ""
+
+#: ../../mod/settings.php:1104 ../../mod/settings.php:1109
+#: ../../mod/settings.php:1110 ../../mod/settings.php:1111
+msgid "Recommended"
+msgstr ""
+
+#: ../../mod/settings.php:1105
+msgid "Upcoming events"
+msgstr ""
+
+#: ../../mod/settings.php:1106
+msgid "Events today"
+msgstr ""
+
+#: ../../mod/settings.php:1107
+msgid "Upcoming birthdays"
+msgstr ""
+
+#: ../../mod/settings.php:1107
+msgid "Not available in all themes"
+msgstr ""
+
+#: ../../mod/settings.php:1108
+msgid "System (personal) notifications"
+msgstr ""
+
+#: ../../mod/settings.php:1109
+msgid "System info messages"
+msgstr ""
+
+#: ../../mod/settings.php:1110
+msgid "System critical alerts"
+msgstr ""
+
+#: ../../mod/settings.php:1111
+msgid "New connections"
+msgstr ""
+
+#: ../../mod/settings.php:1112
+msgid "System Registrations"
+msgstr ""
+
+#: ../../mod/settings.php:1113
msgid ""
-"We encountered a problem while logging in with the OpenID you provided. "
-"Please check the correct spelling of the ID."
+"Also show new wall posts, private messages and connections under Notices"
msgstr ""
-#: ../../mod/rmagic.php:38
-msgid "The error message was:"
+#: ../../mod/settings.php:1115
+msgid "Notify me of events this many days in advance"
msgstr ""
-#: ../../mod/rmagic.php:42
-msgid "Authentication failed."
+#: ../../mod/settings.php:1115
+msgid "Must be greater than 0"
msgstr ""
-#: ../../mod/rmagic.php:82
-msgid "Remote Authentication"
+#: ../../mod/settings.php:1117
+msgid "Advanced Account/Page Type Settings"
msgstr ""
-#: ../../mod/rmagic.php:83
-msgid "Enter your channel address (e.g. channel@example.com)"
+#: ../../mod/settings.php:1118
+msgid "Change the behaviour of this account for special situations"
msgstr ""
-#: ../../mod/rmagic.php:84
-msgid "Authenticate"
+#: ../../mod/settings.php:1121
+msgid ""
+"Please enable expert mode (in <a href=\"settings/features\">Settings > "
+"Additional features</a>) to adjust!"
+msgstr ""
+
+#: ../../mod/settings.php:1122
+msgid "Miscellaneous Settings"
+msgstr ""
+
+#: ../../mod/settings.php:1124
+msgid "Personal menu to display in your channel pages"
+msgstr ""
+
+#: ../../mod/settings.php:1125
+msgid "Remove this channel"
+msgstr ""
+
+#: ../../mod/suggest.php:35
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
msgstr ""
#: ../../mod/poll.php:64
diff --git a/version.inc b/version.inc
index 1774fb864..448d75763 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-02-26.955
+2015-02-27.956