From b3ac1cd993f893efc7b9f6862f630f0784aa1c9f Mon Sep 17 00:00:00 2001
From: friendica <redmatrix@redmatrix.me>
Date: Fri, 24 Apr 2015 00:56:06 -0700
Subject: mod/branchtopic - move an off-topic comment to its own thread as a
 fresh wall-to-wall post and the same delivery permissions as its parent. No
 adjustments are made for complex delivery chains.

---
 include/socgraph.php |    2 +-
 mod/branchtopic.php  |   42 +
 util/messages.po     | 3674 +++++++++++++++++++++++++-------------------------
 version.inc          |    2 +-
 4 files changed, 1859 insertions(+), 1861 deletions(-)
 create mode 100644 mod/branchtopic.php

diff --git a/include/socgraph.php b/include/socgraph.php
index acebec419..0ad7c4034 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -470,7 +470,7 @@ function poco($a,$extended = false) {
 		$sql_extra = " and abook_flags = 0 ";
 
 	if($cid)
-		$sql_extra = sprintf(" and abook_id = %d ",intval($cid));
+		$sql_extra = sprintf(" and abook_id = %d  and ( abook_flags & " . ABOOK_FLAG_HIDDEN . " ) = 0 ",intval($cid));
 
 	if($system_mode) {
 		$r = q("SELECT count(*) as `total` from abook where ( abook_flags & " . ABOOK_FLAG_SELF . 
diff --git a/mod/branchtopic.php b/mod/branchtopic.php
new file mode 100644
index 000000000..2039489fa
--- /dev/null
+++ b/mod/branchtopic.php
@@ -0,0 +1,42 @@
+<?php
+
+function branchtopic_init(&$a) {
+
+	if(! local_channel())
+		return;
+
+	$item_id = 0;
+
+	if(argc() > 1)
+		$item_id = intval(argv(1));	
+
+	if(! $item_id)
+		return;
+
+	$channel = $a->get_channel();
+
+	if(! $channel)
+		return;
+
+
+	$r = q("select * from item where id = %d and uid = %d and owner_xchan = '%s' and id != parent limit 1",
+		intval($item_id),
+		intval(local_channel()),
+		dbesc($channel['channel_hash'])
+	);
+
+	if(! $r)
+		return;
+
+	$p = q("select * from item where id = %d and uid = %d limit 1",
+		intval($r[0]['parent']),
+		intval(local_channel())
+	);
+
+	$x = q("update item set parent = id, item_flags = (item_flags | %d) where id = %d",
+		intval(ITEM_THREAD_TOP),
+		intval($item_id)
+	);
+
+	return;
+}
diff --git a/util/messages.po b/util/messages.po
index eba7c7bb6..883ef4a5f 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2015-04-17.1005\n"
+"Project-Id-Version: 2015-04-24.1012\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-17 00:03-0700\n"
+"POT-Creation-Date: 2015-04-24 00:03-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -258,34 +258,35 @@ msgstr ""
 
 #: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
 #: ../../include/RedDAV/RedBrowser.php:269 ../../include/ItemObject.php:100
-#: ../../include/apps.php:254 ../../include/menu.php:42
-#: ../../mod/settings.php:644 ../../mod/blocks.php:129 ../../mod/thing.php:227
+#: ../../include/apps.php:254 ../../include/menu.php:43
+#: ../../mod/settings.php:644 ../../mod/thing.php:227
 #: ../../mod/connections.php:382 ../../mod/connections.php:395
 #: ../../mod/connections.php:414 ../../mod/editlayout.php:139
-#: ../../mod/editwebpage.php:176 ../../mod/editpost.php:113
-#: ../../mod/menu.php:86 ../../mod/webpages.php:174
-#: ../../mod/editblock.php:143 ../../mod/layouts.php:168
+#: ../../mod/editwebpage.php:178 ../../mod/editpost.php:113
+#: ../../mod/menu.php:100 ../../mod/webpages.php:179
+#: ../../mod/editblock.php:140 ../../mod/blocks.php:148
+#: ../../mod/layouts.php:174
 msgid "Edit"
 msgstr ""
 
-#: ../../include/page_widgets.php:39 ../../mod/blocks.php:132
-#: ../../mod/webpages.php:180 ../../mod/layouts.php:172
+#: ../../include/page_widgets.php:39 ../../mod/webpages.php:185
+#: ../../mod/blocks.php:154 ../../mod/layouts.php:178
 msgid "View"
 msgstr ""
 
-#: ../../include/page_widgets.php:40 ../../include/conversation.php:1153
-#: ../../include/ItemObject.php:677 ../../mod/events.php:653
-#: ../../mod/photos.php:970 ../../mod/editlayout.php:173
-#: ../../mod/editwebpage.php:212 ../../mod/editpost.php:149
-#: ../../mod/webpages.php:181 ../../mod/editblock.php:179
+#: ../../include/page_widgets.php:40 ../../include/ItemObject.php:677
+#: ../../include/conversation.php:1153 ../../mod/events.php:653
+#: ../../mod/photos.php:970 ../../mod/editwebpage.php:214
+#: ../../mod/editpost.php:149 ../../mod/webpages.php:186
+#: ../../mod/editblock.php:176
 msgid "Preview"
 msgstr ""
 
-#: ../../include/page_widgets.php:41 ../../mod/webpages.php:182
+#: ../../include/page_widgets.php:41 ../../mod/webpages.php:187
 msgid "Actions"
 msgstr ""
 
-#: ../../include/page_widgets.php:42 ../../mod/webpages.php:183
+#: ../../include/page_widgets.php:42 ../../mod/webpages.php:188
 msgid "Page Link"
 msgstr ""
 
@@ -293,2803 +294,2815 @@ msgstr ""
 msgid "Title"
 msgstr ""
 
-#: ../../include/page_widgets.php:44 ../../mod/webpages.php:185
+#: ../../include/page_widgets.php:44 ../../mod/webpages.php:190
+#: ../../mod/blocks.php:145
 msgid "Created"
 msgstr ""
 
-#: ../../include/page_widgets.php:45 ../../mod/webpages.php:186
+#: ../../include/page_widgets.php:45 ../../mod/webpages.php:191
+#: ../../mod/blocks.php:146
 msgid "Edited"
 msgstr ""
 
-#: ../../include/conversation.php:120 ../../include/text.php:1803
-#: ../../include/diaspora.php:2081 ../../mod/like.php:346
-#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
-#: ../../mod/tagger.php:43
-msgid "photo"
+#: ../../include/api.php:1158
+msgid "Public Timeline"
 msgstr ""
 
-#: ../../include/conversation.php:123 ../../include/text.php:1806
-#: ../../mod/like.php:348 ../../mod/tagger.php:47
-msgid "event"
+#: ../../include/comanche.php:34 ../../mod/admin.php:386
+#: ../../view/theme/apw/php/config.php:185
+msgid "Default"
 msgstr ""
 
-#: ../../include/conversation.php:126 ../../mod/like.php:113
-msgid "channel"
+#: ../../include/dir_fns.php:143
+msgid "Directory Options"
 msgstr ""
 
-#: ../../include/conversation.php:148 ../../include/text.php:1809
-#: ../../include/diaspora.php:2081 ../../mod/like.php:346
-#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
-#: ../../mod/tagger.php:51
-msgid "status"
+#: ../../include/dir_fns.php:144
+msgid "Alphabetic"
 msgstr ""
 
-#: ../../include/conversation.php:150 ../../include/text.php:1811
-#: ../../mod/tagger.php:53
-msgid "comment"
+#: ../../include/dir_fns.php:145
+msgid "Reverse Alphabetic"
 msgstr ""
 
-#: ../../include/conversation.php:164 ../../include/diaspora.php:2110
-#: ../../mod/like.php:394
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
+#: ../../include/dir_fns.php:146
+msgid "Newest to Oldest"
 msgstr ""
 
-#: ../../include/conversation.php:167 ../../mod/like.php:396
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
+#: ../../include/dir_fns.php:147
+msgid "Oldest to Newest"
 msgstr ""
 
-#: ../../include/conversation.php:204
-#, php-format
-msgid "%1$s is now connected with %2$s"
+#: ../../include/dir_fns.php:148
+msgid "Sort"
 msgstr ""
 
-#: ../../include/conversation.php:239
-#, php-format
-msgid "%1$s poked %2$s"
+#: ../../include/dir_fns.php:152
+msgid "Safe Mode"
 msgstr ""
 
-#: ../../include/conversation.php:243 ../../include/text.php:928
-msgid "poked"
+#: ../../include/dir_fns.php:154
+msgid "Public Forums Only"
 msgstr ""
 
-#: ../../include/conversation.php:260 ../../mod/mood.php:63
-#, php-format
-msgctxt "mood"
-msgid "%1$s is %2$s"
+#: ../../include/dir_fns.php:155
+msgid "This Website Only"
 msgstr ""
 
-#: ../../include/conversation.php:572 ../../mod/photos.php:984
-msgctxt "title"
-msgid "Likes"
+#: ../../include/event.php:19 ../../include/bb2diaspora.php:451
+msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
-#: ../../include/conversation.php:572 ../../mod/photos.php:984
-msgctxt "title"
-msgid "Dislikes"
+#: ../../include/event.php:27 ../../include/bb2diaspora.php:457
+msgid "Starts:"
 msgstr ""
 
-#: ../../include/conversation.php:573 ../../mod/photos.php:985
-msgctxt "title"
-msgid "Agree"
+#: ../../include/event.php:37 ../../include/bb2diaspora.php:465
+msgid "Finishes:"
 msgstr ""
 
-#: ../../include/conversation.php:573 ../../mod/photos.php:985
-msgctxt "title"
-msgid "Disagree"
+#: ../../include/event.php:47 ../../include/bb2diaspora.php:473
+#: ../../include/identity.php:874 ../../mod/events.php:647
+#: ../../mod/directory.php:234
+msgid "Location:"
 msgstr ""
 
-#: ../../include/conversation.php:573 ../../mod/photos.php:985
-msgctxt "title"
-msgid "Abstain"
+#: ../../include/event.php:391
+msgid "This event has been added to your calendar."
 msgstr ""
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:986
-msgctxt "title"
-msgid "Attending"
+#: ../../include/js_strings.php:5
+msgid "Delete this item?"
 msgstr ""
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:986
-msgctxt "title"
-msgid "Not attending"
+#: ../../include/js_strings.php:6 ../../include/ItemObject.php:667
+#: ../../mod/photos.php:968 ../../mod/photos.php:1086
+msgid "Comment"
 msgstr ""
 
-#: ../../include/conversation.php:574 ../../mod/photos.php:986
-msgctxt "title"
-msgid "Might attend"
+#: ../../include/js_strings.php:7 ../../include/ItemObject.php:384
+msgid "[+] show all"
 msgstr ""
 
-#: ../../include/conversation.php:659 ../../include/ItemObject.php:126
-msgid "Select"
+#: ../../include/js_strings.php:8
+msgid "[-] show less"
 msgstr ""
 
-#: ../../include/conversation.php:660 ../../include/RedDAV/RedBrowser.php:270
-#: ../../include/ItemObject.php:120 ../../include/apps.php:255
-#: ../../mod/settings.php:645 ../../mod/thing.php:228 ../../mod/group.php:176
-#: ../../mod/photos.php:1050 ../../mod/webpages.php:176
-#: ../../mod/admin.php:817 ../../mod/admin.php:948 ../../mod/connedit.php:543
-msgid "Delete"
+#: ../../include/js_strings.php:9
+msgid "[+] expand"
 msgstr ""
 
-#: ../../include/conversation.php:667 ../../include/ItemObject.php:89
-msgid "Private Message"
+#: ../../include/js_strings.php:10
+msgid "[-] collapse"
 msgstr ""
 
-#: ../../include/conversation.php:674 ../../include/ItemObject.php:227
-msgid "Message signature validated"
+#: ../../include/js_strings.php:11
+msgid "Password too short"
 msgstr ""
 
-#: ../../include/conversation.php:675 ../../include/ItemObject.php:228
-msgid "Message signature incorrect"
+#: ../../include/js_strings.php:12
+msgid "Passwords do not match"
 msgstr ""
 
-#: ../../include/conversation.php:692
-#, php-format
-msgid "View %s's profile @ %s"
+#: ../../include/js_strings.php:13 ../../mod/photos.php:39
+msgid "everybody"
 msgstr ""
 
-#: ../../include/conversation.php:707
-msgid "Categories:"
+#: ../../include/js_strings.php:14
+msgid "Secret Passphrase"
 msgstr ""
 
-#: ../../include/conversation.php:708
-msgid "Filed under:"
+#: ../../include/js_strings.php:15
+msgid "Passphrase hint"
 msgstr ""
 
-#: ../../include/conversation.php:716 ../../include/ItemObject.php:312
-#, php-format
-msgid "from %s"
+#: ../../include/js_strings.php:16
+msgid "Notice: Permissions have changed but have not yet been submitted."
 msgstr ""
 
-#: ../../include/conversation.php:719 ../../include/ItemObject.php:315
-#, php-format
-msgid "last edited: %s"
+#: ../../include/js_strings.php:17
+msgid "close all"
 msgstr ""
 
-#: ../../include/conversation.php:720 ../../include/ItemObject.php:316
-#, php-format
-msgid "Expires: %s"
+#: ../../include/js_strings.php:18
+msgid "Nothing new here"
 msgstr ""
 
-#: ../../include/conversation.php:735
-msgid "View in context"
+#: ../../include/js_strings.php:19
+msgid "Rate This Channel (this is public)"
 msgstr ""
 
-#: ../../include/conversation.php:737 ../../include/conversation.php:1206
-#: ../../include/ItemObject.php:364 ../../mod/photos.php:950
-#: ../../mod/editlayout.php:153 ../../mod/editwebpage.php:190
-#: ../../mod/editpost.php:130 ../../mod/editblock.php:158
-#: ../../mod/mail.php:241 ../../mod/mail.php:356
-msgid "Please wait"
+#: ../../include/js_strings.php:20 ../../mod/rate.php:156
+msgid "Rating"
 msgstr ""
 
-#: ../../include/conversation.php:846
-msgid "remove"
+#: ../../include/js_strings.php:21
+msgid "Describe (optional)"
 msgstr ""
 
-#: ../../include/conversation.php:850 ../../include/nav.php:247
-msgid "Loading..."
+#: ../../include/js_strings.php:22 ../../include/ItemObject.php:668
+#: ../../mod/settings.php:582 ../../mod/settings.php:684
+#: ../../mod/settings.php:710 ../../mod/settings.php:738
+#: ../../mod/settings.php:761 ../../mod/settings.php:843
+#: ../../mod/settings.php:1039 ../../mod/xchan.php:11 ../../mod/connect.php:93
+#: ../../mod/thing.php:275 ../../mod/thing.php:318 ../../mod/events.php:656
+#: ../../mod/group.php:81 ../../mod/setup.php:313 ../../mod/setup.php:358
+#: ../../mod/photos.php:565 ../../mod/photos.php:642 ../../mod/photos.php:929
+#: ../../mod/photos.php:969 ../../mod/photos.php:1087 ../../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:156 ../../mod/fsuggest.php:108
+#: ../../mod/poke.php:166 ../../mod/profiles.php:667 ../../mod/mitem.php:229
+#: ../../mod/admin.php:446 ../../mod/admin.php:810 ../../mod/admin.php:946
+#: ../../mod/admin.php:1077 ../../mod/admin.php:1271 ../../mod/admin.php:1356
+#: ../../mod/mood.php:134 ../../mod/connedit.php:679 ../../mod/mail.php:355
+#: ../../mod/appman.php:99 ../../mod/poll.php:68 ../../mod/bulksetclose.php:24
+#: ../../view/theme/apw/php/config.php:256
+#: ../../view/theme/redbasic/php/config.php:97
+msgid "Submit"
 msgstr ""
 
-#: ../../include/conversation.php:851
-msgid "Delete Selected Items"
+#: ../../include/js_strings.php:23
+msgid "Please enter a link URL"
 msgstr ""
 
-#: ../../include/conversation.php:939
-msgid "View Source"
+#: ../../include/js_strings.php:24
+msgid "Unsaved changes. Are you sure you wish to leave this page?"
 msgstr ""
 
-#: ../../include/conversation.php:940
-msgid "Follow Thread"
+#: ../../include/js_strings.php:26
+msgid "timeago.prefixAgo"
 msgstr ""
 
-#: ../../include/conversation.php:941
-msgid "View Status"
+#: ../../include/js_strings.php:27
+msgid "timeago.prefixFromNow"
 msgstr ""
 
-#: ../../include/conversation.php:942 ../../include/nav.php:91
-#: ../../mod/connedit.php:494 ../../mod/connedit.php:660
-msgid "View Profile"
+#: ../../include/js_strings.php:28
+msgid "ago"
 msgstr ""
 
-#: ../../include/conversation.php:943
-msgid "View Photos"
+#: ../../include/js_strings.php:29
+msgid "from now"
 msgstr ""
 
-#: ../../include/conversation.php:944
-msgid "Matrix Activity"
+#: ../../include/js_strings.php:30
+msgid "less than a minute"
 msgstr ""
 
-#: ../../include/conversation.php:945 ../../include/widgets.php:136
-#: ../../include/widgets.php:175 ../../include/Contact.php:107
-#: ../../include/identity.php:823 ../../mod/match.php:64
-#: ../../mod/directory.php:298 ../../mod/suggest.php:52
-msgid "Connect"
+#: ../../include/js_strings.php:31
+msgid "about a minute"
 msgstr ""
 
-#: ../../include/conversation.php:946
-msgid "Edit Contact"
+#: ../../include/js_strings.php:32
+#, php-format
+msgid "%d minutes"
 msgstr ""
 
-#: ../../include/conversation.php:947
-msgid "Send PM"
+#: ../../include/js_strings.php:33
+msgid "about an hour"
 msgstr ""
 
-#: ../../include/conversation.php:948 ../../include/apps.php:145
-msgid "Poke"
+#: ../../include/js_strings.php:34
+#, php-format
+msgid "about %d hours"
 msgstr ""
 
-#: ../../include/conversation.php:1019 ../../include/RedDAV/RedBrowser.php:164
-#: ../../include/apps.php:336 ../../include/apps.php:387
-#: ../../mod/photos.php:681 ../../mod/photos.php:1119
-msgid "Unknown"
+#: ../../include/js_strings.php:35
+msgid "a day"
 msgstr ""
 
-#: ../../include/conversation.php:1062
+#: ../../include/js_strings.php:36
 #, php-format
-msgid "%s likes this."
+msgid "%d days"
 msgstr ""
 
-#: ../../include/conversation.php:1062
-#, php-format
-msgid "%s doesn't like this."
+#: ../../include/js_strings.php:37
+msgid "about a month"
 msgstr ""
 
-#: ../../include/conversation.php:1066
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this."
-msgid_plural "<span  %1$s>%2$d people</span> like this."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1068
+#: ../../include/js_strings.php:38
 #, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this."
-msgid_plural "<span  %1$s>%2$d people</span> don't like this."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1074
-msgid "and"
+msgid "%d months"
 msgstr ""
 
-#: ../../include/conversation.php:1077
-#, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/js_strings.php:39
+msgid "about a year"
+msgstr ""
 
-#: ../../include/conversation.php:1078
+#: ../../include/js_strings.php:40
 #, php-format
-msgid "%s like this."
+msgid "%d years"
 msgstr ""
 
-#: ../../include/conversation.php:1078
-#, php-format
-msgid "%s don't like this."
+#: ../../include/js_strings.php:41
+msgid " "
 msgstr ""
 
-#: ../../include/conversation.php:1138
-msgid "Visible to <strong>everybody</strong>"
+#: ../../include/js_strings.php:42
+msgid "timeago.numbers"
 msgstr ""
 
-#: ../../include/conversation.php:1139 ../../mod/mail.php:174
-#: ../../mod/mail.php:289
-msgid "Please enter a link URL:"
+#: ../../include/RedDAV/RedBrowser.php:107
+#: ../../include/RedDAV/RedBrowser.php:268
+msgid "parent"
 msgstr ""
 
-#: ../../include/conversation.php:1140
-msgid "Please enter a video link/URL:"
+#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2479
+msgid "Collection"
 msgstr ""
 
-#: ../../include/conversation.php:1141
-msgid "Please enter an audio link/URL:"
+#: ../../include/RedDAV/RedBrowser.php:134
+msgid "Principal"
 msgstr ""
 
-#: ../../include/conversation.php:1142
-msgid "Tag term:"
+#: ../../include/RedDAV/RedBrowser.php:137
+msgid "Addressbook"
 msgstr ""
 
-#: ../../include/conversation.php:1143 ../../mod/filer.php:49
-msgid "Save to Folder:"
+#: ../../include/RedDAV/RedBrowser.php:140
+msgid "Calendar"
 msgstr ""
 
-#: ../../include/conversation.php:1144
-msgid "Where are you right now?"
+#: ../../include/RedDAV/RedBrowser.php:143
+msgid "Schedule Inbox"
 msgstr ""
 
-#: ../../include/conversation.php:1145 ../../mod/editpost.php:52
-#: ../../mod/mail.php:175 ../../mod/mail.php:290
-msgid "Expires YYYY-MM-DD HH:MM"
+#: ../../include/RedDAV/RedBrowser.php:146
+msgid "Schedule Outbox"
 msgstr ""
 
-#: ../../include/conversation.php:1172 ../../mod/photos.php:949
-#: ../../mod/editlayout.php:198 ../../mod/webpages.php:175
-#: ../../mod/editblock.php:204 ../../mod/layouts.php:169
-msgid "Share"
+#: ../../include/RedDAV/RedBrowser.php:164 ../../include/conversation.php:1019
+#: ../../include/apps.php:336 ../../include/apps.php:387
+#: ../../mod/photos.php:681 ../../mod/photos.php:1119
+msgid "Unknown"
 msgstr ""
 
-#: ../../include/conversation.php:1174
-msgid "Page link name"
+#: ../../include/RedDAV/RedBrowser.php:227
+#, php-format
+msgid "%1$s used"
 msgstr ""
 
-#: ../../include/conversation.php:1177
-msgid "Post as"
+#: ../../include/RedDAV/RedBrowser.php:232
+#, php-format
+msgid "%1$s used of %2$s (%3$s&#37;)"
 msgstr ""
 
-#: ../../include/conversation.php:1179 ../../include/ItemObject.php:669
-#: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:177
-#: ../../mod/editpost.php:114 ../../mod/editblock.php:144
-msgid "Bold"
+#: ../../include/RedDAV/RedBrowser.php:251 ../../include/nav.php:98
+#: ../../include/conversation.php:1606 ../../include/apps.php:135
+#: ../../mod/fbrowser.php:114
+msgid "Files"
 msgstr ""
 
-#: ../../include/conversation.php:1180 ../../include/ItemObject.php:670
-#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:178
-#: ../../mod/editpost.php:115 ../../mod/editblock.php:145
-msgid "Italic"
+#: ../../include/RedDAV/RedBrowser.php:253
+msgid "Total"
 msgstr ""
 
-#: ../../include/conversation.php:1181 ../../include/ItemObject.php:671
-#: ../../mod/editlayout.php:142 ../../mod/editwebpage.php:179
-#: ../../mod/editpost.php:116 ../../mod/editblock.php:146
-msgid "Underline"
+#: ../../include/RedDAV/RedBrowser.php:255
+msgid "Shared"
 msgstr ""
 
-#: ../../include/conversation.php:1182 ../../include/ItemObject.php:672
-#: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:180
-#: ../../mod/editpost.php:117 ../../mod/editblock.php:147
-msgid "Quote"
+#: ../../include/RedDAV/RedBrowser.php:256
+#: ../../include/RedDAV/RedBrowser.php:306 ../../mod/menu.php:104
+#: ../../mod/webpages.php:178 ../../mod/blocks.php:147
+#: ../../mod/layouts.php:170 ../../mod/new_channel.php:121
+msgid "Create"
 msgstr ""
 
-#: ../../include/conversation.php:1183 ../../include/ItemObject.php:673
-#: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:181
-#: ../../mod/editpost.php:118 ../../mod/editblock.php:148
-msgid "Code"
+#: ../../include/RedDAV/RedBrowser.php:257
+#: ../../include/RedDAV/RedBrowser.php:308 ../../mod/profile_photo.php:362
+#: ../../mod/photos.php:706 ../../mod/photos.php:1236
+msgid "Upload"
 msgstr ""
 
-#: ../../include/conversation.php:1184 ../../mod/editlayout.php:145
-#: ../../mod/editwebpage.php:182 ../../mod/editpost.php:119
-#: ../../mod/editblock.php:150 ../../mod/mail.php:238 ../../mod/mail.php:352
-msgid "Upload photo"
+#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/settings.php:584
+#: ../../mod/settings.php:610 ../../mod/admin.php:953
+#: ../../mod/sharedwithme.php:95
+msgid "Name"
 msgstr ""
 
-#: ../../include/conversation.php:1185
-msgid "upload photo"
+#: ../../include/RedDAV/RedBrowser.php:265
+msgid "Type"
 msgstr ""
 
-#: ../../include/conversation.php:1186 ../../mod/editlayout.php:146
-#: ../../mod/editwebpage.php:183 ../../mod/editpost.php:120
-#: ../../mod/editblock.php:151 ../../mod/mail.php:239 ../../mod/mail.php:353
-msgid "Attach file"
+#: ../../include/RedDAV/RedBrowser.php:266 ../../mod/sharedwithme.php:97
+msgid "Size"
 msgstr ""
 
-#: ../../include/conversation.php:1187
-msgid "attach file"
+#: ../../include/RedDAV/RedBrowser.php:267 ../../mod/sharedwithme.php:98
+msgid "Last Modified"
 msgstr ""
 
-#: ../../include/conversation.php:1188 ../../mod/editlayout.php:147
-#: ../../mod/editwebpage.php:184 ../../mod/editpost.php:121
-#: ../../mod/editblock.php:152 ../../mod/mail.php:240 ../../mod/mail.php:354
-msgid "Insert web link"
+#: ../../include/RedDAV/RedBrowser.php:270 ../../include/ItemObject.php:120
+#: ../../include/conversation.php:660 ../../include/apps.php:255
+#: ../../mod/settings.php:645 ../../mod/thing.php:228 ../../mod/group.php:176
+#: ../../mod/photos.php:1050 ../../mod/editwebpage.php:225
+#: ../../mod/webpages.php:181 ../../mod/admin.php:817 ../../mod/admin.php:948
+#: ../../mod/editblock.php:113 ../../mod/blocks.php:150
+#: ../../mod/connedit.php:543
+msgid "Delete"
 msgstr ""
 
-#: ../../include/conversation.php:1189
-msgid "web link"
+#: ../../include/RedDAV/RedBrowser.php:305
+msgid "Create new folder"
 msgstr ""
 
-#: ../../include/conversation.php:1190
-msgid "Insert video link"
+#: ../../include/RedDAV/RedBrowser.php:307
+msgid "Upload file"
 msgstr ""
 
-#: ../../include/conversation.php:1191
-msgid "video link"
+#: ../../include/bookmarks.php:35
+#, php-format
+msgid "%1$s's bookmarks"
 msgstr ""
 
-#: ../../include/conversation.php:1192
-msgid "Insert audio link"
+#: ../../include/network.php:632
+msgid "view full size"
 msgstr ""
 
-#: ../../include/conversation.php:1193
-msgid "audio link"
+#: ../../include/features.php:38
+msgid "General Features"
 msgstr ""
 
-#: ../../include/conversation.php:1194 ../../mod/editlayout.php:151
-#: ../../mod/editwebpage.php:188 ../../mod/editpost.php:125
-#: ../../mod/editblock.php:156
-msgid "Set your location"
+#: ../../include/features.php:40
+msgid "Content Expiration"
 msgstr ""
 
-#: ../../include/conversation.php:1195
-msgid "set location"
+#: ../../include/features.php:40
+msgid "Remove posts/comments and/or private messages at a future time"
 msgstr ""
 
-#: ../../include/conversation.php:1196 ../../mod/editpost.php:127
-msgid "Toggle voting"
+#: ../../include/features.php:41
+msgid "Multiple Profiles"
 msgstr ""
 
-#: ../../include/conversation.php:1199 ../../mod/editlayout.php:152
-#: ../../mod/editwebpage.php:189 ../../mod/editpost.php:126
-#: ../../mod/editblock.php:157
-msgid "Clear browser location"
+#: ../../include/features.php:41
+msgid "Ability to create multiple profiles"
 msgstr ""
 
-#: ../../include/conversation.php:1200
-msgid "clear location"
+#: ../../include/features.php:42
+msgid "Advanced Profiles"
 msgstr ""
 
-#: ../../include/conversation.php:1202 ../../mod/editlayout.php:164
-#: ../../mod/editwebpage.php:205 ../../mod/editpost.php:141
-#: ../../mod/editblock.php:170
-msgid "Title (optional)"
+#: ../../include/features.php:42
+msgid "Additional profile sections and selections"
 msgstr ""
 
-#: ../../include/conversation.php:1205 ../../mod/editlayout.php:167
-#: ../../mod/editwebpage.php:207 ../../mod/editpost.php:143
-#: ../../mod/editblock.php:173
-msgid "Categories (optional, comma-separated list)"
+#: ../../include/features.php:43
+msgid "Profile Import/Export"
 msgstr ""
 
-#: ../../include/conversation.php:1207 ../../mod/editlayout.php:154
-#: ../../mod/editwebpage.php:191 ../../mod/editpost.php:131
-#: ../../mod/editblock.php:159
-msgid "Permission settings"
+#: ../../include/features.php:43
+msgid "Save and load profile details across sites/channels"
 msgstr ""
 
-#: ../../include/conversation.php:1208
-msgid "permissions"
+#: ../../include/features.php:44
+msgid "Web Pages"
 msgstr ""
 
-#: ../../include/conversation.php:1216 ../../mod/editlayout.php:161
-#: ../../mod/editwebpage.php:200 ../../mod/editpost.php:138
-#: ../../mod/editblock.php:167
-msgid "Public post"
+#: ../../include/features.php:44
+msgid "Provide managed web pages on your channel"
 msgstr ""
 
-#: ../../include/conversation.php:1218 ../../mod/editlayout.php:168
-#: ../../mod/editwebpage.php:208 ../../mod/editpost.php:144
-#: ../../mod/editblock.php:174
-msgid "Example: bob@example.com, mary@example.com"
+#: ../../include/features.php:45
+msgid "Private Notes"
 msgstr ""
 
-#: ../../include/conversation.php:1231 ../../mod/editlayout.php:178
-#: ../../mod/editwebpage.php:217 ../../mod/editpost.php:155
-#: ../../mod/editblock.php:184 ../../mod/mail.php:245 ../../mod/mail.php:359
-msgid "Set expiration date"
+#: ../../include/features.php:45
+msgid "Enables a tool to store notes and reminders"
 msgstr ""
 
-#: ../../include/conversation.php:1233 ../../include/ItemObject.php:680
-#: ../../mod/editpost.php:157 ../../mod/mail.php:247 ../../mod/mail.php:361
-msgid "Encrypt text"
+#: ../../include/features.php:46
+msgid "Navigation Channel Select"
 msgstr ""
 
-#: ../../include/conversation.php:1235 ../../mod/events.php:637
-#: ../../mod/editpost.php:159
-msgid "OK"
+#: ../../include/features.php:46
+msgid "Change channels directly from within the navigation dropdown menu"
 msgstr ""
 
-#: ../../include/conversation.php:1236 ../../mod/settings.php:583
-#: ../../mod/settings.php:609 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
-#: ../../mod/events.php:636 ../../mod/fbrowser.php:82
-#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:160
-msgid "Cancel"
+#: ../../include/features.php:47
+msgid "Photo Location"
 msgstr ""
 
-#: ../../include/conversation.php:1477
-msgid "Discover"
+#: ../../include/features.php:47
+msgid "If location data is available on uploaded photos, link this to a map."
 msgstr ""
 
-#: ../../include/conversation.php:1480
-msgid "Imported public streams"
+#: ../../include/features.php:49
+msgid "Expert Mode"
 msgstr ""
 
-#: ../../include/conversation.php:1485
-msgid "Commented Order"
+#: ../../include/features.php:49
+msgid "Enable Expert Mode to provide advanced configuration options"
 msgstr ""
 
-#: ../../include/conversation.php:1488
-msgid "Sort by Comment Date"
+#: ../../include/features.php:50
+msgid "Premium Channel"
 msgstr ""
 
-#: ../../include/conversation.php:1492
-msgid "Posted Order"
+#: ../../include/features.php:50
+msgid ""
+"Allows you to set restrictions and terms on those that connect with your "
+"channel"
 msgstr ""
 
-#: ../../include/conversation.php:1495
-msgid "Sort by Post Date"
+#: ../../include/features.php:55
+msgid "Post Composition Features"
 msgstr ""
 
-#: ../../include/conversation.php:1500 ../../include/widgets.php:94
-msgid "Personal"
+#: ../../include/features.php:57
+msgid "Use Markdown"
 msgstr ""
 
-#: ../../include/conversation.php:1503
-msgid "Posts that mention or involve you"
+#: ../../include/features.php:57
+msgid "Allow use of \"Markdown\" to format posts"
 msgstr ""
 
-#: ../../include/conversation.php:1509 ../../mod/connections.php:212
-#: ../../mod/connections.php:225 ../../mod/menu.php:88
-msgid "New"
+#: ../../include/features.php:58
+msgid "Large Photos"
 msgstr ""
 
-#: ../../include/conversation.php:1512
-msgid "Activity Stream - by date"
+#: ../../include/features.php:58
+msgid ""
+"Include large (640px) photo thumbnails in posts. If not enabled, use small "
+"(320px) photo thumbnails"
 msgstr ""
 
-#: ../../include/conversation.php:1518
-msgid "Starred"
+#: ../../include/features.php:59 ../../include/widgets.php:546
+#: ../../mod/sources.php:88
+msgid "Channel Sources"
 msgstr ""
 
-#: ../../include/conversation.php:1521
-msgid "Favourite Posts"
+#: ../../include/features.php:59
+msgid "Automatically import channel content from other channels or feeds"
 msgstr ""
 
-#: ../../include/conversation.php:1528
-msgid "Spam"
+#: ../../include/features.php:60
+msgid "Even More Encryption"
 msgstr ""
 
-#: ../../include/conversation.php:1531
-msgid "Posts flagged as SPAM"
+#: ../../include/features.php:60
+msgid ""
+"Allow optional encryption of content end-to-end with a shared secret key"
 msgstr ""
 
-#: ../../include/conversation.php:1575 ../../mod/admin.php:952
-msgid "Channel"
+#: ../../include/features.php:61
+msgid "Enable voting tools"
 msgstr ""
 
-#: ../../include/conversation.php:1578
-msgid "Status Messages and Posts"
+#: ../../include/features.php:61
+msgid "Provide a class of post which others can vote on"
 msgstr ""
 
-#: ../../include/conversation.php:1587
-msgid "About"
+#: ../../include/features.php:67
+msgid "Network and Stream Filtering"
 msgstr ""
 
-#: ../../include/conversation.php:1590
-msgid "Profile Details"
+#: ../../include/features.php:68
+msgid "Search by Date"
 msgstr ""
 
-#: ../../include/conversation.php:1596 ../../include/nav.php:97
-#: ../../include/apps.php:139 ../../mod/fbrowser.php:25
-msgid "Photos"
+#: ../../include/features.php:68
+msgid "Ability to select posts by date ranges"
 msgstr ""
 
-#: ../../include/conversation.php:1599 ../../include/photos.php:359
-msgid "Photo Albums"
+#: ../../include/features.php:69
+msgid "Collections Filter"
 msgstr ""
 
-#: ../../include/conversation.php:1605 ../../include/RedDAV/RedBrowser.php:251
-#: ../../include/nav.php:98 ../../include/apps.php:135
-#: ../../mod/fbrowser.php:114
-msgid "Files"
+#: ../../include/features.php:69
+msgid "Enable widget to display Network posts only from selected collections"
 msgstr ""
 
-#: ../../include/conversation.php:1608
-msgid "Files and Storage"
+#: ../../include/features.php:70 ../../include/widgets.php:274
+msgid "Saved Searches"
 msgstr ""
 
-#: ../../include/conversation.php:1618 ../../include/conversation.php:1621
-msgid "Chatrooms"
+#: ../../include/features.php:70
+msgid "Save search terms for re-use"
 msgstr ""
 
-#: ../../include/conversation.php:1631 ../../include/nav.php:109
-#: ../../include/apps.php:129
-msgid "Bookmarks"
+#: ../../include/features.php:71
+msgid "Network Personal Tab"
 msgstr ""
 
-#: ../../include/conversation.php:1634
-msgid "Saved Bookmarks"
+#: ../../include/features.php:71
+msgid "Enable tab to display only Network posts that you've interacted on"
 msgstr ""
 
-#: ../../include/conversation.php:1641 ../../include/nav.php:113
-#: ../../include/apps.php:136 ../../mod/webpages.php:171
-msgid "Webpages"
-msgstr ""
-
-#: ../../include/conversation.php:1644
-msgid "Manage Webpages"
+#: ../../include/features.php:72
+msgid "Network New Tab"
 msgstr ""
 
-#: ../../include/conversation.php:1673 ../../include/ItemObject.php:175
-#: ../../include/ItemObject.php:187 ../../mod/photos.php:1003
-#: ../../mod/photos.php:1015
-msgid "View all"
+#: ../../include/features.php:72
+msgid "Enable tab to display all new Network activity"
 msgstr ""
 
-#: ../../include/conversation.php:1697 ../../include/ItemObject.php:179
-#: ../../include/taxonomy.php:396 ../../include/identity.php:1133
-#: ../../mod/photos.php:1007
-msgctxt "noun"
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1700 ../../include/ItemObject.php:184
-#: ../../mod/photos.php:1012
-msgctxt "noun"
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1703
-msgctxt "noun"
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1706
-msgctxt "noun"
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1709
-msgctxt "noun"
-msgid "Undecided"
-msgid_plural "Undecided"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1712
-msgctxt "noun"
-msgid "Agree"
-msgid_plural "Agrees"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1715
-msgctxt "noun"
-msgid "Disagree"
-msgid_plural "Disagrees"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1718
-msgctxt "noun"
-msgid "Abstain"
-msgid_plural "Abstains"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/dir_fns.php:137
-msgid "Directory Options"
+#: ../../include/features.php:73
+msgid "Affinity Tool"
 msgstr ""
 
-#: ../../include/dir_fns.php:138
-msgid "Alphabetic"
+#: ../../include/features.php:73
+msgid "Filter stream activity by depth of relationships"
 msgstr ""
 
-#: ../../include/dir_fns.php:139
-msgid "Reverse Alphabetic"
+#: ../../include/features.php:74
+msgid "Suggest Channels"
 msgstr ""
 
-#: ../../include/dir_fns.php:140
-msgid "Newest to Oldest"
+#: ../../include/features.php:74
+msgid "Show channel suggestions"
 msgstr ""
 
-#: ../../include/dir_fns.php:141
-msgid "Oldest to Newest"
+#: ../../include/features.php:79
+msgid "Post/Comment Tools"
 msgstr ""
 
-#: ../../include/dir_fns.php:142
-msgid "Sort"
+#: ../../include/features.php:80
+msgid "Tagging"
 msgstr ""
 
-#: ../../include/dir_fns.php:146
-msgid "Safe Mode"
+#: ../../include/features.php:80
+msgid "Ability to tag existing posts"
 msgstr ""
 
-#: ../../include/dir_fns.php:148
-msgid "Public Forums Only"
+#: ../../include/features.php:81
+msgid "Post Categories"
 msgstr ""
 
-#: ../../include/dir_fns.php:149
-msgid "This Website Only"
+#: ../../include/features.php:81
+msgid "Add categories to your posts"
 msgstr ""
 
-#: ../../include/event.php:19 ../../include/bb2diaspora.php:451
-msgid "l F d, Y \\@ g:i A"
+#: ../../include/features.php:82 ../../include/widgets.php:304
+#: ../../include/contact_widgets.php:57
+msgid "Saved Folders"
 msgstr ""
 
-#: ../../include/event.php:27 ../../include/bb2diaspora.php:457
-msgid "Starts:"
+#: ../../include/features.php:82
+msgid "Ability to file posts under folders"
 msgstr ""
 
-#: ../../include/event.php:37 ../../include/bb2diaspora.php:465
-msgid "Finishes:"
+#: ../../include/features.php:83
+msgid "Dislike Posts"
 msgstr ""
 
-#: ../../include/event.php:47 ../../include/bb2diaspora.php:473
-#: ../../include/identity.php:874 ../../mod/events.php:647
-#: ../../mod/directory.php:230
-msgid "Location:"
+#: ../../include/features.php:83
+msgid "Ability to dislike posts/comments"
 msgstr ""
 
-#: ../../include/event.php:391
-msgid "This event has been added to your calendar."
+#: ../../include/features.php:84
+msgid "Star Posts"
 msgstr ""
 
-#: ../../include/js_strings.php:5
-msgid "Delete this item?"
+#: ../../include/features.php:84
+msgid "Ability to mark special posts with a star indicator"
 msgstr ""
 
-#: ../../include/js_strings.php:6 ../../include/ItemObject.php:667
-#: ../../mod/photos.php:968 ../../mod/photos.php:1086
-msgid "Comment"
+#: ../../include/features.php:85
+msgid "Tag Cloud"
 msgstr ""
 
-#: ../../include/js_strings.php:7 ../../include/ItemObject.php:384
-msgid "[+] show all"
+#: ../../include/features.php:85
+msgid "Provide a personal tag cloud on your channel page"
 msgstr ""
 
-#: ../../include/js_strings.php:8
-msgid "[-] show less"
+#: ../../include/widgets.php:35 ../../include/taxonomy.php:264
+#: ../../include/contact_widgets.php:92
+msgid "Categories"
 msgstr ""
 
-#: ../../include/js_strings.php:9
-msgid "[+] expand"
+#: ../../include/widgets.php:91 ../../include/nav.php:163
+#: ../../mod/apps.php:34
+msgid "Apps"
 msgstr ""
 
-#: ../../include/js_strings.php:10
-msgid "[-] collapse"
+#: ../../include/widgets.php:92
+msgid "System"
 msgstr ""
 
-#: ../../include/js_strings.php:11
-msgid "Password too short"
+#: ../../include/widgets.php:94 ../../include/conversation.php:1501
+msgid "Personal"
 msgstr ""
 
-#: ../../include/js_strings.php:12
-msgid "Passwords do not match"
+#: ../../include/widgets.php:95
+msgid "Create Personal App"
 msgstr ""
 
-#: ../../include/js_strings.php:13 ../../mod/photos.php:39
-msgid "everybody"
+#: ../../include/widgets.php:96
+msgid "Edit Personal App"
 msgstr ""
 
-#: ../../include/js_strings.php:14
-msgid "Secret Passphrase"
+#: ../../include/widgets.php:136 ../../include/widgets.php:175
+#: ../../include/Contact.php:107 ../../include/conversation.php:945
+#: ../../include/identity.php:823 ../../mod/match.php:64
+#: ../../mod/directory.php:302 ../../mod/suggest.php:52
+msgid "Connect"
 msgstr ""
 
-#: ../../include/js_strings.php:15
-msgid "Passphrase hint"
+#: ../../include/widgets.php:138 ../../mod/suggest.php:54
+msgid "Ignore/Hide"
 msgstr ""
 
-#: ../../include/js_strings.php:16
-msgid "Notice: Permissions have changed but have not yet been submitted."
+#: ../../include/widgets.php:143 ../../mod/connections.php:268
+msgid "Suggestions"
 msgstr ""
 
-#: ../../include/js_strings.php:17
-msgid "close all"
+#: ../../include/widgets.php:144
+msgid "See more..."
 msgstr ""
 
-#: ../../include/js_strings.php:18
-msgid "Nothing new here"
+#: ../../include/widgets.php:166
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
 msgstr ""
 
-#: ../../include/js_strings.php:19
-msgid "Rate This Channel (this is public)"
+#: ../../include/widgets.php:172
+msgid "Add New Connection"
 msgstr ""
 
-#: ../../include/js_strings.php:20 ../../mod/rate.php:156
-msgid "Rating"
+#: ../../include/widgets.php:173
+msgid "Enter the channel address"
 msgstr ""
 
-#: ../../include/js_strings.php:21
-msgid "Describe (optional)"
+#: ../../include/widgets.php:174
+msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr ""
 
-#: ../../include/js_strings.php:22 ../../include/ItemObject.php:668
-#: ../../mod/settings.php:582 ../../mod/settings.php:684
-#: ../../mod/settings.php:710 ../../mod/settings.php:738
-#: ../../mod/settings.php:761 ../../mod/settings.php:843
-#: ../../mod/settings.php:1039 ../../mod/xchan.php:11 ../../mod/connect.php:93
-#: ../../mod/thing.php:275 ../../mod/thing.php:318 ../../mod/events.php:656
-#: ../../mod/group.php:81 ../../mod/setup.php:313 ../../mod/setup.php:358
-#: ../../mod/photos.php:565 ../../mod/photos.php:642 ../../mod/photos.php:929
-#: ../../mod/photos.php:969 ../../mod/photos.php:1087 ../../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:156 ../../mod/fsuggest.php:108
-#: ../../mod/poke.php:166 ../../mod/profiles.php:667 ../../mod/admin.php:446
-#: ../../mod/admin.php:810 ../../mod/admin.php:946 ../../mod/admin.php:1077
-#: ../../mod/admin.php:1271 ../../mod/admin.php:1356 ../../mod/mood.php:134
-#: ../../mod/connedit.php:679 ../../mod/mail.php:355 ../../mod/appman.php:99
-#: ../../mod/poll.php:68 ../../mod/bulksetclose.php:24
-#: ../../view/theme/apw/php/config.php:256
-#: ../../view/theme/redbasic/php/config.php:97 ../../wppost/wppost.php:104
-msgid "Submit"
+#: ../../include/widgets.php:190
+msgid "Notes"
 msgstr ""
 
-#: ../../include/js_strings.php:23
-msgid "Please enter a link URL"
+#: ../../include/widgets.php:192 ../../include/text.php:853
+#: ../../include/text.php:865 ../../mod/rbmark.php:28 ../../mod/rbmark.php:98
+#: ../../mod/filer.php:50 ../../mod/admin.php:1416 ../../mod/admin.php:1436
+msgid "Save"
 msgstr ""
 
-#: ../../include/js_strings.php:25
-msgid "timeago.prefixAgo"
+#: ../../include/widgets.php:266
+msgid "Remove term"
 msgstr ""
 
-#: ../../include/js_strings.php:26
-msgid "timeago.prefixFromNow"
+#: ../../include/widgets.php:307 ../../include/contact_widgets.php:60
+#: ../../include/contact_widgets.php:95
+msgid "Everything"
 msgstr ""
 
-#: ../../include/js_strings.php:27
-msgid "ago"
+#: ../../include/widgets.php:349
+msgid "Archives"
 msgstr ""
 
-#: ../../include/js_strings.php:28
-msgid "from now"
+#: ../../include/widgets.php:427 ../../mod/connedit.php:572
+msgid "Me"
 msgstr ""
 
-#: ../../include/js_strings.php:29
-msgid "less than a minute"
+#: ../../include/widgets.php:428 ../../mod/connedit.php:573
+msgid "Family"
 msgstr ""
 
-#: ../../include/js_strings.php:30
-msgid "about a minute"
+#: ../../include/widgets.php:429 ../../include/identity.php:394
+#: ../../include/identity.php:395 ../../include/identity.php:402
+#: ../../include/profile_selectors.php:80 ../../mod/settings.php:339
+#: ../../mod/settings.php:343 ../../mod/settings.php:344
+#: ../../mod/settings.php:347 ../../mod/settings.php:358
+#: ../../mod/connedit.php:574
+msgid "Friends"
 msgstr ""
 
-#: ../../include/js_strings.php:31
-#, php-format
-msgid "%d minutes"
+#: ../../include/widgets.php:430 ../../mod/connedit.php:575
+msgid "Acquaintances"
 msgstr ""
 
-#: ../../include/js_strings.php:32
-msgid "about an hour"
+#: ../../include/widgets.php:431 ../../mod/connections.php:231
+#: ../../mod/connections.php:246 ../../mod/connedit.php:576
+msgid "All"
 msgstr ""
 
-#: ../../include/js_strings.php:33
-#, php-format
-msgid "about %d hours"
+#: ../../include/widgets.php:450
+msgid "Refresh"
 msgstr ""
 
-#: ../../include/js_strings.php:34
-msgid "a day"
+#: ../../include/widgets.php:485
+msgid "Account settings"
 msgstr ""
 
-#: ../../include/js_strings.php:35
-#, php-format
-msgid "%d days"
+#: ../../include/widgets.php:491
+msgid "Channel settings"
 msgstr ""
 
-#: ../../include/js_strings.php:36
-msgid "about a month"
+#: ../../include/widgets.php:497
+msgid "Additional features"
 msgstr ""
 
-#: ../../include/js_strings.php:37
-#, php-format
-msgid "%d months"
+#: ../../include/widgets.php:503
+msgid "Feature/Addon settings"
 msgstr ""
 
-#: ../../include/js_strings.php:38
-msgid "about a year"
+#: ../../include/widgets.php:509
+msgid "Display settings"
 msgstr ""
 
-#: ../../include/js_strings.php:39
-#, php-format
-msgid "%d years"
+#: ../../include/widgets.php:515
+msgid "Connected apps"
 msgstr ""
 
-#: ../../include/js_strings.php:40
-msgid " "
+#: ../../include/widgets.php:521
+msgid "Export channel"
 msgstr ""
 
-#: ../../include/js_strings.php:41
-msgid "timeago.numbers"
+#: ../../include/widgets.php:530 ../../mod/connedit.php:653
+msgid "Connection Default Permissions"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:107
-#: ../../include/RedDAV/RedBrowser.php:268
-msgid "parent"
+#: ../../include/widgets.php:538
+msgid "Premium Channel Settings"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:131 ../../include/text.php:2468
-msgid "Collection"
+#: ../../include/widgets.php:554 ../../include/nav.php:208
+#: ../../include/apps.php:134 ../../mod/admin.php:1038
+#: ../../mod/admin.php:1238
+msgid "Settings"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:134
-msgid "Principal"
+#: ../../include/widgets.php:567 ../../mod/message.php:31
+#: ../../mod/mail.php:128
+msgid "Messages"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:137
-msgid "Addressbook"
+#: ../../include/widgets.php:570
+msgid "Check Mail"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:140
-msgid "Calendar"
+#: ../../include/widgets.php:575 ../../include/nav.php:199
+msgid "New Message"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:143
-msgid "Schedule Inbox"
+#: ../../include/widgets.php:650
+msgid "Chat Rooms"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:146
-msgid "Schedule Outbox"
+#: ../../include/widgets.php:670
+msgid "Bookmarked Chatrooms"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:227
-#, php-format
-msgid "%1$s used"
+#: ../../include/widgets.php:690
+msgid "Suggested Chatrooms"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:232
-#, php-format
-msgid "%1$s used of %2$s (%3$s&#37;)"
+#: ../../include/widgets.php:817 ../../include/widgets.php:875
+msgid "photo/image"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:253
-msgid "Total"
+#: ../../include/widgets.php:970 ../../include/widgets.php:972
+msgid "Rate Me"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:255
-msgid "Shared"
+#: ../../include/widgets.php:976
+msgid "View Ratings"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:256
-#: ../../include/RedDAV/RedBrowser.php:306 ../../mod/menu.php:109
-#: ../../mod/webpages.php:173 ../../mod/mitem.php:169
-#: ../../mod/new_channel.php:121
-msgid "Create"
+#: ../../include/widgets.php:987
+msgid "Public Hubs"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:257
-#: ../../include/RedDAV/RedBrowser.php:308 ../../mod/profile_photo.php:362
-#: ../../mod/photos.php:706 ../../mod/photos.php:1236
-msgid "Upload"
+#: ../../include/enotify.php:58
+msgid "Red Matrix Notification"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/settings.php:584
-#: ../../mod/settings.php:610 ../../mod/admin.php:953
-#: ../../mod/sharedwithme.php:95
-msgid "Name"
+#: ../../include/enotify.php:59
+msgid "redmatrix"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:265
-msgid "Type"
+#: ../../include/enotify.php:61
+msgid "Thank You,"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:266 ../../mod/sharedwithme.php:97
-msgid "Size"
+#: ../../include/enotify.php:63
+#, php-format
+msgid "%s Administrator"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:267 ../../mod/sharedwithme.php:98
-msgid "Last Modified"
+#: ../../include/enotify.php:96
+#, php-format
+msgid "%s <!item_type!>"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:305
-msgid "Create new folder"
+#: ../../include/enotify.php:100
+#, php-format
+msgid "[Red:Notify] New mail received at %s"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:307
-msgid "Upload file"
+#: ../../include/enotify.php:102
+#, php-format
+msgid "%1$s, %2$s sent you a new private message at %3$s."
 msgstr ""
 
-#: ../../include/bookmarks.php:35
+#: ../../include/enotify.php:103
 #, php-format
-msgid "%1$s's bookmarks"
+msgid "%1$s sent you %2$s."
 msgstr ""
 
-#: ../../include/network.php:632
-msgid "view full size"
+#: ../../include/enotify.php:103
+msgid "a private message"
 msgstr ""
 
-#: ../../include/features.php:38
-msgid "General Features"
+#: ../../include/enotify.php:104
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
 msgstr ""
 
-#: ../../include/features.php:40
-msgid "Content Expiration"
+#: ../../include/enotify.php:158
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
 msgstr ""
 
-#: ../../include/features.php:40
-msgid "Remove posts/comments and/or private messages at a future time"
+#: ../../include/enotify.php:166
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
 msgstr ""
 
-#: ../../include/features.php:41
-msgid "Multiple Profiles"
+#: ../../include/enotify.php:175
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
 msgstr ""
 
-#: ../../include/features.php:41
-msgid "Ability to create multiple profiles"
+#: ../../include/enotify.php:186
+#, php-format
+msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
 msgstr ""
 
-#: ../../include/features.php:42
-msgid "Advanced Profiles"
+#: ../../include/enotify.php:187
+#, php-format
+msgid "%1$s, %2$s commented on an item/conversation you have been following."
 msgstr ""
 
-#: ../../include/features.php:42
-msgid "Additional profile sections and selections"
+#: ../../include/enotify.php:190 ../../include/enotify.php:205
+#: ../../include/enotify.php:231 ../../include/enotify.php:249
+#: ../../include/enotify.php:263
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
 msgstr ""
 
-#: ../../include/features.php:43
-msgid "Profile Import/Export"
+#: ../../include/enotify.php:196
+#, php-format
+msgid "[Red:Notify] %s posted to your profile wall"
 msgstr ""
 
-#: ../../include/features.php:43
-msgid "Save and load profile details across sites/channels"
+#: ../../include/enotify.php:198
+#, php-format
+msgid "%1$s, %2$s posted to your profile wall at %3$s"
 msgstr ""
 
-#: ../../include/features.php:44
-msgid "Web Pages"
+#: ../../include/enotify.php:200
+#, php-format
+msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
 msgstr ""
 
-#: ../../include/features.php:44
-msgid "Provide managed web pages on your channel"
+#: ../../include/enotify.php:224
+#, php-format
+msgid "[Red:Notify] %s tagged you"
 msgstr ""
 
-#: ../../include/features.php:45
-msgid "Private Notes"
+#: ../../include/enotify.php:225
+#, php-format
+msgid "%1$s, %2$s tagged you at %3$s"
 msgstr ""
 
-#: ../../include/features.php:45
-msgid "Enables a tool to store notes and reminders"
+#: ../../include/enotify.php:226
+#, php-format
+msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
 msgstr ""
 
-#: ../../include/features.php:46
-msgid "Navigation Channel Select"
+#: ../../include/enotify.php:238
+#, php-format
+msgid "[Red:Notify] %1$s poked you"
 msgstr ""
 
-#: ../../include/features.php:46
-msgid "Change channels directly from within the navigation dropdown menu"
+#: ../../include/enotify.php:239
+#, php-format
+msgid "%1$s, %2$s poked you at %3$s"
 msgstr ""
 
-#: ../../include/features.php:47
-msgid "Photo Location"
+#: ../../include/enotify.php:240
+#, php-format
+msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
 msgstr ""
 
-#: ../../include/features.php:47
-msgid "If location data is available on uploaded photos, link this to a map."
+#: ../../include/enotify.php:256
+#, php-format
+msgid "[Red:Notify] %s tagged your post"
 msgstr ""
 
-#: ../../include/features.php:49
-msgid "Expert Mode"
+#: ../../include/enotify.php:257
+#, php-format
+msgid "%1$s, %2$s tagged your post at %3$s"
 msgstr ""
 
-#: ../../include/features.php:49
-msgid "Enable Expert Mode to provide advanced configuration options"
+#: ../../include/enotify.php:258
+#, php-format
+msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
 msgstr ""
 
-#: ../../include/features.php:50
-msgid "Premium Channel"
+#: ../../include/enotify.php:270
+msgid "[Red:Notify] Introduction received"
 msgstr ""
 
-#: ../../include/features.php:50
-msgid ""
-"Allows you to set restrictions and terms on those that connect with your "
-"channel"
+#: ../../include/enotify.php:271
+#, php-format
+msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
+msgstr ""
+
+#: ../../include/enotify.php:272
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
 msgstr ""
 
-#: ../../include/features.php:55
-msgid "Post Composition Features"
+#: ../../include/enotify.php:276 ../../include/enotify.php:295
+#, php-format
+msgid "You may visit their profile at %s"
 msgstr ""
 
-#: ../../include/features.php:57
-msgid "Use Markdown"
+#: ../../include/enotify.php:278
+#, php-format
+msgid "Please visit %s to approve or reject the connection request."
 msgstr ""
 
-#: ../../include/features.php:57
-msgid "Allow use of \"Markdown\" to format posts"
+#: ../../include/enotify.php:285
+msgid "[Red:Notify] Friend suggestion received"
 msgstr ""
 
-#: ../../include/features.php:58
-msgid "Large Photos"
+#: ../../include/enotify.php:286
+#, php-format
+msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
 msgstr ""
 
-#: ../../include/features.php:58
+#: ../../include/enotify.php:287
+#, php-format
 msgid ""
-"Include large (640px) photo thumbnails in posts. If not enabled, use small "
-"(320px) photo thumbnails"
+"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s."
 msgstr ""
 
-#: ../../include/features.php:59 ../../include/widgets.php:546
-#: ../../mod/sources.php:88
-msgid "Channel Sources"
+#: ../../include/enotify.php:293
+msgid "Name:"
 msgstr ""
 
-#: ../../include/features.php:59
-msgid "Automatically import channel content from other channels or feeds"
+#: ../../include/enotify.php:294
+msgid "Photo:"
 msgstr ""
 
-#: ../../include/features.php:60
-msgid "Even More Encryption"
+#: ../../include/enotify.php:297
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""
 
-#: ../../include/features.php:60
-msgid ""
-"Allow optional encryption of content end-to-end with a shared secret key"
+#: ../../include/enotify.php:508
+msgid "[Red:Notify]"
 msgstr ""
 
-#: ../../include/features.php:61
-msgid "Enable voting tools"
+#: ../../include/contact_selectors.php:56
+msgid "Frequently"
 msgstr ""
 
-#: ../../include/features.php:61
-msgid "Provide a class of post which others can vote on"
+#: ../../include/contact_selectors.php:57
+msgid "Hourly"
 msgstr ""
 
-#: ../../include/features.php:67
-msgid "Network and Stream Filtering"
+#: ../../include/contact_selectors.php:58
+msgid "Twice daily"
 msgstr ""
 
-#: ../../include/features.php:68
-msgid "Search by Date"
+#: ../../include/contact_selectors.php:59
+msgid "Daily"
 msgstr ""
 
-#: ../../include/features.php:68
-msgid "Ability to select posts by date ranges"
+#: ../../include/contact_selectors.php:60
+msgid "Weekly"
 msgstr ""
 
-#: ../../include/features.php:69
-msgid "Collections Filter"
+#: ../../include/contact_selectors.php:61
+msgid "Monthly"
 msgstr ""
 
-#: ../../include/features.php:69
-msgid "Enable widget to display Network posts only from selected collections"
+#: ../../include/contact_selectors.php:76
+msgid "Friendica"
 msgstr ""
 
-#: ../../include/features.php:70 ../../include/widgets.php:274
-msgid "Saved Searches"
+#: ../../include/contact_selectors.php:77
+msgid "OStatus"
 msgstr ""
 
-#: ../../include/features.php:70
-msgid "Save search terms for re-use"
+#: ../../include/contact_selectors.php:78
+msgid "RSS/Atom"
 msgstr ""
 
-#: ../../include/features.php:71
-msgid "Network Personal Tab"
+#: ../../include/contact_selectors.php:79 ../../mod/admin.php:813
+#: ../../mod/admin.php:822 ../../mod/id.php:15 ../../mod/id.php:16
+#: ../../boot.php:1542
+msgid "Email"
 msgstr ""
 
-#: ../../include/features.php:71
-msgid "Enable tab to display only Network posts that you've interacted on"
+#: ../../include/contact_selectors.php:80
+msgid "Diaspora"
 msgstr ""
 
-#: ../../include/features.php:72
-msgid "Network New Tab"
+#: ../../include/contact_selectors.php:81
+msgid "Facebook"
 msgstr ""
 
-#: ../../include/features.php:72
-msgid "Enable tab to display all new Network activity"
+#: ../../include/contact_selectors.php:82
+msgid "Zot!"
 msgstr ""
 
-#: ../../include/features.php:73
-msgid "Affinity Tool"
+#: ../../include/contact_selectors.php:83
+msgid "LinkedIn"
 msgstr ""
 
-#: ../../include/features.php:73
-msgid "Filter stream activity by depth of relationships"
+#: ../../include/contact_selectors.php:84
+msgid "XMPP/IM"
 msgstr ""
 
-#: ../../include/features.php:74
-msgid "Suggest Channels"
+#: ../../include/contact_selectors.php:85
+msgid "MySpace"
 msgstr ""
 
-#: ../../include/features.php:74
-msgid "Show channel suggestions"
+#: ../../include/message.php:18
+msgid "No recipient provided."
 msgstr ""
 
-#: ../../include/features.php:79
-msgid "Post/Comment Tools"
+#: ../../include/message.php:23
+msgid "[no subject]"
 msgstr ""
 
-#: ../../include/features.php:80
-msgid "Tagging"
+#: ../../include/message.php:45
+msgid "Unable to determine sender."
 msgstr ""
 
-#: ../../include/features.php:80
-msgid "Ability to tag existing posts"
+#: ../../include/message.php:200
+msgid "Stored post could not be verified."
 msgstr ""
 
-#: ../../include/features.php:81
-msgid "Post Categories"
+#: ../../include/follow.php:28
+msgid "Channel is blocked on this site."
 msgstr ""
 
-#: ../../include/features.php:81
-msgid "Add categories to your posts"
+#: ../../include/follow.php:33
+msgid "Channel location missing."
 msgstr ""
 
-#: ../../include/features.php:82 ../../include/widgets.php:304
-#: ../../include/contact_widgets.php:57
-msgid "Saved Folders"
+#: ../../include/follow.php:83
+msgid "Response from remote channel was incomplete."
 msgstr ""
 
-#: ../../include/features.php:82
-msgid "Ability to file posts under folders"
+#: ../../include/follow.php:100
+msgid "Channel was deleted and no longer exists."
 msgstr ""
 
-#: ../../include/features.php:83
-msgid "Dislike Posts"
+#: ../../include/follow.php:135 ../../include/follow.php:197
+msgid "Protocol disabled."
 msgstr ""
 
-#: ../../include/features.php:83
-msgid "Ability to dislike posts/comments"
+#: ../../include/follow.php:170
+msgid "Channel discovery failed."
 msgstr ""
 
-#: ../../include/features.php:84
-msgid "Star Posts"
+#: ../../include/follow.php:186
+msgid "local account not found."
 msgstr ""
 
-#: ../../include/features.php:84
-msgid "Ability to mark special posts with a star indicator"
+#: ../../include/follow.php:215
+msgid "Cannot connect to yourself."
 msgstr ""
 
-#: ../../include/features.php:85
-msgid "Tag Cloud"
+#: ../../include/ItemObject.php:89 ../../include/conversation.php:667
+msgid "Private Message"
 msgstr ""
 
-#: ../../include/features.php:85
-msgid "Provide a personal tag cloud on your channel page"
+#: ../../include/ItemObject.php:126 ../../include/conversation.php:659
+msgid "Select"
 msgstr ""
 
-#: ../../include/widgets.php:35 ../../include/taxonomy.php:264
-#: ../../include/contact_widgets.php:92
-msgid "Categories"
+#: ../../include/ItemObject.php:130
+msgid "Save to Folder"
 msgstr ""
 
-#: ../../include/widgets.php:91 ../../include/nav.php:163
-#: ../../mod/apps.php:34
-msgid "Apps"
+#: ../../include/ItemObject.php:151
+msgid "I will attend"
 msgstr ""
 
-#: ../../include/widgets.php:92
-msgid "System"
+#: ../../include/ItemObject.php:151
+msgid "I will not attend"
 msgstr ""
 
-#: ../../include/widgets.php:95
-msgid "Create Personal App"
+#: ../../include/ItemObject.php:151
+msgid "I might attend"
 msgstr ""
 
-#: ../../include/widgets.php:96
-msgid "Edit Personal App"
+#: ../../include/ItemObject.php:161
+msgid "I agree"
 msgstr ""
 
-#: ../../include/widgets.php:138 ../../mod/suggest.php:54
-msgid "Ignore/Hide"
+#: ../../include/ItemObject.php:161
+msgid "I disagree"
 msgstr ""
 
-#: ../../include/widgets.php:143 ../../mod/connections.php:268
-msgid "Suggestions"
+#: ../../include/ItemObject.php:161
+msgid "I abstain"
 msgstr ""
 
-#: ../../include/widgets.php:144
-msgid "See more..."
+#: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187
+#: ../../include/conversation.php:1674 ../../mod/photos.php:1003
+#: ../../mod/photos.php:1015
+msgid "View all"
 msgstr ""
 
-#: ../../include/widgets.php:166
-#, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
+#: ../../include/ItemObject.php:179 ../../include/taxonomy.php:396
+#: ../../include/conversation.php:1698 ../../include/identity.php:1133
+#: ../../mod/photos.php:1007
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/ItemObject.php:184 ../../include/conversation.php:1701
+#: ../../mod/photos.php:1012
+msgctxt "noun"
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/ItemObject.php:212
+msgid "Add Star"
 msgstr ""
 
-#: ../../include/widgets.php:172
-msgid "Add New Connection"
+#: ../../include/ItemObject.php:213
+msgid "Remove Star"
 msgstr ""
 
-#: ../../include/widgets.php:173
-msgid "Enter the channel address"
+#: ../../include/ItemObject.php:214
+msgid "Toggle Star Status"
 msgstr ""
 
-#: ../../include/widgets.php:174
-msgid "Example: bob@example.com, http://example.com/barbara"
+#: ../../include/ItemObject.php:218
+msgid "starred"
 msgstr ""
 
-#: ../../include/widgets.php:190
-msgid "Notes"
+#: ../../include/ItemObject.php:227 ../../include/conversation.php:674
+msgid "Message signature validated"
 msgstr ""
 
-#: ../../include/widgets.php:192 ../../include/text.php:853
-#: ../../include/text.php:865 ../../mod/rbmark.php:28 ../../mod/rbmark.php:98
-#: ../../mod/filer.php:50 ../../mod/admin.php:1416 ../../mod/admin.php:1436
-msgid "Save"
+#: ../../include/ItemObject.php:228 ../../include/conversation.php:675
+msgid "Message signature incorrect"
 msgstr ""
 
-#: ../../include/widgets.php:266
-msgid "Remove term"
+#: ../../include/ItemObject.php:236
+msgid "Add Tag"
 msgstr ""
 
-#: ../../include/widgets.php:307 ../../include/contact_widgets.php:60
-#: ../../include/contact_widgets.php:95
-msgid "Everything"
+#: ../../include/ItemObject.php:254 ../../mod/photos.php:947
+msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../include/widgets.php:349
-msgid "Archives"
+#: ../../include/ItemObject.php:254 ../../include/taxonomy.php:310
+msgid "like"
+msgstr ""
+
+#: ../../include/ItemObject.php:255 ../../mod/photos.php:948
+msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../include/widgets.php:427 ../../mod/connedit.php:572
-msgid "Me"
+#: ../../include/ItemObject.php:255 ../../include/taxonomy.php:311
+msgid "dislike"
 msgstr ""
 
-#: ../../include/widgets.php:428 ../../mod/connedit.php:573
-msgid "Family"
+#: ../../include/ItemObject.php:259
+msgid "Share This"
 msgstr ""
 
-#: ../../include/widgets.php:429 ../../include/identity.php:394
-#: ../../include/identity.php:395 ../../include/identity.php:402
-#: ../../include/profile_selectors.php:80 ../../mod/settings.php:339
-#: ../../mod/settings.php:343 ../../mod/settings.php:344
-#: ../../mod/settings.php:347 ../../mod/settings.php:358
-#: ../../mod/connedit.php:574
-msgid "Friends"
+#: ../../include/ItemObject.php:259
+msgid "share"
 msgstr ""
 
-#: ../../include/widgets.php:430 ../../mod/connedit.php:575
-msgid "Acquaintances"
-msgstr ""
+#: ../../include/ItemObject.php:276
+#, php-format
+msgid "%d comment"
+msgid_plural "%d comments"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/widgets.php:431 ../../mod/connections.php:231
-#: ../../mod/connections.php:246 ../../mod/connedit.php:576
-msgid "All"
+#: ../../include/ItemObject.php:294 ../../include/ItemObject.php:295
+#, php-format
+msgid "View %s's profile - %s"
 msgstr ""
 
-#: ../../include/widgets.php:450
-msgid "Refresh"
+#: ../../include/ItemObject.php:298
+msgid "to"
 msgstr ""
 
-#: ../../include/widgets.php:485
-msgid "Account settings"
+#: ../../include/ItemObject.php:299
+msgid "via"
 msgstr ""
 
-#: ../../include/widgets.php:491
-msgid "Channel settings"
+#: ../../include/ItemObject.php:300
+msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../include/widgets.php:497
-msgid "Additional features"
+#: ../../include/ItemObject.php:301
+msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../include/widgets.php:503
-msgid "Feature/Addon settings"
+#: ../../include/ItemObject.php:312 ../../include/conversation.php:716
+#, php-format
+msgid "from %s"
 msgstr ""
 
-#: ../../include/widgets.php:509
-msgid "Display settings"
+#: ../../include/ItemObject.php:315 ../../include/conversation.php:719
+#, php-format
+msgid "last edited: %s"
 msgstr ""
 
-#: ../../include/widgets.php:515
-msgid "Connected apps"
+#: ../../include/ItemObject.php:316 ../../include/conversation.php:720
+#, php-format
+msgid "Expires: %s"
 msgstr ""
 
-#: ../../include/widgets.php:521
-msgid "Export channel"
+#: ../../include/ItemObject.php:337
+msgid "Save Bookmarks"
 msgstr ""
 
-#: ../../include/widgets.php:530 ../../mod/connedit.php:653
-msgid "Connection Default Permissions"
+#: ../../include/ItemObject.php:338
+msgid "Add to Calendar"
 msgstr ""
 
-#: ../../include/widgets.php:538
-msgid "Premium Channel Settings"
+#: ../../include/ItemObject.php:347
+msgid "Mark all seen"
 msgstr ""
 
-#: ../../include/widgets.php:554 ../../include/nav.php:208
-#: ../../include/apps.php:134 ../../mod/admin.php:1038
-#: ../../mod/admin.php:1238
-msgid "Settings"
+#: ../../include/ItemObject.php:353 ../../mod/photos.php:1133
+msgctxt "noun"
+msgid "Likes"
 msgstr ""
 
-#: ../../include/widgets.php:567 ../../mod/message.php:31
-#: ../../mod/mail.php:128
-msgid "Messages"
+#: ../../include/ItemObject.php:354 ../../mod/photos.php:1134
+msgctxt "noun"
+msgid "Dislikes"
 msgstr ""
 
-#: ../../include/widgets.php:570
-msgid "Check Mail"
+#: ../../include/ItemObject.php:359 ../../include/acl_selectors.php:249
+#: ../../mod/photos.php:1139
+msgid "Close"
 msgstr ""
 
-#: ../../include/widgets.php:575 ../../include/nav.php:199
-msgid "New Message"
+#: ../../include/ItemObject.php:364 ../../include/conversation.php:737
+#: ../../include/conversation.php:1206 ../../mod/photos.php:950
+#: ../../mod/editlayout.php:153 ../../mod/editwebpage.php:192
+#: ../../mod/editpost.php:130 ../../mod/editblock.php:155
+#: ../../mod/mail.php:241 ../../mod/mail.php:356
+msgid "Please wait"
 msgstr ""
 
-#: ../../include/widgets.php:650
-msgid "Chat Rooms"
+#: ../../include/ItemObject.php:665 ../../mod/photos.php:966
+#: ../../mod/photos.php:1084
+msgid "This is you"
 msgstr ""
 
-#: ../../include/widgets.php:670
-msgid "Bookmarked Chatrooms"
+#: ../../include/ItemObject.php:669 ../../include/conversation.php:1179
+#: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:179
+#: ../../mod/editpost.php:114 ../../mod/editblock.php:141
+msgid "Bold"
 msgstr ""
 
-#: ../../include/widgets.php:690
-msgid "Suggested Chatrooms"
+#: ../../include/ItemObject.php:670 ../../include/conversation.php:1180
+#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:180
+#: ../../mod/editpost.php:115 ../../mod/editblock.php:142
+msgid "Italic"
 msgstr ""
 
-#: ../../include/widgets.php:817 ../../include/widgets.php:875
-msgid "photo/image"
+#: ../../include/ItemObject.php:671 ../../include/conversation.php:1181
+#: ../../mod/editlayout.php:142 ../../mod/editwebpage.php:181
+#: ../../mod/editpost.php:116 ../../mod/editblock.php:143
+msgid "Underline"
 msgstr ""
 
-#: ../../include/widgets.php:970 ../../include/widgets.php:972
-msgid "Rate Me"
+#: ../../include/ItemObject.php:672 ../../include/conversation.php:1182
+#: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:182
+#: ../../mod/editpost.php:117 ../../mod/editblock.php:144
+msgid "Quote"
 msgstr ""
 
-#: ../../include/widgets.php:976
-msgid "View Ratings"
+#: ../../include/ItemObject.php:673 ../../include/conversation.php:1183
+#: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:183
+#: ../../mod/editpost.php:118 ../../mod/editblock.php:145
+msgid "Code"
 msgstr ""
 
-#: ../../include/widgets.php:987
-msgid "Public Hubs"
+#: ../../include/ItemObject.php:674
+msgid "Image"
 msgstr ""
 
-#: ../../include/enotify.php:58
-msgid "Red Matrix Notification"
+#: ../../include/ItemObject.php:675
+msgid "Insert Link"
 msgstr ""
 
-#: ../../include/enotify.php:59
-msgid "redmatrix"
+#: ../../include/ItemObject.php:676
+msgid "Video"
 msgstr ""
 
-#: ../../include/enotify.php:61
-msgid "Thank You,"
+#: ../../include/ItemObject.php:680 ../../include/conversation.php:1233
+#: ../../mod/editpost.php:157 ../../mod/mail.php:247 ../../mod/mail.php:361
+msgid "Encrypt text"
 msgstr ""
 
-#: ../../include/enotify.php:63
-#, php-format
-msgid "%s Administrator"
+#: ../../include/Contact.php:124
+msgid "New window"
 msgstr ""
 
-#: ../../include/enotify.php:96
-#, php-format
-msgid "%s <!item_type!>"
+#: ../../include/Contact.php:125
+msgid "Open the selected location in a different window or browser tab"
 msgstr ""
 
-#: ../../include/enotify.php:100
+#: ../../include/Contact.php:215 ../../mod/admin.php:730
 #, php-format
-msgid "[Red:Notify] New mail received at %s"
+msgid "User '%s' deleted"
 msgstr ""
 
-#: ../../include/enotify.php:102
-#, php-format
-msgid "%1$s, %2$s sent you a new private message at %3$s."
+#: ../../include/bb2diaspora.php:373
+msgid "Attachments:"
 msgstr ""
 
-#: ../../include/enotify.php:103
-#, php-format
-msgid "%1$s sent you %2$s."
+#: ../../include/bb2diaspora.php:453
+msgid "Redmatrix event notification:"
 msgstr ""
 
-#: ../../include/enotify.php:103
-msgid "a private message"
+#: ../../include/text.php:329
+msgid "prev"
 msgstr ""
 
-#: ../../include/enotify.php:104
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
+#: ../../include/text.php:331
+msgid "first"
 msgstr ""
 
-#: ../../include/enotify.php:158
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
+#: ../../include/text.php:360
+msgid "last"
 msgstr ""
 
-#: ../../include/enotify.php:166
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
+#: ../../include/text.php:363
+msgid "next"
 msgstr ""
 
-#: ../../include/enotify.php:175
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
+#: ../../include/text.php:373
+msgid "older"
 msgstr ""
 
-#: ../../include/enotify.php:186
-#, php-format
-msgid "[Red:Notify] Comment to conversation #%1$d by %2$s"
+#: ../../include/text.php:375
+msgid "newer"
 msgstr ""
 
-#: ../../include/enotify.php:187
-#, php-format
-msgid "%1$s, %2$s commented on an item/conversation you have been following."
+#: ../../include/text.php:768
+msgid "No connections"
 msgstr ""
 
-#: ../../include/enotify.php:190 ../../include/enotify.php:205
-#: ../../include/enotify.php:231 ../../include/enotify.php:249
-#: ../../include/enotify.php:263
+#: ../../include/text.php:782
 #, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
+msgid "%d Connection"
+msgid_plural "%d Connections"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/text.php:795 ../../mod/viewconnections.php:104
+msgid "View Connections"
 msgstr ""
 
-#: ../../include/enotify.php:196
-#, php-format
-msgid "[Red:Notify] %s posted to your profile wall"
+#: ../../include/text.php:852 ../../include/text.php:864
+#: ../../include/nav.php:165 ../../include/apps.php:147
+#: ../../mod/search.php:38
+msgid "Search"
 msgstr ""
 
-#: ../../include/enotify.php:198
-#, php-format
-msgid "%1$s, %2$s posted to your profile wall at %3$s"
+#: ../../include/text.php:928
+msgid "poke"
 msgstr ""
 
-#: ../../include/enotify.php:200
-#, php-format
-msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
+#: ../../include/text.php:928 ../../include/conversation.php:243
+msgid "poked"
 msgstr ""
 
-#: ../../include/enotify.php:224
-#, php-format
-msgid "[Red:Notify] %s tagged you"
+#: ../../include/text.php:929
+msgid "ping"
 msgstr ""
 
-#: ../../include/enotify.php:225
-#, php-format
-msgid "%1$s, %2$s tagged you at %3$s"
+#: ../../include/text.php:929
+msgid "pinged"
 msgstr ""
 
-#: ../../include/enotify.php:226
-#, php-format
-msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
+#: ../../include/text.php:930
+msgid "prod"
 msgstr ""
 
-#: ../../include/enotify.php:238
-#, php-format
-msgid "[Red:Notify] %1$s poked you"
+#: ../../include/text.php:930
+msgid "prodded"
 msgstr ""
 
-#: ../../include/enotify.php:239
-#, php-format
-msgid "%1$s, %2$s poked you at %3$s"
+#: ../../include/text.php:931
+msgid "slap"
 msgstr ""
 
-#: ../../include/enotify.php:240
-#, php-format
-msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
+#: ../../include/text.php:931
+msgid "slapped"
 msgstr ""
 
-#: ../../include/enotify.php:256
-#, php-format
-msgid "[Red:Notify] %s tagged your post"
+#: ../../include/text.php:932
+msgid "finger"
 msgstr ""
 
-#: ../../include/enotify.php:257
-#, php-format
-msgid "%1$s, %2$s tagged your post at %3$s"
+#: ../../include/text.php:932
+msgid "fingered"
 msgstr ""
 
-#: ../../include/enotify.php:258
-#, php-format
-msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
+#: ../../include/text.php:933
+msgid "rebuff"
 msgstr ""
 
-#: ../../include/enotify.php:270
-msgid "[Red:Notify] Introduction received"
+#: ../../include/text.php:933
+msgid "rebuffed"
 msgstr ""
 
-#: ../../include/enotify.php:271
-#, php-format
-msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
+#: ../../include/text.php:943
+msgid "happy"
 msgstr ""
 
-#: ../../include/enotify.php:272
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
+#: ../../include/text.php:944
+msgid "sad"
 msgstr ""
 
-#: ../../include/enotify.php:276 ../../include/enotify.php:295
-#, php-format
-msgid "You may visit their profile at %s"
+#: ../../include/text.php:945
+msgid "mellow"
 msgstr ""
 
-#: ../../include/enotify.php:278
-#, php-format
-msgid "Please visit %s to approve or reject the connection request."
+#: ../../include/text.php:946
+msgid "tired"
 msgstr ""
 
-#: ../../include/enotify.php:285
-msgid "[Red:Notify] Friend suggestion received"
+#: ../../include/text.php:947
+msgid "perky"
 msgstr ""
 
-#: ../../include/enotify.php:286
-#, php-format
-msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
+#: ../../include/text.php:948
+msgid "angry"
 msgstr ""
 
-#: ../../include/enotify.php:287
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s."
+#: ../../include/text.php:949
+msgid "stupified"
 msgstr ""
 
-#: ../../include/enotify.php:293
-msgid "Name:"
+#: ../../include/text.php:950
+msgid "puzzled"
 msgstr ""
 
-#: ../../include/enotify.php:294
-msgid "Photo:"
+#: ../../include/text.php:951
+msgid "interested"
 msgstr ""
 
-#: ../../include/enotify.php:297
-#, php-format
-msgid "Please visit %s to approve or reject the suggestion."
+#: ../../include/text.php:952
+msgid "bitter"
 msgstr ""
 
-#: ../../include/enotify.php:508
-msgid "[Red:Notify]"
+#: ../../include/text.php:953
+msgid "cheerful"
 msgstr ""
 
-#: ../../include/contact_selectors.php:56
-msgid "Frequently"
+#: ../../include/text.php:954
+msgid "alive"
 msgstr ""
 
-#: ../../include/contact_selectors.php:57
-msgid "Hourly"
+#: ../../include/text.php:955
+msgid "annoyed"
 msgstr ""
 
-#: ../../include/contact_selectors.php:58
-msgid "Twice daily"
+#: ../../include/text.php:956
+msgid "anxious"
 msgstr ""
 
-#: ../../include/contact_selectors.php:59
-msgid "Daily"
+#: ../../include/text.php:957
+msgid "cranky"
 msgstr ""
 
-#: ../../include/contact_selectors.php:60
-msgid "Weekly"
+#: ../../include/text.php:958
+msgid "disturbed"
 msgstr ""
 
-#: ../../include/contact_selectors.php:61
-msgid "Monthly"
+#: ../../include/text.php:959
+msgid "frustrated"
 msgstr ""
 
-#: ../../include/contact_selectors.php:76
-msgid "Friendica"
+#: ../../include/text.php:960
+msgid "depressed"
 msgstr ""
 
-#: ../../include/contact_selectors.php:77
-msgid "OStatus"
+#: ../../include/text.php:961
+msgid "motivated"
 msgstr ""
 
-#: ../../include/contact_selectors.php:78
-msgid "RSS/Atom"
+#: ../../include/text.php:962
+msgid "relaxed"
 msgstr ""
 
-#: ../../include/contact_selectors.php:79 ../../mod/admin.php:813
-#: ../../mod/admin.php:822 ../../mod/id.php:15 ../../mod/id.php:16
-#: ../../boot.php:1542
-msgid "Email"
+#: ../../include/text.php:963
+msgid "surprised"
 msgstr ""
 
-#: ../../include/contact_selectors.php:80
-msgid "Diaspora"
+#: ../../include/text.php:1135
+msgid "Monday"
 msgstr ""
 
-#: ../../include/contact_selectors.php:81
-msgid "Facebook"
+#: ../../include/text.php:1135
+msgid "Tuesday"
 msgstr ""
 
-#: ../../include/contact_selectors.php:82
-msgid "Zot!"
+#: ../../include/text.php:1135
+msgid "Wednesday"
 msgstr ""
 
-#: ../../include/contact_selectors.php:83
-msgid "LinkedIn"
+#: ../../include/text.php:1135
+msgid "Thursday"
 msgstr ""
 
-#: ../../include/contact_selectors.php:84
-msgid "XMPP/IM"
+#: ../../include/text.php:1135
+msgid "Friday"
 msgstr ""
 
-#: ../../include/contact_selectors.php:85
-msgid "MySpace"
+#: ../../include/text.php:1135
+msgid "Saturday"
 msgstr ""
 
-#: ../../include/message.php:18
-msgid "No recipient provided."
+#: ../../include/text.php:1135
+msgid "Sunday"
 msgstr ""
 
-#: ../../include/message.php:23
-msgid "[no subject]"
+#: ../../include/text.php:1139
+msgid "January"
 msgstr ""
 
-#: ../../include/message.php:45
-msgid "Unable to determine sender."
+#: ../../include/text.php:1139
+msgid "February"
 msgstr ""
 
-#: ../../include/message.php:200
-msgid "Stored post could not be verified."
+#: ../../include/text.php:1139
+msgid "March"
 msgstr ""
 
-#: ../../include/follow.php:28
-msgid "Channel is blocked on this site."
+#: ../../include/text.php:1139
+msgid "April"
 msgstr ""
 
-#: ../../include/follow.php:33
-msgid "Channel location missing."
+#: ../../include/text.php:1139
+msgid "May"
 msgstr ""
 
-#: ../../include/follow.php:83
-msgid "Response from remote channel was incomplete."
+#: ../../include/text.php:1139
+msgid "June"
 msgstr ""
 
-#: ../../include/follow.php:100
-msgid "Channel was deleted and no longer exists."
+#: ../../include/text.php:1139
+msgid "July"
 msgstr ""
 
-#: ../../include/follow.php:135 ../../include/follow.php:197
-msgid "Protocol disabled."
+#: ../../include/text.php:1139
+msgid "August"
 msgstr ""
 
-#: ../../include/follow.php:170
-msgid "Channel discovery failed."
+#: ../../include/text.php:1139
+msgid "September"
 msgstr ""
 
-#: ../../include/follow.php:186
-msgid "local account not found."
+#: ../../include/text.php:1139
+msgid "October"
 msgstr ""
 
-#: ../../include/follow.php:215
-msgid "Cannot connect to yourself."
+#: ../../include/text.php:1139
+msgid "November"
 msgstr ""
 
-#: ../../include/ItemObject.php:130
-msgid "Save to Folder"
+#: ../../include/text.php:1139
+msgid "December"
 msgstr ""
 
-#: ../../include/ItemObject.php:151
-msgid "I will attend"
+#: ../../include/text.php:1236
+msgid "unknown.???"
 msgstr ""
 
-#: ../../include/ItemObject.php:151
-msgid "I will not attend"
+#: ../../include/text.php:1237
+msgid "bytes"
 msgstr ""
 
-#: ../../include/ItemObject.php:151
-msgid "I might attend"
+#: ../../include/text.php:1273
+msgid "remove category"
 msgstr ""
 
-#: ../../include/ItemObject.php:161
-msgid "I agree"
+#: ../../include/text.php:1348
+msgid "remove from file"
 msgstr ""
 
-#: ../../include/ItemObject.php:161
-msgid "I disagree"
+#: ../../include/text.php:1424 ../../include/text.php:1435
+#: ../../mod/connedit.php:661
+msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/ItemObject.php:161
-msgid "I abstain"
+#: ../../include/text.php:1591 ../../mod/events.php:444
+msgid "Link to Source"
 msgstr ""
 
-#: ../../include/ItemObject.php:212
-msgid "Add Star"
+#: ../../include/text.php:1612 ../../include/text.php:1683
+msgid "default"
 msgstr ""
 
-#: ../../include/ItemObject.php:213
-msgid "Remove Star"
+#: ../../include/text.php:1620
+msgid "Page layout"
 msgstr ""
 
-#: ../../include/ItemObject.php:214
-msgid "Toggle Star Status"
+#: ../../include/text.php:1620
+msgid "You can create your own with the layouts tool"
 msgstr ""
 
-#: ../../include/ItemObject.php:218
-msgid "starred"
+#: ../../include/text.php:1661
+msgid "Page content type"
 msgstr ""
 
-#: ../../include/ItemObject.php:236
-msgid "Add Tag"
+#: ../../include/text.php:1695
+msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/ItemObject.php:254 ../../mod/photos.php:947
-msgid "I like this (toggle)"
+#: ../../include/text.php:1814 ../../include/conversation.php:120
+#: ../../include/diaspora.php:2081 ../../mod/like.php:346
+#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
+#: ../../mod/tagger.php:43
+msgid "photo"
 msgstr ""
 
-#: ../../include/ItemObject.php:254 ../../include/taxonomy.php:310
-msgid "like"
+#: ../../include/text.php:1817 ../../include/conversation.php:123
+#: ../../mod/like.php:348 ../../mod/tagger.php:47
+msgid "event"
 msgstr ""
 
-#: ../../include/ItemObject.php:255 ../../mod/photos.php:948
-msgid "I don't like this (toggle)"
+#: ../../include/text.php:1820 ../../include/conversation.php:148
+#: ../../include/diaspora.php:2081 ../../mod/like.php:346
+#: ../../mod/subthread.php:72 ../../mod/subthread.php:174
+#: ../../mod/tagger.php:51
+msgid "status"
 msgstr ""
 
-#: ../../include/ItemObject.php:255 ../../include/taxonomy.php:311
-msgid "dislike"
+#: ../../include/text.php:1822 ../../include/conversation.php:150
+#: ../../mod/tagger.php:53
+msgid "comment"
 msgstr ""
 
-#: ../../include/ItemObject.php:259
-msgid "Share This"
+#: ../../include/text.php:1827
+msgid "activity"
 msgstr ""
 
-#: ../../include/ItemObject.php:259
-msgid "share"
+#: ../../include/text.php:2122
+msgid "Design Tools"
 msgstr ""
 
-#: ../../include/ItemObject.php:276
-#, php-format
-msgid "%d comment"
-msgid_plural "%d comments"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/text.php:2125 ../../mod/blocks.php:143
+msgid "Blocks"
+msgstr ""
 
-#: ../../include/ItemObject.php:294 ../../include/ItemObject.php:295
-#, php-format
-msgid "View %s's profile - %s"
+#: ../../include/text.php:2126 ../../mod/menu.php:95
+msgid "Menus"
 msgstr ""
 
-#: ../../include/ItemObject.php:298
-msgid "to"
+#: ../../include/text.php:2127 ../../mod/layouts.php:169
+msgid "Layouts"
 msgstr ""
 
-#: ../../include/ItemObject.php:299
-msgid "via"
+#: ../../include/text.php:2128
+msgid "Pages"
 msgstr ""
 
-#: ../../include/ItemObject.php:300
-msgid "Wall-to-Wall"
+#: ../../include/nav.php:87 ../../include/nav.php:120 ../../boot.php:1539
+msgid "Logout"
 msgstr ""
 
-#: ../../include/ItemObject.php:301
-msgid "via Wall-To-Wall:"
+#: ../../include/nav.php:87 ../../include/nav.php:120
+msgid "End this session"
 msgstr ""
 
-#: ../../include/ItemObject.php:337
-msgid "Save Bookmarks"
+#: ../../include/nav.php:90 ../../include/nav.php:151
+msgid "Home"
 msgstr ""
 
-#: ../../include/ItemObject.php:338
-msgid "Add to Calendar"
+#: ../../include/nav.php:90
+msgid "Your posts and conversations"
 msgstr ""
 
-#: ../../include/ItemObject.php:347
-msgid "Mark all seen"
+#: ../../include/nav.php:91 ../../include/conversation.php:942
+#: ../../mod/connedit.php:494 ../../mod/connedit.php:660
+msgid "View Profile"
 msgstr ""
 
-#: ../../include/ItemObject.php:353 ../../mod/photos.php:1133
-msgctxt "noun"
-msgid "Likes"
+#: ../../include/nav.php:91
+msgid "Your profile page"
 msgstr ""
 
-#: ../../include/ItemObject.php:354 ../../mod/photos.php:1134
-msgctxt "noun"
-msgid "Dislikes"
+#: ../../include/nav.php:93
+msgid "Edit Profiles"
 msgstr ""
 
-#: ../../include/ItemObject.php:359 ../../include/acl_selectors.php:249
-#: ../../mod/photos.php:1139
-msgid "Close"
+#: ../../include/nav.php:93
+msgid "Manage/Edit profiles"
 msgstr ""
 
-#: ../../include/ItemObject.php:665 ../../mod/photos.php:966
-#: ../../mod/photos.php:1084
-msgid "This is you"
+#: ../../include/nav.php:95 ../../include/identity.php:846
+msgid "Edit Profile"
 msgstr ""
 
-#: ../../include/ItemObject.php:674
-msgid "Image"
+#: ../../include/nav.php:95
+msgid "Edit your profile"
 msgstr ""
 
-#: ../../include/ItemObject.php:675
-msgid "Insert Link"
+#: ../../include/nav.php:97 ../../include/conversation.php:1597
+#: ../../include/apps.php:139 ../../mod/fbrowser.php:25
+msgid "Photos"
 msgstr ""
 
-#: ../../include/ItemObject.php:676
-msgid "Video"
+#: ../../include/nav.php:97
+msgid "Your photos"
 msgstr ""
 
-#: ../../include/Contact.php:124
-msgid "New window"
+#: ../../include/nav.php:98
+msgid "Your files"
 msgstr ""
 
-#: ../../include/Contact.php:125
-msgid "Open the selected location in a different window or browser tab"
+#: ../../include/nav.php:103 ../../include/apps.php:146
+msgid "Chat"
 msgstr ""
 
-#: ../../include/Contact.php:215 ../../mod/admin.php:730
-#, php-format
-msgid "User '%s' deleted"
+#: ../../include/nav.php:103
+msgid "Your chatrooms"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:373
-msgid "Attachments:"
+#: ../../include/nav.php:109 ../../include/conversation.php:1632
+#: ../../include/apps.php:129
+msgid "Bookmarks"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:453
-msgid "Redmatrix event notification:"
+#: ../../include/nav.php:109
+msgid "Your bookmarks"
 msgstr ""
 
-#: ../../include/text.php:329
-msgid "prev"
+#: ../../include/nav.php:113 ../../include/conversation.php:1642
+#: ../../include/apps.php:136 ../../mod/webpages.php:176
+msgid "Webpages"
 msgstr ""
 
-#: ../../include/text.php:331
-msgid "first"
+#: ../../include/nav.php:113
+msgid "Your webpages"
 msgstr ""
 
-#: ../../include/text.php:360
-msgid "last"
+#: ../../include/nav.php:117 ../../include/apps.php:131 ../../boot.php:1540
+msgid "Login"
 msgstr ""
 
-#: ../../include/text.php:363
-msgid "next"
+#: ../../include/nav.php:117
+msgid "Sign in"
 msgstr ""
 
-#: ../../include/text.php:373
-msgid "older"
+#: ../../include/nav.php:134
+#, php-format
+msgid "%s - click to logout"
 msgstr ""
 
-#: ../../include/text.php:375
-msgid "newer"
+#: ../../include/nav.php:137
+msgid "Remote authentication"
 msgstr ""
 
-#: ../../include/text.php:768
-msgid "No connections"
+#: ../../include/nav.php:137
+msgid "Click to authenticate to your home hub"
 msgstr ""
 
-#: ../../include/text.php:782
-#, php-format
-msgid "%d Connection"
-msgid_plural "%d Connections"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/nav.php:151
+msgid "Home Page"
+msgstr ""
 
-#: ../../include/text.php:795 ../../mod/viewconnections.php:104
-msgid "View Connections"
+#: ../../include/nav.php:155 ../../mod/register.php:224 ../../boot.php:1516
+msgid "Register"
 msgstr ""
 
-#: ../../include/text.php:852 ../../include/text.php:864
-#: ../../include/nav.php:165 ../../include/apps.php:147
-#: ../../mod/search.php:38
-msgid "Search"
+#: ../../include/nav.php:155
+msgid "Create an account"
 msgstr ""
 
-#: ../../include/text.php:928
-msgid "poke"
+#: ../../include/nav.php:160 ../../include/apps.php:142 ../../mod/help.php:67
+#: ../../mod/help.php:72 ../../mod/layouts.php:171
+msgid "Help"
 msgstr ""
 
-#: ../../include/text.php:929
-msgid "ping"
+#: ../../include/nav.php:160
+msgid "Help and documentation"
 msgstr ""
 
-#: ../../include/text.php:929
-msgid "pinged"
+#: ../../include/nav.php:163
+msgid "Applications, utilities, links, games"
 msgstr ""
 
-#: ../../include/text.php:930
-msgid "prod"
+#: ../../include/nav.php:165
+msgid "Search site content"
 msgstr ""
 
-#: ../../include/text.php:930
-msgid "prodded"
+#: ../../include/nav.php:168 ../../include/apps.php:141
+#: ../../mod/directory.php:366
+msgid "Directory"
 msgstr ""
 
-#: ../../include/text.php:931
-msgid "slap"
+#: ../../include/nav.php:168
+msgid "Channel Directory"
 msgstr ""
 
-#: ../../include/text.php:931
-msgid "slapped"
+#: ../../include/nav.php:180 ../../include/apps.php:133
+msgid "Matrix"
 msgstr ""
 
-#: ../../include/text.php:932
-msgid "finger"
+#: ../../include/nav.php:180
+msgid "Your matrix"
 msgstr ""
 
-#: ../../include/text.php:932
-msgid "fingered"
+#: ../../include/nav.php:181
+msgid "Mark all matrix notifications seen"
 msgstr ""
 
-#: ../../include/text.php:933
-msgid "rebuff"
+#: ../../include/nav.php:183 ../../include/apps.php:137
+msgid "Channel Home"
 msgstr ""
 
-#: ../../include/text.php:933
-msgid "rebuffed"
+#: ../../include/nav.php:183
+msgid "Channel home"
 msgstr ""
 
-#: ../../include/text.php:943
-msgid "happy"
+#: ../../include/nav.php:184
+msgid "Mark all channel notifications seen"
 msgstr ""
 
-#: ../../include/text.php:944
-msgid "sad"
+#: ../../include/nav.php:187 ../../mod/connections.php:407
+msgid "Connections"
 msgstr ""
 
-#: ../../include/text.php:945
-msgid "mellow"
+#: ../../include/nav.php:190
+msgid "Notices"
 msgstr ""
 
-#: ../../include/text.php:946
-msgid "tired"
+#: ../../include/nav.php:190
+msgid "Notifications"
 msgstr ""
 
-#: ../../include/text.php:947
-msgid "perky"
+#: ../../include/nav.php:191
+msgid "See all notifications"
 msgstr ""
 
-#: ../../include/text.php:948
-msgid "angry"
+#: ../../include/nav.php:192 ../../mod/notifications.php:99
+msgid "Mark all system notifications seen"
 msgstr ""
 
-#: ../../include/text.php:949
-msgid "stupified"
+#: ../../include/nav.php:194 ../../include/apps.php:143
+msgid "Mail"
 msgstr ""
 
-#: ../../include/text.php:950
-msgid "puzzled"
+#: ../../include/nav.php:194
+msgid "Private mail"
 msgstr ""
 
-#: ../../include/text.php:951
-msgid "interested"
+#: ../../include/nav.php:195
+msgid "See all private messages"
 msgstr ""
 
-#: ../../include/text.php:952
-msgid "bitter"
+#: ../../include/nav.php:196
+msgid "Mark all private messages seen"
 msgstr ""
 
-#: ../../include/text.php:953
-msgid "cheerful"
+#: ../../include/nav.php:197
+msgid "Inbox"
 msgstr ""
 
-#: ../../include/text.php:954
-msgid "alive"
+#: ../../include/nav.php:198
+msgid "Outbox"
 msgstr ""
 
-#: ../../include/text.php:955
-msgid "annoyed"
+#: ../../include/nav.php:202 ../../include/apps.php:140
+#: ../../mod/events.php:472
+msgid "Events"
 msgstr ""
 
-#: ../../include/text.php:956
-msgid "anxious"
+#: ../../include/nav.php:202
+msgid "Event Calendar"
 msgstr ""
 
-#: ../../include/text.php:957
-msgid "cranky"
+#: ../../include/nav.php:203
+msgid "See all events"
 msgstr ""
 
-#: ../../include/text.php:958
-msgid "disturbed"
+#: ../../include/nav.php:204
+msgid "Mark all events seen"
 msgstr ""
 
-#: ../../include/text.php:959
-msgid "frustrated"
+#: ../../include/nav.php:206 ../../include/apps.php:132
+#: ../../mod/manage.php:166
+msgid "Channel Manager"
 msgstr ""
 
-#: ../../include/text.php:960
-msgid "depressed"
+#: ../../include/nav.php:206
+msgid "Manage Your Channels"
 msgstr ""
 
-#: ../../include/text.php:961
-msgid "motivated"
+#: ../../include/nav.php:208
+msgid "Account/Channel Settings"
 msgstr ""
 
-#: ../../include/text.php:962
-msgid "relaxed"
+#: ../../include/nav.php:216 ../../mod/admin.php:120
+msgid "Admin"
 msgstr ""
 
-#: ../../include/text.php:963
-msgid "surprised"
+#: ../../include/nav.php:216
+msgid "Site Setup and Configuration"
 msgstr ""
 
-#: ../../include/text.php:1135
-msgid "Monday"
+#: ../../include/nav.php:247 ../../include/conversation.php:850
+msgid "Loading..."
+msgstr ""
+
+#: ../../include/nav.php:252
+msgid "@name, #tag, content"
 msgstr ""
 
-#: ../../include/text.php:1135
-msgid "Tuesday"
+#: ../../include/nav.php:253
+msgid "Please wait..."
 msgstr ""
 
-#: ../../include/text.php:1135
-msgid "Wednesday"
+#: ../../include/taxonomy.php:222 ../../include/taxonomy.php:243
+msgid "Tags"
 msgstr ""
 
-#: ../../include/text.php:1135
-msgid "Thursday"
+#: ../../include/taxonomy.php:287
+msgid "Keywords"
 msgstr ""
 
-#: ../../include/text.php:1135
-msgid "Friday"
+#: ../../include/taxonomy.php:308
+msgid "have"
 msgstr ""
 
-#: ../../include/text.php:1135
-msgid "Saturday"
+#: ../../include/taxonomy.php:308
+msgid "has"
 msgstr ""
 
-#: ../../include/text.php:1135
-msgid "Sunday"
+#: ../../include/taxonomy.php:309
+msgid "want"
 msgstr ""
 
-#: ../../include/text.php:1139
-msgid "January"
+#: ../../include/taxonomy.php:309
+msgid "wants"
 msgstr ""
 
-#: ../../include/text.php:1139
-msgid "February"
+#: ../../include/taxonomy.php:310
+msgid "likes"
 msgstr ""
 
-#: ../../include/text.php:1139
-msgid "March"
+#: ../../include/taxonomy.php:311
+msgid "dislikes"
 msgstr ""
 
-#: ../../include/text.php:1139
-msgid "April"
+#: ../../include/activities.php:39
+msgid " and "
 msgstr ""
 
-#: ../../include/text.php:1139
-msgid "May"
+#: ../../include/activities.php:47
+msgid "public profile"
 msgstr ""
 
-#: ../../include/text.php:1139
-msgid "June"
+#: ../../include/activities.php:56
+#, php-format
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
 msgstr ""
 
-#: ../../include/text.php:1139
-msgid "July"
+#: ../../include/activities.php:57
+#, php-format
+msgid "Visit %1$s's %2$s"
 msgstr ""
 
-#: ../../include/text.php:1139
-msgid "August"
+#: ../../include/activities.php:60
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: ../../include/text.php:1139
-msgid "September"
+#: ../../include/bbcode.php:122 ../../include/bbcode.php:735
+#: ../../include/bbcode.php:738 ../../include/bbcode.php:743
+#: ../../include/bbcode.php:746 ../../include/bbcode.php:749
+#: ../../include/bbcode.php:752 ../../include/bbcode.php:757
+#: ../../include/bbcode.php:760 ../../include/bbcode.php:765
+#: ../../include/bbcode.php:768 ../../include/bbcode.php:771
+#: ../../include/bbcode.php:774
+msgid "Image/photo"
 msgstr ""
 
-#: ../../include/text.php:1139
-msgid "October"
+#: ../../include/bbcode.php:161 ../../include/bbcode.php:785
+msgid "Encrypted content"
 msgstr ""
 
-#: ../../include/text.php:1139
-msgid "November"
+#: ../../include/bbcode.php:177
+msgid "Install design element: "
 msgstr ""
 
-#: ../../include/text.php:1139
-msgid "December"
+#: ../../include/bbcode.php:190
+msgid "QR code"
 msgstr ""
 
-#: ../../include/text.php:1225
-msgid "unknown.???"
+#: ../../include/bbcode.php:241
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
 msgstr ""
 
-#: ../../include/text.php:1226
-msgid "bytes"
+#: ../../include/bbcode.php:243
+msgid "post"
 msgstr ""
 
-#: ../../include/text.php:1262
-msgid "remove category"
+#: ../../include/bbcode.php:485
+msgid "Different viewers will see this text differently"
 msgstr ""
 
-#: ../../include/text.php:1337
-msgid "remove from file"
+#: ../../include/bbcode.php:696
+msgid "$1 spoiler"
 msgstr ""
 
-#: ../../include/text.php:1413 ../../include/text.php:1424
-#: ../../mod/connedit.php:661
-msgid "Click to open/close"
+#: ../../include/bbcode.php:723
+msgid "$1 wrote:"
 msgstr ""
 
-#: ../../include/text.php:1580 ../../mod/events.php:444
-msgid "Link to Source"
+#: ../../include/items.php:399 ../../mod/like.php:270
+#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/profperm.php:23
+#: ../../mod/bulksetclose.php:11 ../../index.php:392
+msgid "Permission denied"
 msgstr ""
 
-#: ../../include/text.php:1601 ../../include/text.php:1672
-msgid "default"
+#: ../../include/items.php:1012 ../../include/items.php:1058
+msgid "(Unknown)"
 msgstr ""
 
-#: ../../include/text.php:1609
-msgid "Page layout"
+#: ../../include/items.php:1226
+msgid "Visible to anybody on the internet."
 msgstr ""
 
-#: ../../include/text.php:1609
-msgid "You can create your own with the layouts tool"
+#: ../../include/items.php:1228
+msgid "Visible to you only."
 msgstr ""
 
-#: ../../include/text.php:1650
-msgid "Page content type"
+#: ../../include/items.php:1230
+msgid "Visible to anybody in this network."
 msgstr ""
 
-#: ../../include/text.php:1684
-msgid "Select an alternate language"
+#: ../../include/items.php:1232
+msgid "Visible to anybody authenticated."
 msgstr ""
 
-#: ../../include/text.php:1816
-msgid "activity"
+#: ../../include/items.php:1234
+#, php-format
+msgid "Visible to anybody on %s."
 msgstr ""
 
-#: ../../include/text.php:2111
-msgid "Design Tools"
+#: ../../include/items.php:1236
+msgid "Visible to all connections."
 msgstr ""
 
-#: ../../include/text.php:2114
-msgid "Blocks"
+#: ../../include/items.php:1238
+msgid "Visible to approved connections."
 msgstr ""
 
-#: ../../include/text.php:2115
-msgid "Menus"
+#: ../../include/items.php:1240
+msgid "Visible to specific connections."
 msgstr ""
 
-#: ../../include/text.php:2116
-msgid "Layouts"
+#: ../../include/items.php:4051 ../../mod/thing.php:74
+#: ../../mod/display.php:36 ../../mod/filestorage.php:27
+#: ../../mod/viewsrc.php:20 ../../mod/admin.php:167 ../../mod/admin.php:984
+#: ../../mod/admin.php:1184
+msgid "Item not found."
 msgstr ""
 
-#: ../../include/text.php:2117
-msgid "Pages"
+#: ../../include/items.php:4124 ../../include/photos.php:26
+#: ../../include/attach.php:136 ../../include/attach.php:183
+#: ../../include/attach.php:246 ../../include/attach.php:260
+#: ../../include/attach.php:304 ../../include/attach.php:318
+#: ../../include/attach.php:343 ../../include/attach.php:539
+#: ../../include/attach.php:611 ../../include/chat.php:131
+#: ../../mod/profile.php:64 ../../mod/profile.php:72
+#: ../../mod/achievements.php:30 ../../mod/manage.php:6
+#: ../../mod/settings.php:564 ../../mod/api.php:26 ../../mod/api.php:31
+#: ../../mod/thing.php:241 ../../mod/thing.php:256 ../../mod/thing.php:290
+#: ../../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/group.php:9 ../../mod/setup.php:207
+#: ../../mod/common.php:35 ../../mod/connections.php:169
+#: ../../mod/photos.php:68 ../../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:101
+#: ../../mod/editwebpage.php:125 ../../mod/rate.php:110
+#: ../../mod/editpost.php:13 ../../mod/invite.php:13 ../../mod/invite.php:104
+#: ../../mod/locs.php:77 ../../mod/sources.php:66 ../../mod/menu.php:69
+#: ../../mod/filestorage.php:18 ../../mod/filestorage.php:73
+#: ../../mod/filestorage.php:88 ../../mod/filestorage.php:115
+#: ../../mod/fsuggest.php:78 ../../mod/poke.php:128 ../../mod/webpages.php:69
+#: ../../mod/profiles.php:188 ../../mod/profiles.php:576
+#: ../../mod/viewsrc.php:14 ../../mod/mitem.php:115
+#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
+#: ../../mod/editblock.php:65 ../../mod/register.php:72 ../../mod/item.php:206
+#: ../../mod/item.php:214 ../../mod/item.php:962 ../../mod/blocks.php:69
+#: ../../mod/blocks.php:76 ../../mod/id.php:71 ../../mod/message.php:16
+#: ../../mod/layouts.php:69 ../../mod/layouts.php:76 ../../mod/layouts.php:87
+#: ../../mod/mood.php:111 ../../mod/connedit.php:331 ../../mod/mail.php:114
+#: ../../mod/notifications.php:66 ../../mod/regmod.php:17
+#: ../../mod/new_channel.php:68 ../../mod/new_channel.php:99
+#: ../../mod/appman.php:66 ../../mod/network.php:12 ../../mod/page.php:28
+#: ../../mod/page.php:79 ../../mod/bookmarks.php:46 ../../mod/channel.php:100
+#: ../../mod/channel.php:219 ../../mod/channel.php:262
+#: ../../mod/suggest.php:26 ../../mod/service_limits.php:7
+#: ../../mod/sharedwithme.php:7 ../../index.php:190 ../../index.php:393
+msgid "Permission denied."
 msgstr ""
 
-#: ../../include/nav.php:87 ../../include/nav.php:120 ../../boot.php:1539
-msgid "Logout"
+#: ../../include/items.php:4524 ../../mod/group.php:38 ../../mod/group.php:140
+#: ../../mod/bulksetclose.php:51
+msgid "Collection not found."
 msgstr ""
 
-#: ../../include/nav.php:87 ../../include/nav.php:120
-msgid "End this session"
+#: ../../include/items.php:4540
+msgid "Collection is empty."
 msgstr ""
 
-#: ../../include/nav.php:90 ../../include/nav.php:151
-msgid "Home"
+#: ../../include/items.php:4547
+#, php-format
+msgid "Collection: %s"
 msgstr ""
 
-#: ../../include/nav.php:90
-msgid "Your posts and conversations"
+#: ../../include/items.php:4557
+#, php-format
+msgid "Connection: %s"
 msgstr ""
 
-#: ../../include/nav.php:91
-msgid "Your profile page"
+#: ../../include/items.php:4559
+msgid "Connection not found."
 msgstr ""
 
-#: ../../include/nav.php:93
-msgid "Edit Profiles"
+#: ../../include/permissions.php:26
+msgid "Can view my normal stream and posts"
 msgstr ""
 
-#: ../../include/nav.php:93
-msgid "Manage/Edit profiles"
+#: ../../include/permissions.php:27
+msgid "Can view my default channel profile"
 msgstr ""
 
-#: ../../include/nav.php:95 ../../include/identity.php:846
-msgid "Edit Profile"
+#: ../../include/permissions.php:28
+msgid "Can view my photo albums"
 msgstr ""
 
-#: ../../include/nav.php:95
-msgid "Edit your profile"
+#: ../../include/permissions.php:29
+msgid "Can view my connections"
 msgstr ""
 
-#: ../../include/nav.php:97
-msgid "Your photos"
+#: ../../include/permissions.php:30
+msgid "Can view my file storage"
 msgstr ""
 
-#: ../../include/nav.php:98
-msgid "Your files"
+#: ../../include/permissions.php:31
+msgid "Can view my webpages"
 msgstr ""
 
-#: ../../include/nav.php:103 ../../include/apps.php:146
-msgid "Chat"
+#: ../../include/permissions.php:34
+msgid "Can send me their channel stream and posts"
 msgstr ""
 
-#: ../../include/nav.php:103
-msgid "Your chatrooms"
+#: ../../include/permissions.php:35
+msgid "Can post on my channel page (\"wall\")"
 msgstr ""
 
-#: ../../include/nav.php:109
-msgid "Your bookmarks"
+#: ../../include/permissions.php:36
+msgid "Can comment on or like my posts"
 msgstr ""
 
-#: ../../include/nav.php:113
-msgid "Your webpages"
+#: ../../include/permissions.php:37
+msgid "Can send me private mail messages"
 msgstr ""
 
-#: ../../include/nav.php:117 ../../include/apps.php:131 ../../boot.php:1540
-msgid "Login"
+#: ../../include/permissions.php:38
+msgid "Can post photos to my photo albums"
 msgstr ""
 
-#: ../../include/nav.php:117
-msgid "Sign in"
+#: ../../include/permissions.php:39
+msgid "Can like/dislike stuff"
 msgstr ""
 
-#: ../../include/nav.php:134
-#, php-format
-msgid "%s - click to logout"
+#: ../../include/permissions.php:39
+msgid "Profiles and things other than posts/comments"
 msgstr ""
 
-#: ../../include/nav.php:137
-msgid "Remote authentication"
+#: ../../include/permissions.php:41
+msgid "Can forward to all my channel contacts via post @mentions"
 msgstr ""
 
-#: ../../include/nav.php:137
-msgid "Click to authenticate to your home hub"
+#: ../../include/permissions.php:41
+msgid "Advanced - useful for creating group forum channels"
 msgstr ""
 
-#: ../../include/nav.php:151
-msgid "Home Page"
+#: ../../include/permissions.php:42
+msgid "Can chat with me (when available)"
 msgstr ""
 
-#: ../../include/nav.php:155 ../../mod/register.php:224 ../../boot.php:1516
-msgid "Register"
+#: ../../include/permissions.php:43
+msgid "Can write to my file storage"
 msgstr ""
 
-#: ../../include/nav.php:155
-msgid "Create an account"
+#: ../../include/permissions.php:44
+msgid "Can edit my webpages"
 msgstr ""
 
-#: ../../include/nav.php:160 ../../include/apps.php:142 ../../mod/help.php:67
-#: ../../mod/help.php:72
-msgid "Help"
+#: ../../include/permissions.php:46
+msgid "Can source my public posts in derived channels"
 msgstr ""
 
-#: ../../include/nav.php:160
-msgid "Help and documentation"
+#: ../../include/permissions.php:46
+msgid "Somewhat advanced - very useful in open communities"
 msgstr ""
 
-#: ../../include/nav.php:163
-msgid "Applications, utilities, links, games"
+#: ../../include/permissions.php:48
+msgid "Can administer my channel resources"
 msgstr ""
 
-#: ../../include/nav.php:165
-msgid "Search site content"
+#: ../../include/permissions.php:48
+msgid "Extremely advanced. Leave this alone unless you know what you are doing"
 msgstr ""
 
-#: ../../include/nav.php:168 ../../include/apps.php:141
-#: ../../mod/directory.php:362
-msgid "Directory"
+#: ../../include/permissions.php:809
+msgid "Social Networking"
 msgstr ""
 
-#: ../../include/nav.php:168
-msgid "Channel Directory"
+#: ../../include/permissions.php:809 ../../include/permissions.php:810
+#: ../../include/permissions.php:811
+msgid "Mostly Public"
 msgstr ""
 
-#: ../../include/nav.php:180 ../../include/apps.php:133
-msgid "Matrix"
+#: ../../include/permissions.php:809 ../../include/permissions.php:810
+#: ../../include/permissions.php:811
+msgid "Restricted"
 msgstr ""
 
-#: ../../include/nav.php:180
-msgid "Your matrix"
+#: ../../include/permissions.php:809 ../../include/permissions.php:810
+msgid "Private"
 msgstr ""
 
-#: ../../include/nav.php:181
-msgid "Mark all matrix notifications seen"
+#: ../../include/permissions.php:810
+msgid "Community Forum"
 msgstr ""
 
-#: ../../include/nav.php:183 ../../include/apps.php:137
-msgid "Channel Home"
+#: ../../include/permissions.php:811
+msgid "Feed Republish"
 msgstr ""
 
-#: ../../include/nav.php:183
-msgid "Channel home"
+#: ../../include/permissions.php:812
+msgid "Special Purpose"
 msgstr ""
 
-#: ../../include/nav.php:184
-msgid "Mark all channel notifications seen"
+#: ../../include/permissions.php:812
+msgid "Celebrity/Soapbox"
 msgstr ""
 
-#: ../../include/nav.php:187 ../../mod/connections.php:407
-msgid "Connections"
+#: ../../include/permissions.php:812
+msgid "Group Repository"
 msgstr ""
 
-#: ../../include/nav.php:190
-msgid "Notices"
+#: ../../include/permissions.php:813 ../../include/profile_selectors.php:6
+#: ../../include/profile_selectors.php:23
+#: ../../include/profile_selectors.php:61
+#: ../../include/profile_selectors.php:97
+msgid "Other"
 msgstr ""
 
-#: ../../include/nav.php:190
-msgid "Notifications"
+#: ../../include/permissions.php:813
+msgid "Custom/Expert Mode"
 msgstr ""
 
-#: ../../include/nav.php:191
-msgid "See all notifications"
+#: ../../include/conversation.php:126 ../../mod/like.php:113
+msgid "channel"
 msgstr ""
 
-#: ../../include/nav.php:192 ../../mod/notifications.php:99
-msgid "Mark all system notifications seen"
+#: ../../include/conversation.php:164 ../../include/diaspora.php:2110
+#: ../../mod/like.php:394
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../include/nav.php:194 ../../include/apps.php:143
-msgid "Mail"
+#: ../../include/conversation.php:167 ../../mod/like.php:396
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: ../../include/nav.php:194
-msgid "Private mail"
+#: ../../include/conversation.php:204
+#, php-format
+msgid "%1$s is now connected with %2$s"
 msgstr ""
 
-#: ../../include/nav.php:195
-msgid "See all private messages"
+#: ../../include/conversation.php:239
+#, php-format
+msgid "%1$s poked %2$s"
 msgstr ""
 
-#: ../../include/nav.php:196
-msgid "Mark all private messages seen"
+#: ../../include/conversation.php:260 ../../mod/mood.php:63
+#, php-format
+msgctxt "mood"
+msgid "%1$s is %2$s"
 msgstr ""
 
-#: ../../include/nav.php:197
-msgid "Inbox"
+#: ../../include/conversation.php:572 ../../mod/photos.php:984
+msgctxt "title"
+msgid "Likes"
 msgstr ""
 
-#: ../../include/nav.php:198
-msgid "Outbox"
+#: ../../include/conversation.php:572 ../../mod/photos.php:984
+msgctxt "title"
+msgid "Dislikes"
 msgstr ""
 
-#: ../../include/nav.php:202 ../../include/apps.php:140
-#: ../../mod/events.php:472
-msgid "Events"
+#: ../../include/conversation.php:573 ../../mod/photos.php:985
+msgctxt "title"
+msgid "Agree"
 msgstr ""
 
-#: ../../include/nav.php:202
-msgid "Event Calendar"
+#: ../../include/conversation.php:573 ../../mod/photos.php:985
+msgctxt "title"
+msgid "Disagree"
 msgstr ""
 
-#: ../../include/nav.php:203
-msgid "See all events"
+#: ../../include/conversation.php:573 ../../mod/photos.php:985
+msgctxt "title"
+msgid "Abstain"
 msgstr ""
 
-#: ../../include/nav.php:204
-msgid "Mark all events seen"
+#: ../../include/conversation.php:574 ../../mod/photos.php:986
+msgctxt "title"
+msgid "Attending"
 msgstr ""
 
-#: ../../include/nav.php:206 ../../include/apps.php:132
-#: ../../mod/manage.php:164
-msgid "Channel Manager"
+#: ../../include/conversation.php:574 ../../mod/photos.php:986
+msgctxt "title"
+msgid "Not attending"
 msgstr ""
 
-#: ../../include/nav.php:206
-msgid "Manage Your Channels"
+#: ../../include/conversation.php:574 ../../mod/photos.php:986
+msgctxt "title"
+msgid "Might attend"
 msgstr ""
 
-#: ../../include/nav.php:208
-msgid "Account/Channel Settings"
+#: ../../include/conversation.php:692
+#, php-format
+msgid "View %s's profile @ %s"
 msgstr ""
 
-#: ../../include/nav.php:216 ../../mod/admin.php:120
-msgid "Admin"
+#: ../../include/conversation.php:707
+msgid "Categories:"
 msgstr ""
 
-#: ../../include/nav.php:216
-msgid "Site Setup and Configuration"
+#: ../../include/conversation.php:708
+msgid "Filed under:"
 msgstr ""
 
-#: ../../include/nav.php:252
-msgid "@name, #tag, content"
+#: ../../include/conversation.php:735
+msgid "View in context"
 msgstr ""
 
-#: ../../include/nav.php:253
-msgid "Please wait..."
+#: ../../include/conversation.php:846
+msgid "remove"
 msgstr ""
 
-#: ../../include/taxonomy.php:222 ../../include/taxonomy.php:243
-msgid "Tags"
+#: ../../include/conversation.php:851
+msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/taxonomy.php:287
-msgid "Keywords"
+#: ../../include/conversation.php:939
+msgid "View Source"
 msgstr ""
 
-#: ../../include/taxonomy.php:308
-msgid "have"
+#: ../../include/conversation.php:940
+msgid "Follow Thread"
 msgstr ""
 
-#: ../../include/taxonomy.php:308
-msgid "has"
+#: ../../include/conversation.php:941
+msgid "View Status"
 msgstr ""
 
-#: ../../include/taxonomy.php:309
-msgid "want"
+#: ../../include/conversation.php:943
+msgid "View Photos"
 msgstr ""
 
-#: ../../include/taxonomy.php:309
-msgid "wants"
+#: ../../include/conversation.php:944
+msgid "Matrix Activity"
 msgstr ""
 
-#: ../../include/taxonomy.php:310
-msgid "likes"
+#: ../../include/conversation.php:946
+msgid "Edit Contact"
 msgstr ""
 
-#: ../../include/taxonomy.php:311
-msgid "dislikes"
+#: ../../include/conversation.php:947
+msgid "Send PM"
 msgstr ""
 
-#: ../../include/activities.php:39
-msgid " and "
+#: ../../include/conversation.php:948 ../../include/apps.php:145
+msgid "Poke"
 msgstr ""
 
-#: ../../include/activities.php:47
-msgid "public profile"
+#: ../../include/conversation.php:1062
+#, php-format
+msgid "%s likes this."
 msgstr ""
 
-#: ../../include/activities.php:56
+#: ../../include/conversation.php:1062
 #, php-format
-msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/activities.php:57
+#: ../../include/conversation.php:1066
 #, php-format
-msgid "Visit %1$s's %2$s"
+msgid "<span  %1$s>%2$d people</span> like this."
+msgid_plural "<span  %1$s>%2$d people</span> like this."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1068
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this."
+msgid_plural "<span  %1$s>%2$d people</span> don't like this."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1074
+msgid "and"
 msgstr ""
 
-#: ../../include/activities.php:60
+#: ../../include/conversation.php:1077
 #, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1078
+#, php-format
+msgid "%s like this."
 msgstr ""
 
-#: ../../include/bbcode.php:122 ../../include/bbcode.php:735
-#: ../../include/bbcode.php:738 ../../include/bbcode.php:743
-#: ../../include/bbcode.php:746 ../../include/bbcode.php:749
-#: ../../include/bbcode.php:752 ../../include/bbcode.php:757
-#: ../../include/bbcode.php:760 ../../include/bbcode.php:765
-#: ../../include/bbcode.php:768 ../../include/bbcode.php:771
-#: ../../include/bbcode.php:774
-msgid "Image/photo"
+#: ../../include/conversation.php:1078
+#, php-format
+msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/bbcode.php:161 ../../include/bbcode.php:785
-msgid "Encrypted content"
+#: ../../include/conversation.php:1138
+msgid "Visible to <strong>everybody</strong>"
 msgstr ""
 
-#: ../../include/bbcode.php:177
-msgid "Install design element: "
+#: ../../include/conversation.php:1139 ../../mod/mail.php:174
+#: ../../mod/mail.php:289
+msgid "Please enter a link URL:"
 msgstr ""
 
-#: ../../include/bbcode.php:190
-msgid "QR code"
+#: ../../include/conversation.php:1140
+msgid "Please enter a video link/URL:"
 msgstr ""
 
-#: ../../include/bbcode.php:241
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
+#: ../../include/conversation.php:1141
+msgid "Please enter an audio link/URL:"
 msgstr ""
 
-#: ../../include/bbcode.php:243
-msgid "post"
+#: ../../include/conversation.php:1142
+msgid "Tag term:"
 msgstr ""
 
-#: ../../include/bbcode.php:485
-msgid "Different viewers will see this text differently"
+#: ../../include/conversation.php:1143 ../../mod/filer.php:49
+msgid "Save to Folder:"
 msgstr ""
 
-#: ../../include/bbcode.php:696
-msgid "$1 spoiler"
+#: ../../include/conversation.php:1144
+msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/bbcode.php:723
-msgid "$1 wrote:"
+#: ../../include/conversation.php:1145 ../../mod/editpost.php:52
+#: ../../mod/mail.php:175 ../../mod/mail.php:290
+msgid "Expires YYYY-MM-DD HH:MM"
 msgstr ""
 
-#: ../../include/items.php:399 ../../mod/like.php:270
-#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/profperm.php:23
-#: ../../mod/bulksetclose.php:11 ../../index.php:392
-msgid "Permission denied"
+#: ../../include/conversation.php:1172 ../../mod/photos.php:949
+#: ../../mod/editlayout.php:197 ../../mod/webpages.php:180
+#: ../../mod/blocks.php:149 ../../mod/layouts.php:175
+msgid "Share"
 msgstr ""
 
-#: ../../include/items.php:1012 ../../include/items.php:1058
-msgid "(Unknown)"
+#: ../../include/conversation.php:1174
+msgid "Page link name"
 msgstr ""
 
-#: ../../include/items.php:1226
-msgid "Visible to anybody on the internet."
+#: ../../include/conversation.php:1177
+msgid "Post as"
 msgstr ""
 
-#: ../../include/items.php:1228
-msgid "Visible to you only."
+#: ../../include/conversation.php:1184 ../../mod/editlayout.php:145
+#: ../../mod/editwebpage.php:184 ../../mod/editpost.php:119
+#: ../../mod/editblock.php:147 ../../mod/mail.php:238 ../../mod/mail.php:352
+msgid "Upload photo"
 msgstr ""
 
-#: ../../include/items.php:1230
-msgid "Visible to anybody in this network."
+#: ../../include/conversation.php:1185
+msgid "upload photo"
 msgstr ""
 
-#: ../../include/items.php:1232
-msgid "Visible to anybody authenticated."
+#: ../../include/conversation.php:1186 ../../mod/editlayout.php:146
+#: ../../mod/editwebpage.php:185 ../../mod/editpost.php:120
+#: ../../mod/editblock.php:148 ../../mod/mail.php:239 ../../mod/mail.php:353
+msgid "Attach file"
 msgstr ""
 
-#: ../../include/items.php:1234
-#, php-format
-msgid "Visible to anybody on %s."
+#: ../../include/conversation.php:1187
+msgid "attach file"
 msgstr ""
 
-#: ../../include/items.php:1236
-msgid "Visible to all connections."
+#: ../../include/conversation.php:1188 ../../mod/editlayout.php:147
+#: ../../mod/editwebpage.php:186 ../../mod/editpost.php:121
+#: ../../mod/editblock.php:149 ../../mod/mail.php:240 ../../mod/mail.php:354
+msgid "Insert web link"
 msgstr ""
 
-#: ../../include/items.php:1238
-msgid "Visible to approved connections."
+#: ../../include/conversation.php:1189
+msgid "web link"
 msgstr ""
 
-#: ../../include/items.php:1240
-msgid "Visible to specific connections."
+#: ../../include/conversation.php:1190
+msgid "Insert video link"
 msgstr ""
 
-#: ../../include/items.php:4051 ../../mod/thing.php:74
-#: ../../mod/display.php:36 ../../mod/filestorage.php:27
-#: ../../mod/viewsrc.php:20 ../../mod/admin.php:167 ../../mod/admin.php:984
-#: ../../mod/admin.php:1184
-msgid "Item not found."
+#: ../../include/conversation.php:1191
+msgid "video link"
 msgstr ""
 
-#: ../../include/items.php:4124 ../../include/photos.php:26
-#: ../../include/attach.php:136 ../../include/attach.php:183
-#: ../../include/attach.php:246 ../../include/attach.php:260
-#: ../../include/attach.php:304 ../../include/attach.php:318
-#: ../../include/attach.php:343 ../../include/attach.php:539
-#: ../../include/attach.php:611 ../../include/chat.php:131
-#: ../../mod/profile.php:64 ../../mod/profile.php:72
-#: ../../mod/achievements.php:30 ../../mod/manage.php:6
-#: ../../mod/settings.php:564 ../../mod/api.php:26 ../../mod/api.php:31
-#: ../../mod/blocks.php:69 ../../mod/blocks.php:77 ../../mod/thing.php:241
-#: ../../mod/thing.php:256 ../../mod/thing.php:290
-#: ../../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/group.php:9 ../../mod/setup.php:207
-#: ../../mod/common.php:35 ../../mod/connections.php:169
-#: ../../mod/photos.php:68 ../../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/editpost.php:13 ../../mod/invite.php:13
-#: ../../mod/invite.php:104 ../../mod/locs.php:77 ../../mod/sources.php:66
-#: ../../mod/menu.php:69 ../../mod/filestorage.php:18
-#: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88
-#: ../../mod/filestorage.php:115 ../../mod/fsuggest.php:78
-#: ../../mod/poke.php:128 ../../mod/profiles.php:188
-#: ../../mod/profiles.php:576 ../../mod/viewsrc.php:14
-#: ../../mod/webpages.php:69 ../../mod/viewconnections.php:22
-#: ../../mod/viewconnections.php:27 ../../mod/editblock.php:65
-#: ../../mod/register.php:72 ../../mod/item.php:206 ../../mod/item.php:214
-#: ../../mod/item.php:962 ../../mod/layouts.php:69 ../../mod/layouts.php:76
-#: ../../mod/layouts.php:87 ../../mod/id.php:71 ../../mod/message.php:16
-#: ../../mod/mitem.php:106 ../../mod/mood.php:111 ../../mod/connedit.php:331
-#: ../../mod/mail.php:114 ../../mod/notifications.php:66
-#: ../../mod/regmod.php:17 ../../mod/new_channel.php:68
-#: ../../mod/new_channel.php:99 ../../mod/appman.php:66
-#: ../../mod/network.php:12 ../../mod/page.php:28 ../../mod/page.php:79
-#: ../../mod/bookmarks.php:46 ../../mod/channel.php:100
-#: ../../mod/channel.php:219 ../../mod/channel.php:262
-#: ../../mod/suggest.php:26 ../../mod/service_limits.php:7
-#: ../../mod/sharedwithme.php:7 ../../index.php:190 ../../index.php:393
-msgid "Permission denied."
+#: ../../include/conversation.php:1192
+msgid "Insert audio link"
 msgstr ""
 
-#: ../../include/items.php:4518 ../../mod/group.php:38 ../../mod/group.php:140
-#: ../../mod/bulksetclose.php:51
-msgid "Collection not found."
+#: ../../include/conversation.php:1193
+msgid "audio link"
 msgstr ""
 
-#: ../../include/items.php:4534
-msgid "Collection is empty."
+#: ../../include/conversation.php:1194 ../../mod/editlayout.php:151
+#: ../../mod/editwebpage.php:190 ../../mod/editpost.php:125
+#: ../../mod/editblock.php:153
+msgid "Set your location"
 msgstr ""
 
-#: ../../include/items.php:4541
-#, php-format
-msgid "Collection: %s"
+#: ../../include/conversation.php:1195
+msgid "set location"
 msgstr ""
 
-#: ../../include/items.php:4551
-#, php-format
-msgid "Connection: %s"
+#: ../../include/conversation.php:1196 ../../mod/editpost.php:127
+msgid "Toggle voting"
 msgstr ""
 
-#: ../../include/items.php:4553
-msgid "Connection not found."
+#: ../../include/conversation.php:1199 ../../mod/editlayout.php:152
+#: ../../mod/editwebpage.php:191 ../../mod/editpost.php:126
+#: ../../mod/editblock.php:154
+msgid "Clear browser location"
 msgstr ""
 
-#: ../../include/permissions.php:26
-msgid "Can view my normal stream and posts"
+#: ../../include/conversation.php:1200
+msgid "clear location"
 msgstr ""
 
-#: ../../include/permissions.php:27
-msgid "Can view my default channel profile"
+#: ../../include/conversation.php:1202 ../../mod/editlayout.php:164
+#: ../../mod/editwebpage.php:207 ../../mod/editpost.php:141
+#: ../../mod/editblock.php:167
+msgid "Title (optional)"
 msgstr ""
 
-#: ../../include/permissions.php:28
-msgid "Can view my photo albums"
+#: ../../include/conversation.php:1205 ../../mod/editlayout.php:167
+#: ../../mod/editwebpage.php:209 ../../mod/editpost.php:143
+#: ../../mod/editblock.php:170
+msgid "Categories (optional, comma-separated list)"
 msgstr ""
 
-#: ../../include/permissions.php:29
-msgid "Can view my connections"
+#: ../../include/conversation.php:1207 ../../mod/editlayout.php:154
+#: ../../mod/editwebpage.php:193 ../../mod/editpost.php:131
+#: ../../mod/editblock.php:156
+msgid "Permission settings"
 msgstr ""
 
-#: ../../include/permissions.php:30
-msgid "Can view my file storage"
+#: ../../include/conversation.php:1208
+msgid "permissions"
 msgstr ""
 
-#: ../../include/permissions.php:31
-msgid "Can view my webpages"
+#: ../../include/conversation.php:1216 ../../mod/editlayout.php:161
+#: ../../mod/editwebpage.php:202 ../../mod/editpost.php:138
+#: ../../mod/editblock.php:164
+msgid "Public post"
 msgstr ""
 
-#: ../../include/permissions.php:34
-msgid "Can send me their channel stream and posts"
+#: ../../include/conversation.php:1218 ../../mod/editlayout.php:168
+#: ../../mod/editwebpage.php:210 ../../mod/editpost.php:144
+#: ../../mod/editblock.php:171
+msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
-#: ../../include/permissions.php:35
-msgid "Can post on my channel page (\"wall\")"
+#: ../../include/conversation.php:1231 ../../mod/editlayout.php:177
+#: ../../mod/editwebpage.php:219 ../../mod/editpost.php:155
+#: ../../mod/editblock.php:181 ../../mod/mail.php:245 ../../mod/mail.php:359
+msgid "Set expiration date"
 msgstr ""
 
-#: ../../include/permissions.php:36
-msgid "Can comment on or like my posts"
+#: ../../include/conversation.php:1235 ../../mod/events.php:637
+#: ../../mod/editpost.php:159
+msgid "OK"
 msgstr ""
 
-#: ../../include/permissions.php:37
-msgid "Can send me private mail messages"
+#: ../../include/conversation.php:1236 ../../mod/settings.php:583
+#: ../../mod/settings.php:609 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
+#: ../../mod/events.php:636 ../../mod/fbrowser.php:82
+#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:160
+msgid "Cancel"
 msgstr ""
 
-#: ../../include/permissions.php:38
-msgid "Can post photos to my photo albums"
+#: ../../include/conversation.php:1478
+msgid "Discover"
 msgstr ""
 
-#: ../../include/permissions.php:39
-msgid "Can like/dislike stuff"
+#: ../../include/conversation.php:1481
+msgid "Imported public streams"
 msgstr ""
 
-#: ../../include/permissions.php:39
-msgid "Profiles and things other than posts/comments"
+#: ../../include/conversation.php:1486
+msgid "Commented Order"
 msgstr ""
 
-#: ../../include/permissions.php:41
-msgid "Can forward to all my channel contacts via post @mentions"
+#: ../../include/conversation.php:1489
+msgid "Sort by Comment Date"
 msgstr ""
 
-#: ../../include/permissions.php:41
-msgid "Advanced - useful for creating group forum channels"
+#: ../../include/conversation.php:1493
+msgid "Posted Order"
 msgstr ""
 
-#: ../../include/permissions.php:42
-msgid "Can chat with me (when available)"
+#: ../../include/conversation.php:1496
+msgid "Sort by Post Date"
 msgstr ""
 
-#: ../../include/permissions.php:43
-msgid "Can write to my file storage"
+#: ../../include/conversation.php:1504
+msgid "Posts that mention or involve you"
 msgstr ""
 
-#: ../../include/permissions.php:44
-msgid "Can edit my webpages"
+#: ../../include/conversation.php:1510 ../../mod/connections.php:212
+#: ../../mod/connections.php:225 ../../mod/menu.php:102
+msgid "New"
 msgstr ""
 
-#: ../../include/permissions.php:46
-msgid "Can source my public posts in derived channels"
+#: ../../include/conversation.php:1513
+msgid "Activity Stream - by date"
 msgstr ""
 
-#: ../../include/permissions.php:46
-msgid "Somewhat advanced - very useful in open communities"
+#: ../../include/conversation.php:1519
+msgid "Starred"
 msgstr ""
 
-#: ../../include/permissions.php:48
-msgid "Can administer my channel resources"
+#: ../../include/conversation.php:1522
+msgid "Favourite Posts"
 msgstr ""
 
-#: ../../include/permissions.php:48
-msgid "Extremely advanced. Leave this alone unless you know what you are doing"
+#: ../../include/conversation.php:1529
+msgid "Spam"
 msgstr ""
 
-#: ../../include/permissions.php:809
-msgid "Social Networking"
+#: ../../include/conversation.php:1532
+msgid "Posts flagged as SPAM"
 msgstr ""
 
-#: ../../include/permissions.php:809 ../../include/permissions.php:810
-#: ../../include/permissions.php:811
-msgid "Mostly Public"
+#: ../../include/conversation.php:1576 ../../mod/admin.php:952
+msgid "Channel"
 msgstr ""
 
-#: ../../include/permissions.php:809 ../../include/permissions.php:810
-#: ../../include/permissions.php:811
-msgid "Restricted"
+#: ../../include/conversation.php:1579
+msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../include/permissions.php:809 ../../include/permissions.php:810
-msgid "Private"
+#: ../../include/conversation.php:1588
+msgid "About"
 msgstr ""
 
-#: ../../include/permissions.php:810
-msgid "Community Forum"
+#: ../../include/conversation.php:1591
+msgid "Profile Details"
 msgstr ""
 
-#: ../../include/permissions.php:811
-msgid "Feed Republish"
+#: ../../include/conversation.php:1600 ../../include/photos.php:359
+msgid "Photo Albums"
 msgstr ""
 
-#: ../../include/permissions.php:812
-msgid "Special Purpose"
+#: ../../include/conversation.php:1609
+msgid "Files and Storage"
 msgstr ""
 
-#: ../../include/permissions.php:812
-msgid "Celebrity/Soapbox"
+#: ../../include/conversation.php:1619 ../../include/conversation.php:1622
+msgid "Chatrooms"
 msgstr ""
 
-#: ../../include/permissions.php:812
-msgid "Group Repository"
+#: ../../include/conversation.php:1635
+msgid "Saved Bookmarks"
 msgstr ""
 
-#: ../../include/permissions.php:813 ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23
-#: ../../include/profile_selectors.php:61
-#: ../../include/profile_selectors.php:97
-msgid "Other"
+#: ../../include/conversation.php:1645
+msgid "Manage Webpages"
 msgstr ""
 
-#: ../../include/permissions.php:813
-msgid "Custom/Expert Mode"
-msgstr ""
+#: ../../include/conversation.php:1704
+msgctxt "noun"
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1707
+msgctxt "noun"
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1710
+msgctxt "noun"
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1713
+msgctxt "noun"
+msgid "Agree"
+msgid_plural "Agrees"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1716
+msgctxt "noun"
+msgid "Disagree"
+msgid_plural "Disagrees"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/api.php:1095
-msgid "Public Timeline"
-msgstr ""
+#: ../../include/conversation.php:1719
+msgctxt "noun"
+msgid "Abstain"
+msgid_plural "Abstains"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../../include/photos.php:94
 #, php-format
@@ -3133,11 +3146,6 @@ msgstr ""
 msgid "Embedding disabled"
 msgstr ""
 
-#: ../../include/comanche.php:34 ../../mod/admin.php:386
-#: ../../view/theme/apw/php/config.php:185
-msgid "Default"
-msgstr ""
-
 #: ../../include/auth.php:131
 msgid "Logged out."
 msgstr ""
@@ -3178,11 +3186,11 @@ msgid "Examples: Robert Morgenstein, Fishing"
 msgstr ""
 
 #: ../../include/contact_widgets.php:26 ../../mod/connections.php:413
-#: ../../mod/directory.php:358 ../../mod/directory.php:363
+#: ../../mod/directory.php:362 ../../mod/directory.php:367
 msgid "Find"
 msgstr ""
 
-#: ../../include/contact_widgets.php:27 ../../mod/directory.php:362
+#: ../../include/contact_widgets.php:27 ../../mod/directory.php:366
 #: ../../mod/suggest.php:60
 msgid "Channel Suggestions"
 msgstr ""
@@ -3328,11 +3336,11 @@ msgid "Requested channel is not available."
 msgstr ""
 
 #: ../../include/identity.php:677 ../../mod/profile.php:16
-#: ../../mod/achievements.php:11 ../../mod/blocks.php:29
-#: ../../mod/connect.php:13 ../../mod/hcard.php:8 ../../mod/editlayout.php:28
+#: ../../mod/achievements.php:11 ../../mod/connect.php:13
+#: ../../mod/hcard.php:8 ../../mod/editlayout.php:28
 #: ../../mod/editwebpage.php:28 ../../mod/filestorage.php:54
 #: ../../mod/webpages.php:29 ../../mod/editblock.php:29
-#: ../../mod/layouts.php:29
+#: ../../mod/blocks.php:29 ../../mod/layouts.php:29
 msgid "Requested profile is not available."
 msgstr ""
 
@@ -3852,33 +3860,33 @@ msgstr ""
 msgid "Create a new channel"
 msgstr ""
 
-#: ../../mod/manage.php:165
+#: ../../mod/manage.php:167
 msgid "Current Channel"
 msgstr ""
 
-#: ../../mod/manage.php:167
+#: ../../mod/manage.php:169
 msgid "Switch to one of your channels by selecting it."
 msgstr ""
 
-#: ../../mod/manage.php:168
+#: ../../mod/manage.php:170
 msgid "Default Channel"
 msgstr ""
 
-#: ../../mod/manage.php:169
+#: ../../mod/manage.php:171
 msgid "Make Default"
 msgstr ""
 
-#: ../../mod/manage.php:172
+#: ../../mod/manage.php:174
 #, php-format
 msgid "%d new messages"
 msgstr ""
 
-#: ../../mod/manage.php:173
+#: ../../mod/manage.php:175
 #, php-format
 msgid "%d new introductions"
 msgstr ""
 
-#: ../../mod/manage.php:175
+#: ../../mod/manage.php:177
 msgid "Delegated Channels"
 msgstr ""
 
@@ -3927,22 +3935,18 @@ msgid "Settings updated."
 msgstr ""
 
 #: ../../mod/settings.php:573 ../../mod/api.php:106 ../../mod/photos.php:556
-#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
-#: ../../mod/admin.php:424 ../../mod/removeme.php:60
-#: ../../view/theme/redbasic/php/config.php:102
+#: ../../mod/menu.php:88 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/admin.php:424
+#: ../../mod/removeme.php:60 ../../view/theme/redbasic/php/config.php:102
 #: ../../view/theme/redbasic/php/config.php:127 ../../boot.php:1544
-#: ../../wppost/wppost.php:80 ../../wppost/wppost.php:96
-#: ../../wppost/wppost.php:100
 msgid "No"
 msgstr ""
 
 #: ../../mod/settings.php:573 ../../mod/api.php:105 ../../mod/photos.php:556
-#: ../../mod/filestorage.php:151 ../../mod/filestorage.php:159
-#: ../../mod/admin.php:426 ../../mod/removeme.php:60
-#: ../../view/theme/redbasic/php/config.php:102
+#: ../../mod/menu.php:88 ../../mod/filestorage.php:151
+#: ../../mod/filestorage.php:159 ../../mod/admin.php:426
+#: ../../mod/removeme.php:60 ../../view/theme/redbasic/php/config.php:102
 #: ../../view/theme/redbasic/php/config.php:127 ../../boot.php:1544
-#: ../../wppost/wppost.php:80 ../../wppost/wppost.php:96
-#: ../../wppost/wppost.php:100
 msgid "Yes"
 msgstr ""
 
@@ -4307,7 +4311,7 @@ msgstr ""
 msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:1072 ../../mod/mitem.php:161 ../../mod/mitem.php:204
+#: ../../mod/settings.php:1072 ../../mod/mitem.php:152 ../../mod/mitem.php:221
 msgid "(click to open/close)"
 msgstr ""
 
@@ -4487,7 +4491,7 @@ msgstr ""
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr ""
 
-#: ../../mod/xchan.php:37 ../../mod/menu.php:147 ../../mod/mitem.php:111
+#: ../../mod/xchan.php:37 ../../mod/menu.php:149 ../../mod/mitem.php:120
 msgid "Not found."
 msgstr ""
 
@@ -4509,10 +4513,6 @@ msgid ""
 "and/or create new posts for you?"
 msgstr ""
 
-#: ../../mod/blocks.php:96
-msgid "Block Name"
-msgstr ""
-
 #: ../../mod/follow.php:25
 msgid "Channel added."
 msgstr ""
@@ -4952,7 +4952,7 @@ msgstr ""
 msgid "View ratings"
 msgstr ""
 
-#: ../../mod/rpost.php:105 ../../mod/editpost.php:42
+#: ../../mod/rpost.php:131 ../../mod/editpost.php:42
 msgid "Edit post"
 msgstr ""
 
@@ -5908,8 +5908,8 @@ msgid "Import existing posts if possible"
 msgstr ""
 
 #: ../../mod/editlayout.php:78 ../../mod/editwebpage.php:77
-#: ../../mod/editpost.php:20 ../../mod/editblock.php:79
-#: ../../mod/editblock.php:95
+#: ../../mod/editpost.php:20 ../../mod/editblock.php:78
+#: ../../mod/editblock.php:94
 msgid "Item not found"
 msgstr ""
 
@@ -5921,22 +5921,22 @@ msgstr ""
 msgid "Delete layout?"
 msgstr ""
 
-#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:185
-#: ../../mod/editpost.php:122 ../../mod/editblock.php:153
+#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:187
+#: ../../mod/editpost.php:122 ../../mod/editblock.php:150
 msgid "Insert YouTube video"
 msgstr ""
 
-#: ../../mod/editlayout.php:149 ../../mod/editwebpage.php:186
-#: ../../mod/editpost.php:123 ../../mod/editblock.php:154
+#: ../../mod/editlayout.php:149 ../../mod/editwebpage.php:188
+#: ../../mod/editpost.php:123 ../../mod/editblock.php:151
 msgid "Insert Vorbis [.ogg] video"
 msgstr ""
 
-#: ../../mod/editlayout.php:150 ../../mod/editwebpage.php:187
-#: ../../mod/editpost.php:124 ../../mod/editblock.php:155
+#: ../../mod/editlayout.php:150 ../../mod/editwebpage.php:189
+#: ../../mod/editpost.php:124 ../../mod/editblock.php:152
 msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../mod/editlayout.php:183
+#: ../../mod/editlayout.php:182
 msgid "Delete Layout"
 msgstr ""
 
@@ -5981,20 +5981,16 @@ msgstr ""
 msgid "%1$s's Chatrooms"
 msgstr ""
 
-#: ../../mod/editwebpage.php:140
-msgid "Edit Webpage"
-msgstr ""
-
-#: ../../mod/editwebpage.php:150
+#: ../../mod/editwebpage.php:152
 msgid "Delete webpage?"
 msgstr ""
 
-#: ../../mod/editwebpage.php:171
+#: ../../mod/editwebpage.php:173
 msgid "Page link title"
 msgstr ""
 
-#: ../../mod/editwebpage.php:222
-msgid "Delete Webpage"
+#: ../../mod/editwebpage.php:224
+msgid "Edit Webpage"
 msgstr ""
 
 #: ../../mod/dirsearch.php:29
@@ -6259,99 +6255,99 @@ msgstr ""
 msgid "Unable to remove source."
 msgstr ""
 
-#: ../../mod/menu.php:40
-msgid "Menu updated."
-msgstr ""
-
 #: ../../mod/menu.php:44
 msgid "Unable to update menu."
 msgstr ""
 
-#: ../../mod/menu.php:49
-msgid "Menu created."
-msgstr ""
-
 #: ../../mod/menu.php:53
 msgid "Unable to create menu."
 msgstr ""
 
-#: ../../mod/menu.php:84
-msgid "Manage Menus"
+#: ../../mod/menu.php:86 ../../mod/menu.php:98
+msgid "Menu Name"
+msgstr ""
+
+#: ../../mod/menu.php:86
+msgid "Unique name (not visible on webpage) - required"
+msgstr ""
+
+#: ../../mod/menu.php:87 ../../mod/menu.php:99
+msgid "Menu Title"
 msgstr ""
 
 #: ../../mod/menu.php:87
-msgid "Drop"
+msgid "Visible on webpage - leave empty for no title"
 msgstr ""
 
-#: ../../mod/menu.php:89
-msgid "Bookmarks allowed"
+#: ../../mod/menu.php:88
+msgid "Allow Bookmarks"
 msgstr ""
 
-#: ../../mod/menu.php:90
-msgid "Create a new menu"
+#: ../../mod/menu.php:88 ../../mod/menu.php:140
+msgid "Menu may be used to store saved bookmarks"
 msgstr ""
 
-#: ../../mod/menu.php:91
-msgid "Delete this menu"
+#: ../../mod/menu.php:89
+msgid "Submit and proceed"
 msgstr ""
 
-#: ../../mod/menu.php:92 ../../mod/menu.php:136
-msgid "Edit menu contents"
+#: ../../mod/menu.php:101
+msgid "Drop"
 msgstr ""
 
-#: ../../mod/menu.php:93
-msgid "Edit this menu"
+#: ../../mod/menu.php:103
+msgid "Bookmarks allowed"
 msgstr ""
 
 #: ../../mod/menu.php:105
-msgid "New Menu"
+msgid "Delete this menu"
 msgstr ""
 
 #: ../../mod/menu.php:106 ../../mod/menu.php:137
-msgid "Menu name"
+msgid "Edit menu contents"
 msgstr ""
 
-#: ../../mod/menu.php:106 ../../mod/menu.php:137
-msgid "Must be unique, only seen by you"
+#: ../../mod/menu.php:107
+msgid "Edit this menu"
 msgstr ""
 
-#: ../../mod/menu.php:107 ../../mod/menu.php:138
-msgid "Menu title"
+#: ../../mod/menu.php:121
+msgid "Menu could not be deleted."
 msgstr ""
 
-#: ../../mod/menu.php:107 ../../mod/menu.php:138
-msgid "Menu title as seen by others"
+#: ../../mod/menu.php:129 ../../mod/mitem.php:24
+msgid "Menu not found."
 msgstr ""
 
-#: ../../mod/menu.php:108 ../../mod/menu.php:139
-msgid "Allow bookmarks"
+#: ../../mod/menu.php:134
+msgid "Edit Menu"
 msgstr ""
 
-#: ../../mod/menu.php:108 ../../mod/menu.php:139
-msgid "Menu may be used to store saved bookmarks"
+#: ../../mod/menu.php:136
+msgid "Add or remove entries to this menu"
 msgstr ""
 
-#: ../../mod/menu.php:119 ../../mod/mitem.php:24
-msgid "Menu not found."
+#: ../../mod/menu.php:138
+msgid "Menu name"
 msgstr ""
 
-#: ../../mod/menu.php:125
-msgid "Menu deleted."
+#: ../../mod/menu.php:138
+msgid "Must be unique, only seen by you"
 msgstr ""
 
-#: ../../mod/menu.php:127
-msgid "Menu could not be deleted."
+#: ../../mod/menu.php:139
+msgid "Menu title"
 msgstr ""
 
-#: ../../mod/menu.php:133
-msgid "Edit Menu"
+#: ../../mod/menu.php:139
+msgid "Menu title as seen by others"
 msgstr ""
 
-#: ../../mod/menu.php:135
-msgid "Add or remove entries to this menu"
+#: ../../mod/menu.php:140
+msgid "Allow bookmarks"
 msgstr ""
 
-#: ../../mod/menu.php:141 ../../mod/mitem.php:213
+#: ../../mod/menu.php:142
 msgid "Modify"
 msgstr ""
 
@@ -6456,12 +6452,8 @@ msgstr ""
 msgid "Visible To"
 msgstr ""
 
-#: ../../mod/lockview.php:31
-msgid "Remote privacy information not available."
-msgstr ""
-
-#: ../../mod/lockview.php:52
-msgid "Visible to:"
+#: ../../mod/webpages.php:189
+msgid "Page Title"
 msgstr ""
 
 #: ../../mod/profiles.php:18 ../../mod/profiles.php:174
@@ -6705,7 +6697,7 @@ msgstr ""
 msgid "This is your default profile."
 msgstr ""
 
-#: ../../mod/profiles.php:728 ../../mod/directory.php:214
+#: ../../mod/profiles.php:728 ../../mod/directory.php:218
 msgid "Age: "
 msgstr ""
 
@@ -6745,8 +6737,112 @@ msgstr ""
 msgid "Source of Item"
 msgstr ""
 
-#: ../../mod/webpages.php:184
-msgid "Page Title"
+#: ../../mod/mitem.php:51
+msgid "Unable to create element."
+msgstr ""
+
+#: ../../mod/mitem.php:74
+msgid "Unable to update menu element."
+msgstr ""
+
+#: ../../mod/mitem.php:89
+msgid "Unable to add menu element."
+msgstr ""
+
+#: ../../mod/mitem.php:151 ../../mod/mitem.php:220
+msgid "Menu Item Permissions"
+msgstr ""
+
+#: ../../mod/mitem.php:154 ../../mod/mitem.php:168
+msgid "Link Name"
+msgstr ""
+
+#: ../../mod/mitem.php:155 ../../mod/mitem.php:169
+msgid "Link Target"
+msgstr ""
+
+#: ../../mod/mitem.php:156 ../../mod/mitem.php:226
+msgid "Use RedMatrix magic-auth if available"
+msgstr ""
+
+#: ../../mod/mitem.php:157 ../../mod/mitem.php:227
+msgid "Open link in new window"
+msgstr ""
+
+#: ../../mod/mitem.php:158 ../../mod/mitem.php:228
+msgid "Order in list"
+msgstr ""
+
+#: ../../mod/mitem.php:158 ../../mod/mitem.php:228
+msgid "Higher numbers will sink to bottom of listing"
+msgstr ""
+
+#: ../../mod/mitem.php:159
+msgid "Submit and finish"
+msgstr ""
+
+#: ../../mod/mitem.php:160
+msgid "Submit and continue"
+msgstr ""
+
+#: ../../mod/mitem.php:166
+msgid "Menu:"
+msgstr ""
+
+#: ../../mod/mitem.php:172
+msgid "Edit menu"
+msgstr ""
+
+#: ../../mod/mitem.php:175
+msgid "Edit element"
+msgstr ""
+
+#: ../../mod/mitem.php:176
+msgid "Drop element"
+msgstr ""
+
+#: ../../mod/mitem.php:177
+msgid "New element"
+msgstr ""
+
+#: ../../mod/mitem.php:178
+msgid "Edit this menu container"
+msgstr ""
+
+#: ../../mod/mitem.php:179
+msgid "Add menu element"
+msgstr ""
+
+#: ../../mod/mitem.php:180
+msgid "Delete this menu item"
+msgstr ""
+
+#: ../../mod/mitem.php:181
+msgid "Edit this menu item"
+msgstr ""
+
+#: ../../mod/mitem.php:198
+msgid "Menu item not found."
+msgstr ""
+
+#: ../../mod/mitem.php:209
+msgid "Menu item deleted."
+msgstr ""
+
+#: ../../mod/mitem.php:211
+msgid "Menu item could not be deleted."
+msgstr ""
+
+#: ../../mod/mitem.php:218
+msgid "Edit Menu Element"
+msgstr ""
+
+#: ../../mod/mitem.php:224
+msgid "Link text"
+msgstr ""
+
+#: ../../mod/mitem.php:225
+msgid "URL of link"
 msgstr ""
 
 #: ../../mod/openid.php:26
@@ -6758,59 +6854,59 @@ msgstr ""
 msgid "Welcome %s. Remote authentication successful."
 msgstr ""
 
-#: ../../mod/directory.php:220
+#: ../../mod/directory.php:224
 #, php-format
 msgid "%d rating"
 msgid_plural "%d ratings"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/directory.php:232
+#: ../../mod/directory.php:236
 msgid "Gender: "
 msgstr ""
 
-#: ../../mod/directory.php:234
+#: ../../mod/directory.php:238
 msgid "Status: "
 msgstr ""
 
-#: ../../mod/directory.php:236
+#: ../../mod/directory.php:240
 msgid "Homepage: "
 msgstr ""
 
-#: ../../mod/directory.php:239
+#: ../../mod/directory.php:243
 msgid "Hometown: "
 msgstr ""
 
-#: ../../mod/directory.php:241
+#: ../../mod/directory.php:245
 msgid "About: "
 msgstr ""
 
-#: ../../mod/directory.php:299
+#: ../../mod/directory.php:303
 msgid "Public Forum:"
 msgstr ""
 
-#: ../../mod/directory.php:302
+#: ../../mod/directory.php:306
 msgid "Keywords: "
 msgstr ""
 
-#: ../../mod/directory.php:307
+#: ../../mod/directory.php:311
 #, php-format
 msgid "Common connections: %s"
 msgstr ""
 
-#: ../../mod/directory.php:359
+#: ../../mod/directory.php:363
 msgid "Finding:"
 msgstr ""
 
-#: ../../mod/directory.php:364
+#: ../../mod/directory.php:368
 msgid "next page"
 msgstr ""
 
-#: ../../mod/directory.php:364
+#: ../../mod/directory.php:368
 msgid "previous page"
 msgstr ""
 
-#: ../../mod/directory.php:381
+#: ../../mod/directory.php:385
 msgid "No entries (some entries may be hidden)."
 msgstr ""
 
@@ -7596,18 +7692,14 @@ msgstr ""
 msgid "Post successful."
 msgstr ""
 
-#: ../../mod/editblock.php:115
+#: ../../mod/editblock.php:112
 msgid "Edit Block"
 msgstr ""
 
-#: ../../mod/editblock.php:125
+#: ../../mod/editblock.php:123
 msgid "Delete block?"
 msgstr ""
 
-#: ../../mod/editblock.php:189
-msgid "Delete Block"
-msgstr ""
-
 #: ../../mod/register.php:44
 msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
 msgstr ""
@@ -7758,12 +7850,16 @@ msgstr ""
 msgid "[Embedded content - reload page to view]"
 msgstr ""
 
-#: ../../mod/layouts.php:111
-msgid "Help with this feature"
+#: ../../mod/lockview.php:37
+msgid "Remote privacy information not available."
 msgstr ""
 
-#: ../../mod/layouts.php:131
-msgid "Layout Name"
+#: ../../mod/lockview.php:58
+msgid "Visible to:"
+msgstr ""
+
+#: ../../mod/blocks.php:95 ../../mod/blocks.php:144
+msgid "Block Name"
 msgstr ""
 
 #: ../../mod/id.php:11
@@ -7846,104 +7942,16 @@ msgstr ""
 msgid "D, d M Y - g:i A"
 msgstr ""
 
-#: ../../mod/mitem.php:67
-msgid "Menu element updated."
-msgstr ""
-
-#: ../../mod/mitem.php:71
-msgid "Unable to update menu element."
-msgstr ""
-
-#: ../../mod/mitem.php:77
-msgid "Menu element added."
-msgstr ""
-
-#: ../../mod/mitem.php:81
-msgid "Unable to add menu element."
-msgstr ""
-
-#: ../../mod/mitem.php:127
-msgid "Manage Menu Elements"
-msgstr ""
-
-#: ../../mod/mitem.php:130
-msgid "Edit menu"
-msgstr ""
-
-#: ../../mod/mitem.php:133
-msgid "Edit element"
-msgstr ""
-
-#: ../../mod/mitem.php:134
-msgid "Drop element"
-msgstr ""
-
-#: ../../mod/mitem.php:135
-msgid "New element"
-msgstr ""
-
-#: ../../mod/mitem.php:136
-msgid "Edit this menu container"
-msgstr ""
-
-#: ../../mod/mitem.php:137
-msgid "Add menu element"
-msgstr ""
-
-#: ../../mod/mitem.php:138
-msgid "Delete this menu item"
-msgstr ""
-
-#: ../../mod/mitem.php:139
-msgid "Edit this menu item"
-msgstr ""
-
-#: ../../mod/mitem.php:158
-msgid "New Menu Element"
-msgstr ""
-
-#: ../../mod/mitem.php:160 ../../mod/mitem.php:203
-msgid "Menu Item Permissions"
-msgstr ""
-
-#: ../../mod/mitem.php:163 ../../mod/mitem.php:207
-msgid "Link text"
-msgstr ""
-
-#: ../../mod/mitem.php:164 ../../mod/mitem.php:208
-msgid "URL of link"
-msgstr ""
-
-#: ../../mod/mitem.php:165 ../../mod/mitem.php:209
-msgid "Use RedMatrix magic-auth if available"
-msgstr ""
-
-#: ../../mod/mitem.php:166 ../../mod/mitem.php:210
-msgid "Open link in new window"
-msgstr ""
-
-#: ../../mod/mitem.php:168 ../../mod/mitem.php:212
-msgid "Order in list"
-msgstr ""
-
-#: ../../mod/mitem.php:168 ../../mod/mitem.php:212
-msgid "Higher numbers will sink to bottom of listing"
-msgstr ""
-
-#: ../../mod/mitem.php:181
-msgid "Menu item not found."
-msgstr ""
-
-#: ../../mod/mitem.php:190
-msgid "Menu item deleted."
+#: ../../mod/layouts.php:111
+msgid "Help with this feature"
 msgstr ""
 
-#: ../../mod/mitem.php:192
-msgid "Menu item could not be deleted."
+#: ../../mod/layouts.php:132
+msgid "Layout Name"
 msgstr ""
 
-#: ../../mod/mitem.php:201
-msgid "Edit Menu Element"
+#: ../../mod/layouts.php:171
+msgid "Comanche page description language help"
 msgstr ""
 
 #: ../../mod/mood.php:131
@@ -8864,22 +8872,6 @@ msgstr ""
 msgid "Set size of followup author photos"
 msgstr ""
 
-#: ../../randpost/randpost.php:96
-msgid "You're welcome."
-msgstr ""
-
-#: ../../randpost/randpost.php:97
-msgid "Ah shucks..."
-msgstr ""
-
-#: ../../randpost/randpost.php:98
-msgid "Don't mention it."
-msgstr ""
-
-#: ../../randpost/randpost.php:99
-msgid "&lt;blush&gt;"
-msgstr ""
-
 #: ../../boot.php:1345
 #, php-format
 msgid "Update %s failed. See error logs."
@@ -8928,39 +8920,3 @@ msgstr ""
 #, php-format
 msgid "[red] Cron tasks not running on %s"
 msgstr ""
-
-#: ../../wppost/wppost.php:43
-msgid "Post to WordPress"
-msgstr ""
-
-#: ../../wppost/wppost.php:80
-msgid "Enable WordPress Post Plugin"
-msgstr ""
-
-#: ../../wppost/wppost.php:84
-msgid "WordPress username"
-msgstr ""
-
-#: ../../wppost/wppost.php:88
-msgid "WordPress password"
-msgstr ""
-
-#: ../../wppost/wppost.php:92
-msgid "WordPress API URL"
-msgstr ""
-
-#: ../../wppost/wppost.php:96
-msgid "Post to WordPress by default"
-msgstr ""
-
-#: ../../wppost/wppost.php:100
-msgid "Forward comments (requires post_to_red plugin)"
-msgstr ""
-
-#: ../../wppost/wppost.php:104
-msgid "WordPress Post Settings"
-msgstr ""
-
-#: ../../wppost/wppost.php:119
-msgid "Wordpress Settings saved."
-msgstr ""
diff --git a/version.inc b/version.inc
index 40d21a68d..1b2e678ec 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-04-23.1011
+2015-04-24.1012
-- 
cgit v1.2.3