minor changes to support forum mode

5 files changed, 2964 insertions, 2968 deletions

diff --git a/include/ItemObject.php b/include/ItemObject.php
index 90c036def..9e694b8ac 100644
--- a/include/ItemObject.php
+++ b/include/ItemObject.php
@@ -64,8 +64,6 @@ class Item extends BaseObject {
 
 	public function get_template_data($alike, $dlike, $thread_level=1) {
 	
-		$t1 = dba_timer();
-
 		$result = array();
 
 		$a        = $this->get_app();
@@ -228,15 +226,12 @@ class Item extends BaseObject {
 		if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
 			$indent .= ' shiny';
 
-		$t2 = dba_timer();
-
 		localize_item($item);
 
-		$t3 = dba_timer();
-
 		$body = prepare_body($item,true);
 
-		$t4 = dba_timer();
+		$comment_count_txt = sprintf( tt('%d comment','%d comments',$total_children),$total_children );
+		$children = $this->get_children();
 
 		$tmp_item = array(
 			'template' => $this->get_template(),
@@ -292,6 +287,8 @@ class Item extends BaseObject {
 			'drop'      => $drop,
 			'multidrop' => ((feature_enabled($conv->get_profile_owner(),'multi_delete')) ? $multidrop : ''),
 // end toolbar buttons
+			'comment_count' => $total_children,
+			'comment_count_txt' => $comment_count_txt,
 			'like_count' => $like_count,
 			'like_list' => $like_list,
 			'like_list_part' => $like_list_part,
@@ -311,15 +308,12 @@ class Item extends BaseObject {
 			'thread_level' => $thread_level
 		);
 
-		$t5 = dba_timer();
-
 		$arr = array('item' => $item, 'output' => $tmp_item);
 		call_hooks('display_item', $arr);
 
 		$result = $arr['output'];
 
 		$result['children'] = array();
-		$children = $this->get_children();
 		$nb_children = count($children);
 		if($nb_children > 0) {
 			foreach($children as $child) {
@@ -328,7 +322,7 @@ class Item extends BaseObject {
 			// Collapse
 			if(($nb_children > 2) || ($thread_level > 1)) {
 				$result['children'][0]['comment_firstcollapsed'] = true;
-				$result['children'][0]['num_comments'] = sprintf( tt('%d comment','%d comments',$total_children),$total_children );
+				$result['children'][0]['num_comments'] = $comment_count_txt;
 				$result['children'][0]['hide_text'] = t('[+] show all');
 				if($thread_level > 1) {
 					$result['children'][$nb_children - 1]['comment_lastcollapsed'] = true;
@@ -350,14 +344,6 @@ class Item extends BaseObject {
 			$result['flatten'] = true;
 			$result['threaded'] = false;
 		}
-		$t6 = dba_timer();
-
-//		profiler($t1,$t2,'t2');
-//		profiler($t2,$t3,'t3');
-//		profiler($t3,$t4,'t4');
-//		profiler($t4,$t5,'t5');
-//		profiler($t5,$t6,'t6');
-//		profiler($t1,$t6,'item total');
 
 		return $result;
 	}
diff --git a/include/conversation.php b/include/conversation.php
index c2258c20a..af8780549 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -853,8 +853,8 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
 		profiler($t3,$t4,'conversation template');
 	}
 
-	if($page_mode === 'preview')
-		logger('preview: ' . $o);
+//	if($page_mode === 'preview')
+//		logger('preview: ' . $o, LOGGER_DATA);
 
 	return $o;
 
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index f83f4f7cf..97840a180 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -43,10 +43,6 @@ function wall_upload_post(&$a) {
 		killme();
 	}
 
-	$m = $ret['body'];
-
-
-
 	if($using_api)
 		return("\n\n" . $ret['body'] . "\n\n");
 	else
diff --git a/util/messages.po b/util/messages.po
index 892817b74..0ebff50f2 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2014-11-07.852\n"
+"Project-Id-Version: 2014-11-14.859\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-07 00:04-0800\n"
+"POT-Creation-Date: 2014-11-14 00:04-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,288 +17,25 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../include/dba/dba_driver.php:50
+#: ../../include/dba/dba_driver.php:132
 #, php-format
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: ../../include/photo/photo_driver.php:680 ../../include/photos.php:51
-#: ../../mod/photos.php:91 ../../mod/photos.php:652
+#: ../../include/photo/photo_driver.php:680 ../../include/photos.php:52
+#: ../../mod/photos.php:91 ../../mod/photos.php:654
 #: ../../mod/profile_photo.php:142 ../../mod/profile_photo.php:301
 #: ../../mod/profile_photo.php:423
 msgid "Profile Photos"
 msgstr ""
 
-#: ../../include/apps.php:126
-msgid "Site Admin"
-msgstr ""
-
-#: ../../include/apps.php:127 ../../include/conversation.php:1572
-#: ../../include/nav.php:117
-msgid "Bookmarks"
-msgstr ""
-
-#: ../../include/apps.php:128
-msgid "Address Book"
-msgstr ""
-
-#: ../../include/apps.php:129 ../../include/nav.php:125 ../../boot.php:1513
-msgid "Login"
-msgstr ""
-
-#: ../../include/apps.php:130 ../../include/nav.php:216
-#: ../../mod/manage.php:148
-msgid "Channel Manager"
-msgstr ""
-
-#: ../../include/apps.php:131 ../../include/nav.php:190
-msgid "Matrix"
-msgstr ""
-
-#: ../../include/apps.php:132 ../../include/widgets.php:548
-#: ../../include/nav.php:218 ../../mod/admin.php:953 ../../mod/admin.php:1158
-msgid "Settings"
-msgstr ""
-
-#: ../../include/apps.php:133 ../../include/conversation.php:1546
-#: ../../include/RedDAV/RedBrowser.php:241 ../../include/nav.php:106
-#: ../../mod/fbrowser.php:114
-msgid "Files"
-msgstr ""
-
-#: ../../include/apps.php:134 ../../include/conversation.php:1583
-#: ../../include/nav.php:121 ../../mod/webpages.php:129
-msgid "Webpages"
-msgstr ""
-
-#: ../../include/apps.php:135 ../../include/nav.php:193
-msgid "Channel Home"
-msgstr ""
-
-#: ../../include/apps.php:136 ../../include/identity.php:1120
-#: ../../include/identity.php:1238 ../../mod/profperm.php:112
-msgid "Profile"
-msgstr ""
-
-#: ../../include/apps.php:137 ../../include/conversation.php:1537
-#: ../../include/nav.php:105 ../../mod/fbrowser.php:25
-msgid "Photos"
-msgstr ""
-
-#: ../../include/apps.php:138 ../../include/nav.php:212
-#: ../../mod/events.php:431
-msgid "Events"
-msgstr ""
-
-#: ../../include/apps.php:139 ../../include/nav.php:176
-#: ../../mod/directory.php:226
-msgid "Directory"
-msgstr ""
-
-#: ../../include/apps.php:140 ../../include/nav.php:168 ../../mod/help.php:58
-#: ../../mod/help.php:63
-msgid "Help"
-msgstr ""
-
-#: ../../include/apps.php:141 ../../include/nav.php:204
-msgid "Mail"
-msgstr ""
-
-#: ../../include/apps.php:142 ../../mod/mood.php:131
-msgid "Mood"
-msgstr ""
-
-#: ../../include/apps.php:143 ../../include/conversation.php:951
-msgid "Poke"
-msgstr ""
-
-#: ../../include/apps.php:144 ../../include/nav.php:111
-msgid "Chat"
-msgstr ""
-
-#: ../../include/apps.php:145 ../../include/text.php:822
-#: ../../include/text.php:834 ../../include/nav.php:173
-#: ../../mod/search.php:30
-msgid "Search"
-msgstr ""
-
-#: ../../include/apps.php:146
-msgid "Probe"
-msgstr ""
-
-#: ../../include/apps.php:147
-msgid "Suggest"
-msgstr ""
-
-#: ../../include/apps.php:148
-msgid "Random Channel"
-msgstr ""
-
-#: ../../include/apps.php:149
-msgid "Invite"
-msgstr ""
-
-#: ../../include/apps.php:150
-msgid "Features"
-msgstr ""
-
-#: ../../include/apps.php:151
-msgid "Language"
-msgstr ""
-
-#: ../../include/apps.php:152
-msgid "Post"
-msgstr ""
-
-#: ../../include/apps.php:153
-msgid "Profile Photo"
-msgstr ""
-
-#: ../../include/apps.php:242 ../../mod/settings.php:81
-#: ../../mod/settings.php:575
-msgid "Update"
-msgstr ""
-
-#: ../../include/apps.php:242
-msgid "Install"
-msgstr ""
-
-#: ../../include/apps.php:247
-msgid "Purchase"
-msgstr ""
-
-#: ../../include/apps.php:249 ../../include/page_widgets.php:8
-#: ../../include/page_widgets.php:36 ../../include/RedDAV/RedBrowser.php:250
-#: ../../include/menu.php:42 ../../include/ItemObject.php:100
-#: ../../mod/settings.php:611 ../../mod/blocks.php:99
-#: ../../mod/connections.php:381 ../../mod/connections.php:394
-#: ../../mod/connections.php:413 ../../mod/webpages.php:131
-#: ../../mod/editblock.php:111 ../../mod/editlayout.php:106
-#: ../../mod/editpost.php:112 ../../mod/editwebpage.php:143
-#: ../../mod/thing.php:233 ../../mod/layouts.php:121 ../../mod/menu.php:59
-msgid "Edit"
-msgstr ""
-
-#: ../../include/apps.php:250 ../../include/conversation.php:638
-#: ../../include/RedDAV/RedBrowser.php:251 ../../include/ItemObject.php:120
-#: ../../mod/photos.php:1066 ../../mod/settings.php:612
-#: ../../mod/connedit.php:476 ../../mod/group.php:176 ../../mod/admin.php:732
-#: ../../mod/admin.php:863 ../../mod/thing.php:234
-msgid "Delete"
-msgstr ""
-
-#: ../../include/apps.php:331 ../../include/apps.php:382
-#: ../../include/conversation.php:1003 ../../include/RedDAV/RedBrowser.php:163
-#: ../../mod/photos.php:711 ../../mod/photos.php:1128
-#: ../../mod/connedit.php:512
-msgid "Unknown"
-msgstr ""
-
-#: ../../include/attach.php:116 ../../include/attach.php:163
-#: ../../include/attach.php:226 ../../include/attach.php:240
-#: ../../include/attach.php:280 ../../include/attach.php:294
-#: ../../include/attach.php:318 ../../include/attach.php:511
-#: ../../include/attach.php:584 ../../include/chat.php:116
-#: ../../include/items.php:4005 ../../include/photos.php:15
-#: ../../mod/mood.php:112 ../../mod/photos.php:68 ../../mod/mitem.php:73
-#: ../../mod/achievements.php:30 ../../mod/settings.php:526
-#: ../../mod/poke.php:128 ../../mod/api.php:26 ../../mod/api.php:31
-#: ../../mod/authtest.php:13 ../../mod/profile.php:64 ../../mod/profile.php:72
-#: ../../mod/block.php:22 ../../mod/block.php:72 ../../mod/blocks.php:29
-#: ../../mod/blocks.php:44 ../../mod/profiles.php:179
-#: ../../mod/profiles.php:532 ../../mod/events.php:195
-#: ../../mod/channel.php:89 ../../mod/channel.php:193
-#: ../../mod/channel.php:236 ../../mod/chat.php:90 ../../mod/chat.php:95
-#: ../../mod/register.php:70 ../../mod/regmod.php:17 ../../mod/common.php:35
-#: ../../mod/network.php:12 ../../mod/connections.php:169
-#: ../../mod/connedit.php:266 ../../mod/delegate.php:6
-#: ../../mod/webpages.php:40 ../../mod/bookmarks.php:46
-#: ../../mod/setup.php:203 ../../mod/editblock.php:34 ../../mod/pdledit.php:21
-#: ../../mod/editlayout.php:48 ../../mod/editpost.php:13
-#: ../../mod/editwebpage.php:44 ../../mod/editwebpage.php:83
-#: ../../mod/profile_photo.php:263 ../../mod/profile_photo.php:276
-#: ../../mod/sources.php:66 ../../mod/filestorage.php:18
-#: ../../mod/filestorage.php:67 ../../mod/filestorage.php:82
-#: ../../mod/filestorage.php:109 ../../mod/fsuggest.php:78
-#: ../../mod/suggest.php:26 ../../mod/group.php:9 ../../mod/like.php:154
-#: ../../mod/thing.php:247 ../../mod/thing.php:264 ../../mod/thing.php:299
-#: ../../mod/invite.php:13 ../../mod/invite.php:104 ../../mod/item.php:184
-#: ../../mod/item.php:192 ../../mod/item.php:964 ../../mod/layouts.php:27
-#: ../../mod/layouts.php:39 ../../mod/locs.php:71
-#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
-#: ../../mod/viewsrc.php:14 ../../mod/mail.php:111 ../../mod/manage.php:6
-#: ../../mod/menu.php:44 ../../mod/message.php:16 ../../mod/new_channel.php:68
-#: ../../mod/new_channel.php:99 ../../mod/notifications.php:66
-#: ../../mod/page.php:28 ../../mod/page.php:78 ../../mod/appman.php:66
-#: ../../mod/service_limits.php:7 ../../index.php:190 ../../index.php:390
-msgid "Permission denied."
-msgstr ""
-
-#: ../../include/attach.php:221 ../../include/attach.php:275
-msgid "Item was not found."
-msgstr ""
-
-#: ../../include/attach.php:331
-msgid "No source file."
-msgstr ""
-
-#: ../../include/attach.php:348
-msgid "Cannot locate file to replace"
-msgstr ""
-
-#: ../../include/attach.php:366
-msgid "Cannot locate file to revise/update"
-msgstr ""
-
-#: ../../include/attach.php:377
-#, php-format
-msgid "File exceeds size limit of %d"
-msgstr ""
-
-#: ../../include/attach.php:389
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
-msgstr ""
-
-#: ../../include/attach.php:472
-msgid "File upload failed. Possible system limit or action terminated."
-msgstr ""
-
-#: ../../include/attach.php:484
-msgid "Stored file could not be verified. Upload failed."
-msgstr ""
-
-#: ../../include/attach.php:526 ../../include/attach.php:543
-msgid "Path not available."
-msgstr ""
-
-#: ../../include/attach.php:589
-msgid "Empty pathname"
-msgstr ""
-
-#: ../../include/attach.php:605
-msgid "duplicate filename or path"
-msgstr ""
-
-#: ../../include/attach.php:629
-msgid "Path not found."
-msgstr ""
-
-#: ../../include/attach.php:680
-msgid "mkdir failed."
-msgstr ""
-
-#: ../../include/attach.php:684
-msgid "database storage failed."
-msgstr ""
-
-#: ../../include/conversation.php:120 ../../include/text.php:1743
-#: ../../include/diaspora.php:1923 ../../mod/subthread.php:72
+#: ../../include/conversation.php:120 ../../include/diaspora.php:1923
+#: ../../include/text.php:1747 ../../mod/subthread.php:72
 #: ../../mod/subthread.php:174 ../../mod/tagger.php:45 ../../mod/like.php:298
 msgid "photo"
 msgstr ""
 
-#: ../../include/conversation.php:123 ../../include/text.php:1746
+#: ../../include/conversation.php:123 ../../include/text.php:1750
 #: ../../mod/tagger.php:49
 msgid "event"
 msgstr ""
@@ -307,13 +44,13 @@ msgstr ""
 msgid "channel"
 msgstr ""
 
-#: ../../include/conversation.php:148 ../../include/text.php:1749
-#: ../../include/diaspora.php:1923 ../../mod/subthread.php:72
+#: ../../include/conversation.php:148 ../../include/diaspora.php:1923
+#: ../../include/text.php:1753 ../../mod/subthread.php:72
 #: ../../mod/subthread.php:174 ../../mod/tagger.php:53 ../../mod/like.php:298
 msgid "status"
 msgstr ""
 
-#: ../../include/conversation.php:150 ../../include/text.php:1751
+#: ../../include/conversation.php:150 ../../include/text.php:1755
 #: ../../mod/tagger.php:55
 msgid "comment"
 msgstr ""
@@ -339,7 +76,7 @@ msgstr ""
 msgid "%1$s poked %2$s"
 msgstr ""
 
-#: ../../include/conversation.php:243 ../../include/text.php:901
+#: ../../include/conversation.php:243 ../../include/text.php:905
 msgid "poked"
 msgstr ""
 
@@ -353,6 +90,14 @@ msgstr ""
 msgid "Select"
 msgstr ""
 
+#: ../../include/conversation.php:638 ../../include/RedDAV/RedBrowser.php:251
+#: ../../include/apps.php:250 ../../include/ItemObject.php:120
+#: ../../mod/photos.php:1069 ../../mod/connedit.php:476
+#: ../../mod/thing.php:234 ../../mod/settings.php:612 ../../mod/group.php:176
+#: ../../mod/admin.php:730 ../../mod/admin.php:861
+msgid "Delete"
+msgstr ""
+
 #: ../../include/conversation.php:645 ../../include/ItemObject.php:89
 msgid "Private Message"
 msgstr ""
@@ -398,9 +143,9 @@ msgid "View in context"
 msgstr ""
 
 #: ../../include/conversation.php:719 ../../include/conversation.php:1153
-#: ../../include/ItemObject.php:310 ../../mod/photos.php:974
-#: ../../mod/editblock.php:120 ../../mod/editlayout.php:115
-#: ../../mod/editpost.php:121 ../../mod/editwebpage.php:152
+#: ../../include/ItemObject.php:310 ../../mod/photos.php:977
+#: ../../mod/editblock.php:152 ../../mod/editlayout.php:148
+#: ../../mod/editpost.php:121 ../../mod/editwebpage.php:183
 #: ../../mod/mail.php:234 ../../mod/mail.php:349
 msgid "Please wait"
 msgstr ""
@@ -442,11 +187,10 @@ msgstr ""
 msgid "Matrix Activity"
 msgstr ""
 
-#: ../../include/conversation.php:948 ../../include/identity.php:840
-#: ../../include/widgets.php:135 ../../include/widgets.php:175
-#: ../../include/Contact.php:107 ../../mod/directory.php:183
-#: ../../mod/dirprofile.php:164 ../../mod/suggest.php:51
-#: ../../mod/match.php:62
+#: ../../include/conversation.php:948 ../../include/widgets.php:135
+#: ../../include/widgets.php:175 ../../include/Contact.php:107
+#: ../../include/identity.php:840 ../../mod/directory.php:224
+#: ../../mod/suggest.php:51 ../../mod/match.php:62
 msgid "Connect"
 msgstr ""
 
@@ -458,6 +202,17 @@ msgstr ""
 msgid "Send PM"
 msgstr ""
 
+#: ../../include/conversation.php:951 ../../include/apps.php:143
+msgid "Poke"
+msgstr ""
+
+#: ../../include/conversation.php:1003 ../../include/RedDAV/RedBrowser.php:163
+#: ../../include/apps.php:331 ../../include/apps.php:382
+#: ../../mod/photos.php:713 ../../mod/photos.php:1131
+#: ../../mod/connedit.php:512
+msgid "Unknown"
+msgstr ""
+
 #: ../../include/conversation.php:1024
 #, php-format
 msgid "%s likes this."
@@ -538,20 +293,20 @@ msgid "Expires YYYY-MM-DD HH:MM"
 msgstr ""
 
 #: ../../include/conversation.php:1114 ../../include/page_widgets.php:40
-#: ../../include/ItemObject.php:608 ../../mod/photos.php:994
-#: ../../mod/webpages.php:135 ../../mod/editblock.php:141
-#: ../../mod/editlayout.php:135 ../../mod/editpost.php:140
-#: ../../mod/editwebpage.php:174
+#: ../../include/ItemObject.php:608 ../../mod/photos.php:997
+#: ../../mod/webpages.php:166 ../../mod/editblock.php:173
+#: ../../mod/editlayout.php:168 ../../mod/editpost.php:140
+#: ../../mod/editwebpage.php:205
 msgid "Preview"
 msgstr ""
 
-#: ../../include/conversation.php:1128 ../../mod/photos.php:973
-#: ../../mod/editblock.php:168 ../../mod/editlayout.php:161
-#: ../../mod/editwebpage.php:201 ../../mod/layouts.php:122
+#: ../../include/conversation.php:1128 ../../mod/photos.php:976
+#: ../../mod/editblock.php:198 ../../mod/editlayout.php:193
+#: ../../mod/editwebpage.php:230 ../../mod/layouts.php:168
 msgid "Share"
 msgstr ""
 
-#: ../../include/conversation.php:1130 ../../mod/editwebpage.php:139
+#: ../../include/conversation.php:1130 ../../mod/editwebpage.php:170
 msgid "Page link title"
 msgstr ""
 
@@ -559,9 +314,9 @@ msgstr ""
 msgid "Post as"
 msgstr ""
 
-#: ../../include/conversation.php:1134 ../../mod/editblock.php:112
-#: ../../mod/editlayout.php:107 ../../mod/editpost.php:113
-#: ../../mod/editwebpage.php:144 ../../mod/mail.php:231 ../../mod/mail.php:345
+#: ../../include/conversation.php:1134 ../../mod/editblock.php:144
+#: ../../mod/editlayout.php:140 ../../mod/editpost.php:113
+#: ../../mod/editwebpage.php:175 ../../mod/mail.php:231 ../../mod/mail.php:345
 msgid "Upload photo"
 msgstr ""
 
@@ -569,9 +324,9 @@ msgstr ""
 msgid "upload photo"
 msgstr ""
 
-#: ../../include/conversation.php:1136 ../../mod/editblock.php:113
-#: ../../mod/editlayout.php:108 ../../mod/editpost.php:114
-#: ../../mod/editwebpage.php:145 ../../mod/mail.php:232 ../../mod/mail.php:346
+#: ../../include/conversation.php:1136 ../../mod/editblock.php:145
+#: ../../mod/editlayout.php:141 ../../mod/editpost.php:114
+#: ../../mod/editwebpage.php:176 ../../mod/mail.php:232 ../../mod/mail.php:346
 msgid "Attach file"
 msgstr ""
 
@@ -579,9 +334,9 @@ msgstr ""
 msgid "attach file"
 msgstr ""
 
-#: ../../include/conversation.php:1138 ../../mod/editblock.php:114
-#: ../../mod/editlayout.php:109 ../../mod/editpost.php:115
-#: ../../mod/editwebpage.php:146 ../../mod/mail.php:233 ../../mod/mail.php:347
+#: ../../include/conversation.php:1138 ../../mod/editblock.php:146
+#: ../../mod/editlayout.php:142 ../../mod/editpost.php:115
+#: ../../mod/editwebpage.php:177 ../../mod/mail.php:233 ../../mod/mail.php:347
 msgid "Insert web link"
 msgstr ""
 
@@ -605,9 +360,9 @@ msgstr ""
 msgid "audio link"
 msgstr ""
 
-#: ../../include/conversation.php:1144 ../../mod/editblock.php:118
-#: ../../mod/editlayout.php:113 ../../mod/editpost.php:119
-#: ../../mod/editwebpage.php:150
+#: ../../include/conversation.php:1144 ../../mod/editblock.php:150
+#: ../../mod/editlayout.php:146 ../../mod/editpost.php:119
+#: ../../mod/editwebpage.php:181
 msgid "Set your location"
 msgstr ""
 
@@ -615,9 +370,9 @@ msgstr ""
 msgid "set location"
 msgstr ""
 
-#: ../../include/conversation.php:1146 ../../mod/editblock.php:119
-#: ../../mod/editlayout.php:114 ../../mod/editpost.php:120
-#: ../../mod/editwebpage.php:151
+#: ../../include/conversation.php:1146 ../../mod/editblock.php:151
+#: ../../mod/editlayout.php:147 ../../mod/editpost.php:120
+#: ../../mod/editwebpage.php:182
 msgid "Clear browser location"
 msgstr ""
 
@@ -625,21 +380,21 @@ msgstr ""
 msgid "clear location"
 msgstr ""
 
-#: ../../include/conversation.php:1149 ../../mod/editblock.php:132
-#: ../../mod/editlayout.php:126 ../../mod/editpost.php:132
-#: ../../mod/editwebpage.php:167
+#: ../../include/conversation.php:1149 ../../mod/editblock.php:164
+#: ../../mod/editlayout.php:159 ../../mod/editpost.php:132
+#: ../../mod/editwebpage.php:198
 msgid "Set title"
 msgstr ""
 
 #: ../../include/conversation.php:1152 ../../mod/events.php:563
-#: ../../mod/editblock.php:135 ../../mod/editlayout.php:129
-#: ../../mod/editpost.php:134 ../../mod/editwebpage.php:169
+#: ../../mod/editblock.php:167 ../../mod/editlayout.php:162
+#: ../../mod/editpost.php:134 ../../mod/editwebpage.php:200
 msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../include/conversation.php:1154 ../../mod/editblock.php:121
-#: ../../mod/editlayout.php:116 ../../mod/editpost.php:122
-#: ../../mod/editwebpage.php:153
+#: ../../include/conversation.php:1154 ../../mod/editblock.php:153
+#: ../../mod/editlayout.php:149 ../../mod/editpost.php:122
+#: ../../mod/editwebpage.php:184
 msgid "Permission settings"
 msgstr ""
 
@@ -647,21 +402,21 @@ msgstr ""
 msgid "permissions"
 msgstr ""
 
-#: ../../include/conversation.php:1162 ../../mod/editblock.php:129
-#: ../../mod/editlayout.php:123 ../../mod/editpost.php:129
-#: ../../mod/editwebpage.php:162
+#: ../../include/conversation.php:1162 ../../mod/editblock.php:161
+#: ../../mod/editlayout.php:156 ../../mod/editpost.php:129
+#: ../../mod/editwebpage.php:193
 msgid "Public post"
 msgstr ""
 
-#: ../../include/conversation.php:1164 ../../mod/editblock.php:136
-#: ../../mod/editlayout.php:130 ../../mod/editpost.php:135
-#: ../../mod/editwebpage.php:170
+#: ../../include/conversation.php:1164 ../../mod/editblock.php:168
+#: ../../mod/editlayout.php:163 ../../mod/editpost.php:135
+#: ../../mod/editwebpage.php:201
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
-#: ../../include/conversation.php:1177 ../../mod/editblock.php:146
-#: ../../mod/editlayout.php:140 ../../mod/editpost.php:146
-#: ../../mod/editwebpage.php:179 ../../mod/mail.php:238 ../../mod/mail.php:352
+#: ../../include/conversation.php:1177 ../../mod/editblock.php:178
+#: ../../mod/editlayout.php:173 ../../mod/editpost.php:146
+#: ../../mod/editwebpage.php:210 ../../mod/mail.php:238 ../../mod/mail.php:352
 msgid "Set expiration date"
 msgstr ""
 
@@ -675,9 +430,9 @@ msgstr ""
 msgid "OK"
 msgstr ""
 
-#: ../../include/conversation.php:1182 ../../mod/settings.php:550
-#: ../../mod/settings.php:576 ../../mod/events.php:568
-#: ../../mod/editpost.php:151 ../../mod/fbrowser.php:82
+#: ../../include/conversation.php:1182 ../../mod/events.php:568
+#: ../../mod/editpost.php:151 ../../mod/settings.php:550
+#: ../../mod/settings.php:576 ../../mod/fbrowser.php:82
 #: ../../mod/fbrowser.php:117 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134
 msgid "Cancel"
 msgstr ""
@@ -715,7 +470,7 @@ msgid "Posts that mention or involve you"
 msgstr ""
 
 #: ../../include/conversation.php:1458 ../../mod/connections.php:211
-#: ../../mod/connections.php:224 ../../mod/menu.php:61
+#: ../../mod/connections.php:224 ../../mod/menu.php:80
 msgid "New"
 msgstr ""
 
@@ -739,39 +494,60 @@ msgstr ""
 msgid "Posts flagged as SPAM"
 msgstr ""
 
-#: ../../include/conversation.php:1516 ../../mod/admin.php:867
+#: ../../include/conversation.php:1520 ../../mod/admin.php:865
 msgid "Channel"
 msgstr ""
 
-#: ../../include/conversation.php:1519
+#: ../../include/conversation.php:1523
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../include/conversation.php:1528
+#: ../../include/conversation.php:1532
 msgid "About"
 msgstr ""
 
-#: ../../include/conversation.php:1531
+#: ../../include/conversation.php:1535
 msgid "Profile Details"
 msgstr ""
 
-#: ../../include/conversation.php:1540 ../../include/photos.php:340
+#: ../../include/conversation.php:1541 ../../include/nav.php:105
+#: ../../include/apps.php:137 ../../mod/fbrowser.php:25
+msgid "Photos"
+msgstr ""
+
+#: ../../include/conversation.php:1544 ../../include/photos.php:341
 msgid "Photo Albums"
 msgstr ""
 
-#: ../../include/conversation.php:1549
+#: ../../include/conversation.php:1550 ../../include/RedDAV/RedBrowser.php:241
+#: ../../include/nav.php:106 ../../include/apps.php:133
+#: ../../mod/fbrowser.php:114
+msgid "Files"
+msgstr ""
+
+#: ../../include/conversation.php:1553
 msgid "Files and Storage"
 msgstr ""
 
-#: ../../include/conversation.php:1559 ../../include/conversation.php:1562
+#: ../../include/conversation.php:1563 ../../include/conversation.php:1566
 msgid "Chatrooms"
 msgstr ""
 
-#: ../../include/conversation.php:1575
+#: ../../include/conversation.php:1576 ../../include/nav.php:117
+#: ../../include/apps.php:127
+msgid "Bookmarks"
+msgstr ""
+
+#: ../../include/conversation.php:1579
 msgid "Saved Bookmarks"
 msgstr ""
 
-#: ../../include/conversation.php:1586
+#: ../../include/conversation.php:1587 ../../include/nav.php:121
+#: ../../include/apps.php:134 ../../mod/webpages.php:160
+msgid "Webpages"
+msgstr ""
+
+#: ../../include/conversation.php:1590
 msgid "Manage Webpages"
 msgstr ""
 
@@ -784,61 +560,135 @@ msgstr ""
 msgid "commented on %s's post"
 msgstr ""
 
+#: ../../include/dir_fns.php:56
+msgid "Sort Options"
+msgstr ""
+
+#: ../../include/dir_fns.php:57
+msgid "Alphabetic"
+msgstr ""
+
+#: ../../include/dir_fns.php:58
+msgid "Reverse Alphabetic"
+msgstr ""
+
+#: ../../include/dir_fns.php:59
+msgid "Newest to Oldest"
+msgstr ""
+
+#: ../../include/dir_fns.php:71
+msgid "Enable Safe Search"
+msgstr ""
+
+#: ../../include/dir_fns.php:73
+msgid "Disable Safe Search"
+msgstr ""
+
+#: ../../include/dir_fns.php:75
+msgid "Safe Mode"
+msgstr ""
+
 #: ../../include/page_widgets.php:6
 msgid "New Page"
 msgstr ""
 
-#: ../../include/page_widgets.php:39 ../../mod/blocks.php:102
-#: ../../mod/webpages.php:134 ../../mod/layouts.php:125
+#: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36
+#: ../../include/RedDAV/RedBrowser.php:250 ../../include/menu.php:42
+#: ../../include/apps.php:249 ../../include/ItemObject.php:100
+#: ../../mod/blocks.php:132 ../../mod/connections.php:381
+#: ../../mod/connections.php:394 ../../mod/connections.php:413
+#: ../../mod/thing.php:233 ../../mod/webpages.php:162
+#: ../../mod/editblock.php:143 ../../mod/editlayout.php:139
+#: ../../mod/editpost.php:112 ../../mod/settings.php:611
+#: ../../mod/editwebpage.php:174 ../../mod/layouts.php:167
+#: ../../mod/menu.php:78
+msgid "Edit"
+msgstr ""
+
+#: ../../include/page_widgets.php:39 ../../mod/blocks.php:135
+#: ../../mod/webpages.php:165 ../../mod/layouts.php:171
 msgid "View"
 msgstr ""
 
-#: ../../include/page_widgets.php:41 ../../mod/webpages.php:136
+#: ../../include/page_widgets.php:41 ../../mod/webpages.php:167
 msgid "Actions"
 msgstr ""
 
-#: ../../include/page_widgets.php:42 ../../mod/webpages.php:137
+#: ../../include/page_widgets.php:42 ../../mod/webpages.php:168
 msgid "Page Link"
 msgstr ""
 
-#: ../../include/page_widgets.php:43 ../../mod/webpages.php:138
+#: ../../include/page_widgets.php:43 ../../mod/webpages.php:169
 msgid "Title"
 msgstr ""
 
-#: ../../include/page_widgets.php:44 ../../mod/webpages.php:139
+#: ../../include/page_widgets.php:44 ../../mod/webpages.php:170
 msgid "Created"
 msgstr ""
 
-#: ../../include/page_widgets.php:45 ../../mod/webpages.php:140
+#: ../../include/page_widgets.php:45 ../../mod/webpages.php:171
 msgid "Edited"
 msgstr ""
 
-#: ../../include/security.php:320
-msgid ""
-"The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before submitting it."
+#: ../../include/chat.php:10
+msgid "Missing room name"
 msgstr ""
 
-#: ../../include/event.php:11 ../../include/bb2diaspora.php:463
-msgid "l F d, Y \\@ g:i A"
+#: ../../include/chat.php:19
+msgid "Duplicate room name"
 msgstr ""
 
-#: ../../include/event.php:20 ../../include/bb2diaspora.php:469
-msgid "Starts:"
+#: ../../include/chat.php:68 ../../include/chat.php:76
+msgid "Invalid room specifier."
 msgstr ""
 
-#: ../../include/event.php:30 ../../include/bb2diaspora.php:477
-msgid "Finishes:"
+#: ../../include/chat.php:105
+msgid "Room not found."
 msgstr ""
 
-#: ../../include/event.php:40 ../../include/bb2diaspora.php:485
-#: ../../include/identity.php:891 ../../mod/events.php:579
-#: ../../mod/directory.php:156 ../../mod/dirprofile.php:105
-msgid "Location:"
+#: ../../include/chat.php:116 ../../include/items.php:4013
+#: ../../include/attach.php:116 ../../include/attach.php:163
+#: ../../include/attach.php:226 ../../include/attach.php:240
+#: ../../include/attach.php:280 ../../include/attach.php:294
+#: ../../include/attach.php:318 ../../include/attach.php:511
+#: ../../include/attach.php:584 ../../include/photos.php:15
+#: ../../mod/mood.php:112 ../../mod/mitem.php:106
+#: ../../mod/achievements.php:30 ../../mod/profiles.php:179
+#: ../../mod/profiles.php:550 ../../mod/setup.php:207 ../../mod/poke.php:128
+#: ../../mod/api.php:26 ../../mod/api.php:31 ../../mod/authtest.php:13
+#: ../../mod/profile.php:64 ../../mod/profile.php:72 ../../mod/block.php:22
+#: ../../mod/block.php:72 ../../mod/sources.php:66 ../../mod/blocks.php:67
+#: ../../mod/blocks.php:75 ../../mod/register.php:72 ../../mod/events.php:195
+#: ../../mod/channel.php:89 ../../mod/channel.php:193
+#: ../../mod/channel.php:236 ../../mod/chat.php:90 ../../mod/chat.php:95
+#: ../../mod/regmod.php:17 ../../mod/network.php:12 ../../mod/common.php:35
+#: ../../mod/photos.php:68 ../../mod/connections.php:169
+#: ../../mod/manage.php:6 ../../mod/connedit.php:266 ../../mod/thing.php:247
+#: ../../mod/thing.php:264 ../../mod/thing.php:299 ../../mod/webpages.php:67
+#: ../../mod/bookmarks.php:46 ../../mod/editblock.php:65
+#: ../../mod/pdledit.php:21 ../../mod/editlayout.php:64
+#: ../../mod/editlayout.php:89 ../../mod/editpost.php:13
+#: ../../mod/settings.php:526 ../../mod/editwebpage.php:64
+#: ../../mod/editwebpage.php:86 ../../mod/editwebpage.php:118
+#: ../../mod/profile_photo.php:263 ../../mod/profile_photo.php:276
+#: ../../mod/fsuggest.php:78 ../../mod/filestorage.php:18
+#: ../../mod/filestorage.php:67 ../../mod/filestorage.php:82
+#: ../../mod/filestorage.php:109 ../../mod/delegate.php:6
+#: ../../mod/group.php:9 ../../mod/suggest.php:26 ../../mod/item.php:191
+#: ../../mod/item.php:199 ../../mod/item.php:971 ../../mod/like.php:154
+#: ../../mod/invite.php:13 ../../mod/invite.php:104 ../../mod/locs.php:71
+#: ../../mod/layouts.php:67 ../../mod/layouts.php:74 ../../mod/layouts.php:85
+#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27
+#: ../../mod/viewsrc.php:14 ../../mod/mail.php:111 ../../mod/menu.php:61
+#: ../../mod/message.php:16 ../../mod/new_channel.php:68
+#: ../../mod/new_channel.php:99 ../../mod/notifications.php:66
+#: ../../mod/page.php:28 ../../mod/page.php:78 ../../mod/appman.php:66
+#: ../../mod/service_limits.php:7 ../../index.php:190 ../../index.php:390
+msgid "Permission denied."
 msgstr ""
 
-#: ../../include/event.php:326
-msgid "This event has been added to your calendar."
+#: ../../include/chat.php:126
+msgid "Room is full"
 msgstr ""
 
 #: ../../include/oembed.php:171
@@ -849,280 +699,265 @@ msgstr ""
 msgid "Embedding disabled"
 msgstr ""
 
-#: ../../include/permissions.php:13
-msgid "Can view my normal stream and posts"
-msgstr ""
-
-#: ../../include/permissions.php:14
-msgid "Can view my default channel profile"
-msgstr ""
-
-#: ../../include/permissions.php:15
-msgid "Can view my photo albums"
-msgstr ""
-
-#: ../../include/permissions.php:16
-msgid "Can view my connections"
-msgstr ""
-
-#: ../../include/permissions.php:17
-msgid "Can view my file storage"
+#: ../../include/widgets.php:29 ../../include/contact_widgets.php:92
+#: ../../include/taxonomy.php:230
+msgid "Categories"
 msgstr ""
 
-#: ../../include/permissions.php:18
-msgid "Can view my webpages"
+#: ../../include/widgets.php:86 ../../include/nav.php:171
+#: ../../mod/apps.php:33
+msgid "Apps"
 msgstr ""
 
-#: ../../include/permissions.php:21
-msgid "Can send me their channel stream and posts"
+#: ../../include/widgets.php:87
+msgid "System"
 msgstr ""
 
-#: ../../include/permissions.php:22
-msgid "Can post on my channel page (\"wall\")"
+#: ../../include/widgets.php:90
+msgid "Create Personal App"
 msgstr ""
 
-#: ../../include/permissions.php:23
-msgid "Can comment on or like my posts"
+#: ../../include/widgets.php:91
+msgid "Edit Personal App"
 msgstr ""
 
-#: ../../include/permissions.php:24
-msgid "Can send me private mail messages"
+#: ../../include/widgets.php:137 ../../mod/suggest.php:53
+msgid "Ignore/Hide"
 msgstr ""
 
-#: ../../include/permissions.php:25
-msgid "Can post photos to my photo albums"
+#: ../../include/widgets.php:143 ../../mod/connections.php:267
+msgid "Suggestions"
 msgstr ""
 
-#: ../../include/permissions.php:26
-msgid "Can like/dislike stuff"
+#: ../../include/widgets.php:144
+msgid "See more..."
 msgstr ""
 
-#: ../../include/permissions.php:26
-msgid "Profiles and things other than posts/comments"
+#: ../../include/widgets.php:166
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
 msgstr ""
 
-#: ../../include/permissions.php:28
-msgid "Can forward to all my channel contacts via post @mentions"
+#: ../../include/widgets.php:172
+msgid "Add New Connection"
 msgstr ""
 
-#: ../../include/permissions.php:28
-msgid "Advanced - useful for creating group forum channels"
+#: ../../include/widgets.php:173
+msgid "Enter the channel address"
 msgstr ""
 
-#: ../../include/permissions.php:29
-msgid "Can chat with me (when available)"
+#: ../../include/widgets.php:174
+msgid "Example: bob@example.com, http://example.com/barbara"
 msgstr ""
 
-#: ../../include/permissions.php:30
-msgid "Can write to my file storage"
+#: ../../include/widgets.php:191
+msgid "Notes"
 msgstr ""
 
-#: ../../include/permissions.php:31
-msgid "Can edit my webpages"
+#: ../../include/widgets.php:193 ../../include/text.php:827
+#: ../../include/text.php:839 ../../mod/rbmark.php:28 ../../mod/rbmark.php:98
+#: ../../mod/filer.php:50 ../../mod/admin.php:1339 ../../mod/admin.php:1360
+msgid "Save"
 msgstr ""
 
-#: ../../include/permissions.php:33
-msgid "Can source my public posts in derived channels"
+#: ../../include/widgets.php:263
+msgid "Remove term"
 msgstr ""
 
-#: ../../include/permissions.php:33
-msgid "Somewhat advanced - very useful in open communities"
+#: ../../include/widgets.php:272 ../../include/features.php:58
+msgid "Saved Searches"
 msgstr ""
 
-#: ../../include/permissions.php:35
-msgid "Can administer my channel resources"
+#: ../../include/widgets.php:273 ../../include/group.php:303
+msgid "add"
 msgstr ""
 
-#: ../../include/permissions.php:35
-msgid "Extremely advanced. Leave this alone unless you know what you are doing"
+#: ../../include/widgets.php:303 ../../include/contact_widgets.php:57
+#: ../../include/features.php:72
+msgid "Saved Folders"
 msgstr ""
 
-#: ../../include/permissions.php:785
-msgid "Social Networking"
+#: ../../include/widgets.php:306 ../../include/contact_widgets.php:60
+#: ../../include/contact_widgets.php:95
+msgid "Everything"
 msgstr ""
 
-#: ../../include/permissions.php:786 ../../include/permissions.php:788
-#: ../../include/permissions.php:790
-msgid "Mostly Public"
+#: ../../include/widgets.php:352
+msgid "Archives"
 msgstr ""
 
-#: ../../include/permissions.php:786 ../../include/permissions.php:788
-#: ../../include/permissions.php:790
-msgid "Restricted"
+#: ../../include/widgets.php:428
+msgid "Refresh"
 msgstr ""
 
-#: ../../include/permissions.php:786 ../../include/permissions.php:788
-msgid "Private"
+#: ../../include/widgets.php:429 ../../mod/connedit.php:506
+msgid "Me"
 msgstr ""
 
-#: ../../include/permissions.php:787
-msgid "Community Forum"
+#: ../../include/widgets.php:430 ../../mod/connedit.php:508
+msgid "Best Friends"
 msgstr ""
 
-#: ../../include/permissions.php:789
-msgid "Feed Republish"
+#: ../../include/widgets.php:431 ../../include/identity.php:387
+#: ../../include/identity.php:388 ../../include/identity.php:395
+#: ../../include/profile_selectors.php:80 ../../mod/connedit.php:509
+#: ../../mod/settings.php:304 ../../mod/settings.php:308
+#: ../../mod/settings.php:309 ../../mod/settings.php:312
+#: ../../mod/settings.php:323
+msgid "Friends"
 msgstr ""
 
-#: ../../include/permissions.php:791
-msgid "Special Purpose"
+#: ../../include/widgets.php:432
+msgid "Co-workers"
 msgstr ""
 
-#: ../../include/permissions.php:792
-msgid "Celebrity/Soapbox"
+#: ../../include/widgets.php:433 ../../mod/connedit.php:510
+msgid "Former Friends"
 msgstr ""
 
-#: ../../include/permissions.php:792
-msgid "Group Repository"
+#: ../../include/widgets.php:434 ../../mod/connedit.php:511
+msgid "Acquaintances"
 msgstr ""
 
-#: ../../include/permissions.php:793 ../../include/profile_selectors.php:6
-#: ../../include/profile_selectors.php:23
-#: ../../include/profile_selectors.php:61
-#: ../../include/profile_selectors.php:97
-msgid "Other"
+#: ../../include/widgets.php:435
+msgid "Everybody"
 msgstr ""
 
-#: ../../include/permissions.php:794
-msgid "Custom/Expert Mode"
+#: ../../include/widgets.php:469
+msgid "Account settings"
 msgstr ""
 
-#: ../../include/activities.php:39
-msgid " and "
+#: ../../include/widgets.php:475
+msgid "Channel settings"
 msgstr ""
 
-#: ../../include/activities.php:47
-msgid "public profile"
+#: ../../include/widgets.php:481
+msgid "Additional features"
 msgstr ""
 
-#: ../../include/activities.php:52
-#, php-format
-msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+#: ../../include/widgets.php:487
+msgid "Feature settings"
 msgstr ""
 
-#: ../../include/activities.php:53
-#, php-format
-msgid "Visit %1$s's %2$s"
+#: ../../include/widgets.php:493
+msgid "Display settings"
 msgstr ""
 
-#: ../../include/activities.php:56
-#, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
+#: ../../include/widgets.php:499
+msgid "Connected apps"
 msgstr ""
 
-#: ../../include/datetime.php:43 ../../include/datetime.php:45
-msgid "Miscellaneous"
+#: ../../include/widgets.php:505
+msgid "Export channel"
 msgstr ""
 
-#: ../../include/datetime.php:241
-msgid "never"
+#: ../../include/widgets.php:511
+msgid "Export content"
 msgstr ""
 
-#: ../../include/datetime.php:247
-msgid "less than a second ago"
+#: ../../include/widgets.php:520 ../../mod/connedit.php:538
+msgid "Connection Default Permissions"
 msgstr ""
 
-#: ../../include/datetime.php:250
-msgid "year"
+#: ../../include/widgets.php:528
+msgid "Premium Channel Settings"
 msgstr ""
 
-#: ../../include/datetime.php:250
-msgid "years"
+#: ../../include/widgets.php:537 ../../include/features.php:49
+#: ../../mod/sources.php:88
+msgid "Channel Sources"
 msgstr ""
 
-#: ../../include/datetime.php:251
-msgid "month"
+#: ../../include/widgets.php:548 ../../include/nav.php:218
+#: ../../include/apps.php:132 ../../mod/admin.php:951 ../../mod/admin.php:1156
+msgid "Settings"
 msgstr ""
 
-#: ../../include/datetime.php:251
-msgid "months"
+#: ../../include/widgets.php:562 ../../mod/mail.php:124
+#: ../../mod/message.php:31
+msgid "Messages"
 msgstr ""
 
-#: ../../include/datetime.php:252
-msgid "week"
+#: ../../include/widgets.php:567
+msgid "Check Mail"
 msgstr ""
 
-#: ../../include/datetime.php:252
-msgid "weeks"
+#: ../../include/widgets.php:572 ../../include/nav.php:209
+msgid "New Message"
 msgstr ""
 
-#: ../../include/datetime.php:253
-msgid "day"
+#: ../../include/widgets.php:648
+msgid "Chat Rooms"
 msgstr ""
 
-#: ../../include/datetime.php:253
-msgid "days"
+#: ../../include/widgets.php:666
+msgid "Bookmarked Chatrooms"
 msgstr ""
 
-#: ../../include/datetime.php:254
-msgid "hour"
+#: ../../include/widgets.php:684
+msgid "Suggested Chatrooms"
 msgstr ""
 
-#: ../../include/datetime.php:254
-msgid "hours"
+#: ../../include/zot.php:664
+msgid "Invalid data packet"
 msgstr ""
 
-#: ../../include/datetime.php:255
-msgid "minute"
+#: ../../include/zot.php:680
+msgid "Unable to verify channel signature"
 msgstr ""
 
-#: ../../include/datetime.php:255
-msgid "minutes"
+#: ../../include/zot.php:1799
+#, php-format
+msgid "Unable to verify site signature for %s"
 msgstr ""
 
-#: ../../include/datetime.php:256
-msgid "second"
+#: ../../include/activities.php:39
+msgid " and "
 msgstr ""
 
-#: ../../include/datetime.php:256
-msgid "seconds"
+#: ../../include/activities.php:47
+msgid "public profile"
 msgstr ""
 
-#: ../../include/datetime.php:265
+#: ../../include/activities.php:52
 #, php-format
-msgid "%1$d %2$s ago"
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
 msgstr ""
 
-#: ../../include/datetime.php:470
+#: ../../include/activities.php:53
 #, php-format
-msgid "%1$s's birthday"
+msgid "Visit %1$s's %2$s"
 msgstr ""
 
-#: ../../include/datetime.php:471
+#: ../../include/activities.php:56
 #, php-format
-msgid "Happy Birthday %1$s"
+msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
 #: ../../include/bb2diaspora.php:384
 msgid "Attachments:"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:465
-msgid "Redmatrix event notification:"
-msgstr ""
-
-#: ../../include/zot.php:661
-msgid "Invalid data packet"
-msgstr ""
-
-#: ../../include/zot.php:677
-msgid "Unable to verify channel signature"
+#: ../../include/bb2diaspora.php:463 ../../include/event.php:11
+msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
-#: ../../include/zot.php:1791
-#, php-format
-msgid "Unable to verify site signature for %s"
+#: ../../include/bb2diaspora.php:465
+msgid "Redmatrix event notification:"
 msgstr ""
 
-#: ../../include/auth.php:116
-msgid "Logged out."
+#: ../../include/bb2diaspora.php:469 ../../include/event.php:20
+msgid "Starts:"
 msgstr ""
 
-#: ../../include/auth.php:257
-msgid "Failed authentication"
+#: ../../include/bb2diaspora.php:477 ../../include/event.php:30
+msgid "Finishes:"
 msgstr ""
 
-#: ../../include/auth.php:271 ../../mod/openid.php:190
-msgid "Login failed."
+#: ../../include/bb2diaspora.php:485 ../../include/event.php:40
+#: ../../include/identity.php:891 ../../mod/directory.php:159
+#: ../../mod/events.php:579
+msgid "Location:"
 msgstr ""
 
 #: ../../include/RedDAV/RedBrowser.php:106
@@ -1165,7 +1000,7 @@ msgid "%1$s used of %2$s (%3$s&#37;)"
 msgstr ""
 
 #: ../../include/RedDAV/RedBrowser.php:245 ../../mod/settings.php:551
-#: ../../mod/settings.php:577 ../../mod/admin.php:868
+#: ../../mod/settings.php:577 ../../mod/admin.php:866
 msgid "Name"
 msgstr ""
 
@@ -1189,8 +1024,8 @@ msgstr ""
 msgid "Create new folder"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:306 ../../mod/mitem.php:142
-#: ../../mod/menu.php:84 ../../mod/new_channel.php:122
+#: ../../include/RedDAV/RedBrowser.php:306 ../../mod/mitem.php:169
+#: ../../mod/menu.php:100 ../../mod/new_channel.php:122
 msgid "Create"
 msgstr ""
 
@@ -1198,8 +1033,8 @@ msgstr ""
 msgid "Upload file"
 msgstr ""
 
-#: ../../include/RedDAV/RedBrowser.php:308 ../../mod/photos.php:736
-#: ../../mod/photos.php:1241 ../../mod/profile_photo.php:361
+#: ../../include/RedDAV/RedBrowser.php:308 ../../mod/photos.php:738
+#: ../../mod/photos.php:1245 ../../mod/profile_photo.php:361
 msgid "Upload"
 msgstr ""
 
@@ -1208,7 +1043,40 @@ msgstr ""
 msgid "%1$s's bookmarks"
 msgstr ""
 
-#: ../../include/comanche.php:35 ../../view/theme/apw/php/config.php:185
+#: ../../include/follow.php:28
+msgid "Channel is blocked on this site."
+msgstr ""
+
+#: ../../include/follow.php:33
+msgid "Channel location missing."
+msgstr ""
+
+#: ../../include/follow.php:82
+msgid "Response from remote channel was incomplete."
+msgstr ""
+
+#: ../../include/follow.php:99
+msgid "Channel was deleted and no longer exists."
+msgstr ""
+
+#: ../../include/follow.php:135 ../../include/follow.php:202
+msgid "Protocol disabled."
+msgstr ""
+
+#: ../../include/follow.php:176
+msgid "Channel discovery failed."
+msgstr ""
+
+#: ../../include/follow.php:192
+msgid "local account not found."
+msgstr ""
+
+#: ../../include/follow.php:220
+msgid "Cannot connect to yourself."
+msgstr ""
+
+#: ../../include/comanche.php:35 ../../mod/admin.php:353
+#: ../../view/theme/apw/php/config.php:185
 msgid "Default"
 msgstr ""
 
@@ -1248,8 +1116,8 @@ msgstr ""
 msgid "RSS/Atom"
 msgstr ""
 
-#: ../../include/contact_selectors.php:79 ../../mod/admin.php:728
-#: ../../mod/admin.php:737 ../../boot.php:1515
+#: ../../include/contact_selectors.php:79 ../../mod/admin.php:726
+#: ../../mod/admin.php:735 ../../boot.php:1488
 msgid "Email"
 msgstr ""
 
@@ -1284,7 +1152,7 @@ msgid_plural "%d invitations available"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/contact_widgets.php:19 ../../mod/admin.php:418
+#: ../../include/contact_widgets.php:19 ../../mod/admin.php:416
 msgid "Advanced"
 msgstr ""
 
@@ -1304,8 +1172,8 @@ msgstr ""
 msgid "Examples: Robert Morgenstein, Fishing"
 msgstr ""
 
-#: ../../include/contact_widgets.php:26 ../../mod/connections.php:412
-#: ../../mod/directory.php:222 ../../mod/directory.php:227
+#: ../../include/contact_widgets.php:26 ../../mod/directory.php:267
+#: ../../mod/directory.php:272 ../../mod/connections.php:412
 msgid "Find"
 msgstr ""
 
@@ -1322,231 +1190,20 @@ msgid "Invite Friends"
 msgstr ""
 
 #: ../../include/contact_widgets.php:32
-msgid "Exammple: name=fred and country=iceland"
+msgid "Advanced example: name=fred and country=iceland"
 msgstr ""
 
-#: ../../include/contact_widgets.php:33
-msgid "Advanced Find"
-msgstr ""
-
-#: ../../include/contact_widgets.php:58 ../../include/features.php:72
-#: ../../include/widgets.php:303
-msgid "Saved Folders"
-msgstr ""
-
-#: ../../include/contact_widgets.php:61 ../../include/contact_widgets.php:96
-#: ../../include/widgets.php:306
-msgid "Everything"
-msgstr ""
-
-#: ../../include/contact_widgets.php:93 ../../include/taxonomy.php:230
-#: ../../include/widgets.php:29
-msgid "Categories"
-msgstr ""
-
-#: ../../include/contact_widgets.php:126
+#: ../../include/contact_widgets.php:125
 #, php-format
 msgid "%d connection in common"
 msgid_plural "%d connections in common"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/contact_widgets.php:131
+#: ../../include/contact_widgets.php:130
 msgid "show more"
 msgstr ""
 
-#: ../../include/account.php:23
-msgid "Not a valid email address"
-msgstr ""
-
-#: ../../include/account.php:25
-msgid "Your email domain is not among those allowed on this site"
-msgstr ""
-
-#: ../../include/account.php:31
-msgid "Your email address is already registered at this site."
-msgstr ""
-
-#: ../../include/account.php:64
-msgid "An invitation is required."
-msgstr ""
-
-#: ../../include/account.php:68
-msgid "Invitation could not be verified."
-msgstr ""
-
-#: ../../include/account.php:119
-msgid "Please enter the required information."
-msgstr ""
-
-#: ../../include/account.php:187
-msgid "Failed to store account information."
-msgstr ""
-
-#: ../../include/account.php:245
-#, php-format
-msgid "Registration confirmation for %s"
-msgstr ""
-
-#: ../../include/account.php:313
-#, php-format
-msgid "Registration request at %s"
-msgstr ""
-
-#: ../../include/account.php:315 ../../include/account.php:342
-#: ../../include/account.php:399
-msgid "Administrator"
-msgstr ""
-
-#: ../../include/account.php:337
-msgid "your registration password"
-msgstr ""
-
-#: ../../include/account.php:340 ../../include/account.php:397
-#, php-format
-msgid "Registration details for %s"
-msgstr ""
-
-#: ../../include/account.php:406
-msgid "Account approved."
-msgstr ""
-
-#: ../../include/account.php:440
-#, php-format
-msgid "Registration revoked for %s"
-msgstr ""
-
-#: ../../include/account.php:486
-msgid "Account verified. Please login."
-msgstr ""
-
-#: ../../include/account.php:647 ../../include/account.php:649
-msgid "Click here to upgrade."
-msgstr ""
-
-#: ../../include/account.php:655
-msgid "This action exceeds the limits set by your subscription plan."
-msgstr ""
-
-#: ../../include/account.php:660
-msgid "This action is not available under your subscription plan."
-msgstr ""
-
-#: ../../include/bbcode.php:112 ../../include/bbcode.php:653
-#: ../../include/bbcode.php:656 ../../include/bbcode.php:661
-#: ../../include/bbcode.php:664 ../../include/bbcode.php:667
-#: ../../include/bbcode.php:670 ../../include/bbcode.php:675
-#: ../../include/bbcode.php:678 ../../include/bbcode.php:683
-#: ../../include/bbcode.php:686 ../../include/bbcode.php:689
-#: ../../include/bbcode.php:692
-msgid "Image/photo"
-msgstr ""
-
-#: ../../include/bbcode.php:147 ../../include/bbcode.php:703
-msgid "Encrypted content"
-msgstr ""
-
-#: ../../include/bbcode.php:165
-msgid "Install design element: "
-msgstr ""
-
-#: ../../include/bbcode.php:171
-msgid "QR code"
-msgstr ""
-
-#: ../../include/bbcode.php:220
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr ""
-
-#: ../../include/bbcode.php:222
-msgid "post"
-msgstr ""
-
-#: ../../include/bbcode.php:621
-msgid "$1 spoiler"
-msgstr ""
-
-#: ../../include/bbcode.php:641
-msgid "$1 wrote:"
-msgstr ""
-
-#: ../../include/dir_fns.php:56
-msgid "Sort Options"
-msgstr ""
-
-#: ../../include/dir_fns.php:57
-msgid "Alphabetic"
-msgstr ""
-
-#: ../../include/dir_fns.php:58
-msgid "Reverse Alphabetic"
-msgstr ""
-
-#: ../../include/dir_fns.php:59
-msgid "Newest to Oldest"
-msgstr ""
-
-#: ../../include/dir_fns.php:71
-msgid "Enable Safe Search"
-msgstr ""
-
-#: ../../include/dir_fns.php:73
-msgid "Disable Safe Search"
-msgstr ""
-
-#: ../../include/dir_fns.php:75
-msgid "Safe Mode"
-msgstr ""
-
-#: ../../include/taxonomy.php:210
-msgid "Tags"
-msgstr ""
-
-#: ../../include/taxonomy.php:249
-msgid "Keywords"
-msgstr ""
-
-#: ../../include/taxonomy.php:274
-msgid "have"
-msgstr ""
-
-#: ../../include/taxonomy.php:274
-msgid "has"
-msgstr ""
-
-#: ../../include/taxonomy.php:275
-msgid "want"
-msgstr ""
-
-#: ../../include/taxonomy.php:275
-msgid "wants"
-msgstr ""
-
-#: ../../include/taxonomy.php:276 ../../include/ItemObject.php:221
-msgid "like"
-msgstr ""
-
-#: ../../include/taxonomy.php:276
-msgid "likes"
-msgstr ""
-
-#: ../../include/taxonomy.php:277 ../../include/ItemObject.php:222
-msgid "dislike"
-msgstr ""
-
-#: ../../include/taxonomy.php:277
-msgid "dislikes"
-msgstr ""
-
-#: ../../include/taxonomy.php:360 ../../include/identity.php:1146
-#: ../../include/ItemObject.php:146 ../../mod/photos.php:1023
-msgctxt "noun"
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] ""
-msgstr[1] ""
-
 #: ../../include/enotify.php:41
 msgid "Red Matrix Notification"
 msgstr ""
@@ -1742,410 +1399,515 @@ msgstr ""
 msgid "[Red:Notify]"
 msgstr ""
 
-#: ../../include/chat.php:10
-msgid "Missing room name"
+#: ../../include/event.php:326
+msgid "This event has been added to your calendar."
 msgstr ""
 
-#: ../../include/chat.php:19
-msgid "Duplicate room name"
+#: ../../include/group.php:26
+msgid ""
+"A deleted group with this name was revived. Existing item permissions "
+"<strong>may</strong> apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
 msgstr ""
 
-#: ../../include/chat.php:68 ../../include/chat.php:76
-msgid "Invalid room specifier."
+#: ../../include/group.php:235
+msgid "Default privacy group for new contacts"
 msgstr ""
 
-#: ../../include/chat.php:105
-msgid "Room not found."
+#: ../../include/group.php:254 ../../mod/admin.php:735
+msgid "All Channels"
 msgstr ""
 
-#: ../../include/chat.php:126
-msgid "Room is full"
+#: ../../include/group.php:276
+msgid "edit"
 msgstr ""
 
-#: ../../include/items.php:377 ../../mod/profperm.php:23
-#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/like.php:246
-#: ../../index.php:389
-msgid "Permission denied"
+#: ../../include/group.php:298
+msgid "Collections"
 msgstr ""
 
-#: ../../include/items.php:964 ../../include/items.php:1009
-msgid "(Unknown)"
+#: ../../include/group.php:299
+msgid "Edit collection"
 msgstr ""
 
-#: ../../include/items.php:1165
-msgid "Visible to anybody on the internet."
+#: ../../include/group.php:300
+msgid "Create a new collection"
 msgstr ""
 
-#: ../../include/items.php:1167
-msgid "Visible to you only."
+#: ../../include/group.php:301
+msgid "Channels not in any collection"
 msgstr ""
 
-#: ../../include/items.php:1169
-msgid "Visible to anybody in this network."
+#: ../../include/bbcode.php:112 ../../include/bbcode.php:653
+#: ../../include/bbcode.php:656 ../../include/bbcode.php:661
+#: ../../include/bbcode.php:664 ../../include/bbcode.php:667
+#: ../../include/bbcode.php:670 ../../include/bbcode.php:675
+#: ../../include/bbcode.php:678 ../../include/bbcode.php:683
+#: ../../include/bbcode.php:686 ../../include/bbcode.php:689
+#: ../../include/bbcode.php:692
+msgid "Image/photo"
 msgstr ""
 
-#: ../../include/items.php:1171
-msgid "Visible to anybody authenticated."
+#: ../../include/bbcode.php:147 ../../include/bbcode.php:703
+msgid "Encrypted content"
 msgstr ""
 
-#: ../../include/items.php:1173
+#: ../../include/bbcode.php:165
+msgid "Install design element: "
+msgstr ""
+
+#: ../../include/bbcode.php:171
+msgid "QR code"
+msgstr ""
+
+#: ../../include/bbcode.php:220
 #, php-format
-msgid "Visible to anybody on %s."
+msgid "%1$s wrote the following %2$s %3$s"
 msgstr ""
 
-#: ../../include/items.php:1175
-msgid "Visible to all connections."
+#: ../../include/bbcode.php:222
+msgid "post"
 msgstr ""
 
-#: ../../include/items.php:1177
-msgid "Visible to approved connections."
+#: ../../include/bbcode.php:621
+msgid "$1 spoiler"
 msgstr ""
 
-#: ../../include/items.php:1179
-msgid "Visible to specific connections."
+#: ../../include/bbcode.php:641
+msgid "$1 wrote:"
 msgstr ""
 
-#: ../../include/items.php:3938 ../../mod/display.php:32
-#: ../../mod/filestorage.php:26 ../../mod/admin.php:168
-#: ../../mod/admin.php:898 ../../mod/admin.php:1101 ../../mod/thing.php:76
-#: ../../mod/viewsrc.php:20
-msgid "Item not found."
+#: ../../include/taxonomy.php:210
+msgid "Tags"
 msgstr ""
 
-#: ../../include/items.php:4394 ../../mod/group.php:38 ../../mod/group.php:140
-msgid "Collection not found."
+#: ../../include/taxonomy.php:249
+msgid "Keywords"
 msgstr ""
 
-#: ../../include/items.php:4409
-msgid "Collection is empty."
+#: ../../include/taxonomy.php:274
+msgid "have"
 msgstr ""
 
-#: ../../include/items.php:4416
-#, php-format
-msgid "Collection: %s"
+#: ../../include/taxonomy.php:274
+msgid "has"
 msgstr ""
 
-#: ../../include/items.php:4427
-#, php-format
-msgid "Connection: %s"
+#: ../../include/taxonomy.php:275
+msgid "want"
 msgstr ""
 
-#: ../../include/items.php:4430
-msgid "Connection not found."
+#: ../../include/taxonomy.php:275
+msgid "wants"
 msgstr ""
 
-#: ../../include/text.php:321
-msgid "prev"
+#: ../../include/taxonomy.php:276 ../../include/ItemObject.php:221
+msgid "like"
 msgstr ""
 
-#: ../../include/text.php:323
-msgid "first"
+#: ../../include/taxonomy.php:276
+msgid "likes"
 msgstr ""
 
-#: ../../include/text.php:352
-msgid "last"
+#: ../../include/taxonomy.php:277 ../../include/ItemObject.php:222
+msgid "dislike"
 msgstr ""
 
-#: ../../include/text.php:355
-msgid "next"
+#: ../../include/taxonomy.php:277
+msgid "dislikes"
 msgstr ""
 
-#: ../../include/text.php:367
-msgid "older"
+#: ../../include/taxonomy.php:360 ../../include/identity.php:1148
+#: ../../include/ItemObject.php:146 ../../mod/photos.php:1026
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/nav.php:95 ../../include/nav.php:128 ../../boot.php:1485
+msgid "Logout"
 msgstr ""
 
-#: ../../include/text.php:369
-msgid "newer"
+#: ../../include/nav.php:95 ../../include/nav.php:128
+msgid "End this session"
 msgstr ""
 
-#: ../../include/text.php:736
-msgid "No connections"
+#: ../../include/nav.php:98 ../../include/nav.php:159
+msgid "Home"
+msgstr ""
+
+#: ../../include/nav.php:98
+msgid "Your posts and conversations"
 msgstr ""
 
-#: ../../include/text.php:749
+#: ../../include/nav.php:99
+msgid "Your profile page"
+msgstr ""
+
+#: ../../include/nav.php:101
+msgid "Edit Profiles"
+msgstr ""
+
+#: ../../include/nav.php:101
+msgid "Manage/Edit profiles"
+msgstr ""
+
+#: ../../include/nav.php:103 ../../include/identity.php:864
+msgid "Edit Profile"
+msgstr ""
+
+#: ../../include/nav.php:103
+msgid "Edit your profile"
+msgstr ""
+
+#: ../../include/nav.php:105
+msgid "Your photos"
+msgstr ""
+
+#: ../../include/nav.php:106
+msgid "Your files"
+msgstr ""
+
+#: ../../include/nav.php:111 ../../include/apps.php:144
+msgid "Chat"
+msgstr ""
+
+#: ../../include/nav.php:111
+msgid "Your chatrooms"
+msgstr ""
+
+#: ../../include/nav.php:117
+msgid "Your bookmarks"
+msgstr ""
+
+#: ../../include/nav.php:121
+msgid "Your webpages"
+msgstr ""
+
+#: ../../include/nav.php:125 ../../include/apps.php:129 ../../boot.php:1486
+msgid "Login"
+msgstr ""
+
+#: ../../include/nav.php:125
+msgid "Sign in"
+msgstr ""
+
+#: ../../include/nav.php:142
 #, php-format
-msgid "%d Connection"
-msgid_plural "%d Connections"
-msgstr[0] ""
-msgstr[1] ""
+msgid "%s - click to logout"
+msgstr ""
 
-#: ../../include/text.php:762
-msgid "View Connections"
+#: ../../include/nav.php:145
+msgid "Remote authentication"
 msgstr ""
 
-#: ../../include/text.php:823 ../../include/text.php:835
-#: ../../include/widgets.php:193 ../../mod/rbmark.php:28
-#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 ../../mod/admin.php:1341
-#: ../../mod/admin.php:1362
-msgid "Save"
+#: ../../include/nav.php:145
+msgid "Click to authenticate to your home hub"
 msgstr ""
 
-#: ../../include/text.php:901
-msgid "poke"
+#: ../../include/nav.php:159
+msgid "Home Page"
 msgstr ""
 
-#: ../../include/text.php:902
-msgid "ping"
+#: ../../include/nav.php:163 ../../mod/register.php:224 ../../boot.php:1464
+msgid "Register"
 msgstr ""
 
-#: ../../include/text.php:902
-msgid "pinged"
+#: ../../include/nav.php:163
+msgid "Create an account"
 msgstr ""
 
-#: ../../include/text.php:903
-msgid "prod"
+#: ../../include/nav.php:168 ../../include/apps.php:140 ../../mod/help.php:58
+#: ../../mod/help.php:63
+msgid "Help"
 msgstr ""
 
-#: ../../include/text.php:903
-msgid "prodded"
+#: ../../include/nav.php:168
+msgid "Help and documentation"
 msgstr ""
 
-#: ../../include/text.php:904
-msgid "slap"
+#: ../../include/nav.php:171
+msgid "Applications, utilities, links, games"
 msgstr ""
 
-#: ../../include/text.php:904
-msgid "slapped"
+#: ../../include/nav.php:173 ../../include/text.php:826
+#: ../../include/text.php:838 ../../include/apps.php:145
+#: ../../mod/search.php:30
+msgid "Search"
 msgstr ""
 
-#: ../../include/text.php:905
-msgid "finger"
+#: ../../include/nav.php:173
+msgid "Search site content"
 msgstr ""
 
-#: ../../include/text.php:905
-msgid "fingered"
+#: ../../include/nav.php:176 ../../include/apps.php:139
+#: ../../mod/directory.php:271
+msgid "Directory"
 msgstr ""
 
-#: ../../include/text.php:906
-msgid "rebuff"
+#: ../../include/nav.php:176
+msgid "Channel Directory"
 msgstr ""
 
-#: ../../include/text.php:906
-msgid "rebuffed"
+#: ../../include/nav.php:190 ../../include/apps.php:131
+msgid "Matrix"
 msgstr ""
 
-#: ../../include/text.php:915
-msgid "happy"
+#: ../../include/nav.php:190
+msgid "Your matrix"
 msgstr ""
 
-#: ../../include/text.php:916
-msgid "sad"
+#: ../../include/nav.php:191
+msgid "Mark all matrix notifications seen"
 msgstr ""
 
-#: ../../include/text.php:917
-msgid "mellow"
+#: ../../include/nav.php:193 ../../include/apps.php:135
+msgid "Channel Home"
 msgstr ""
 
-#: ../../include/text.php:918
-msgid "tired"
+#: ../../include/nav.php:193
+msgid "Channel home"
 msgstr ""
 
-#: ../../include/text.php:919
-msgid "perky"
+#: ../../include/nav.php:194
+msgid "Mark all channel notifications seen"
 msgstr ""
 
-#: ../../include/text.php:920
-msgid "angry"
+#: ../../include/nav.php:197 ../../mod/connections.php:406
+msgid "Connections"
 msgstr ""
 
-#: ../../include/text.php:921
-msgid "stupified"
+#: ../../include/nav.php:200
+msgid "Notices"
 msgstr ""
 
-#: ../../include/text.php:922
-msgid "puzzled"
+#: ../../include/nav.php:200
+msgid "Notifications"
 msgstr ""
 
-#: ../../include/text.php:923
-msgid "interested"
+#: ../../include/nav.php:201
+msgid "See all notifications"
 msgstr ""
 
-#: ../../include/text.php:924
-msgid "bitter"
+#: ../../include/nav.php:202 ../../mod/notifications.php:99
+msgid "Mark all system notifications seen"
 msgstr ""
 
-#: ../../include/text.php:925
-msgid "cheerful"
+#: ../../include/nav.php:204 ../../include/apps.php:141
+msgid "Mail"
 msgstr ""
 
-#: ../../include/text.php:926
-msgid "alive"
+#: ../../include/nav.php:204
+msgid "Private mail"
 msgstr ""
 
-#: ../../include/text.php:927
-msgid "annoyed"
+#: ../../include/nav.php:205
+msgid "See all private messages"
 msgstr ""
 
-#: ../../include/text.php:928
-msgid "anxious"
+#: ../../include/nav.php:206
+msgid "Mark all private messages seen"
 msgstr ""
 
-#: ../../include/text.php:929
-msgid "cranky"
+#: ../../include/nav.php:207
+msgid "Inbox"
 msgstr ""
 
-#: ../../include/text.php:930
-msgid "disturbed"
+#: ../../include/nav.php:208
+msgid "Outbox"
 msgstr ""
 
-#: ../../include/text.php:931
-msgid "frustrated"
+#: ../../include/nav.php:212 ../../include/apps.php:138
+#: ../../mod/events.php:431
+msgid "Events"
 msgstr ""
 
-#: ../../include/text.php:932
-msgid "depressed"
+#: ../../include/nav.php:212
+msgid "Event Calendar"
 msgstr ""
 
-#: ../../include/text.php:933
-msgid "motivated"
+#: ../../include/nav.php:213
+msgid "See all events"
 msgstr ""
 
-#: ../../include/text.php:934
-msgid "relaxed"
+#: ../../include/nav.php:214
+msgid "Mark all events seen"
 msgstr ""
 
-#: ../../include/text.php:935
-msgid "surprised"
+#: ../../include/nav.php:216 ../../include/apps.php:130
+#: ../../mod/manage.php:148
+msgid "Channel Manager"
 msgstr ""
 
-#: ../../include/text.php:1099
-msgid "Monday"
+#: ../../include/nav.php:216
+msgid "Manage Your Channels"
 msgstr ""
 
-#: ../../include/text.php:1099
-msgid "Tuesday"
+#: ../../include/nav.php:218
+msgid "Account/Channel Settings"
 msgstr ""
 
-#: ../../include/text.php:1099
-msgid "Wednesday"
+#: ../../include/nav.php:226 ../../mod/admin.php:123
+msgid "Admin"
 msgstr ""
 
-#: ../../include/text.php:1099
-msgid "Thursday"
+#: ../../include/nav.php:226
+msgid "Site Setup and Configuration"
 msgstr ""
 
-#: ../../include/text.php:1099
-msgid "Friday"
+#: ../../include/nav.php:262
+msgid "Please wait..."
 msgstr ""
 
-#: ../../include/text.php:1099
-msgid "Saturday"
+#: ../../include/permissions.php:13
+msgid "Can view my normal stream and posts"
 msgstr ""
 
-#: ../../include/text.php:1099
-msgid "Sunday"
+#: ../../include/permissions.php:14
+msgid "Can view my default channel profile"
 msgstr ""
 
-#: ../../include/text.php:1103
-msgid "January"
+#: ../../include/permissions.php:15
+msgid "Can view my photo albums"
 msgstr ""
 
-#: ../../include/text.php:1103
-msgid "February"
+#: ../../include/permissions.php:16
+msgid "Can view my connections"
 msgstr ""
 
-#: ../../include/text.php:1103
-msgid "March"
+#: ../../include/permissions.php:17
+msgid "Can view my file storage"
 msgstr ""
 
-#: ../../include/text.php:1103
-msgid "April"
+#: ../../include/permissions.php:18
+msgid "Can view my webpages"
 msgstr ""
 
-#: ../../include/text.php:1103
-msgid "May"
+#: ../../include/permissions.php:21
+msgid "Can send me their channel stream and posts"
 msgstr ""
 
-#: ../../include/text.php:1103
-msgid "June"
+#: ../../include/permissions.php:22
+msgid "Can post on my channel page (\"wall\")"
 msgstr ""
 
-#: ../../include/text.php:1103
-msgid "July"
+#: ../../include/permissions.php:23
+msgid "Can comment on or like my posts"
 msgstr ""
 
-#: ../../include/text.php:1103
-msgid "August"
+#: ../../include/permissions.php:24
+msgid "Can send me private mail messages"
 msgstr ""
 
-#: ../../include/text.php:1103
-msgid "September"
+#: ../../include/permissions.php:25
+msgid "Can post photos to my photo albums"
 msgstr ""
 
-#: ../../include/text.php:1103
-msgid "October"
+#: ../../include/permissions.php:26
+msgid "Can like/dislike stuff"
 msgstr ""
 
-#: ../../include/text.php:1103
-msgid "November"
+#: ../../include/permissions.php:26
+msgid "Profiles and things other than posts/comments"
 msgstr ""
 
-#: ../../include/text.php:1103
-msgid "December"
+#: ../../include/permissions.php:28
+msgid "Can forward to all my channel contacts via post @mentions"
 msgstr ""
 
-#: ../../include/text.php:1181
-msgid "unknown.???"
+#: ../../include/permissions.php:28
+msgid "Advanced - useful for creating group forum channels"
 msgstr ""
 
-#: ../../include/text.php:1182
-msgid "bytes"
+#: ../../include/permissions.php:29
+msgid "Can chat with me (when available)"
 msgstr ""
 
-#: ../../include/text.php:1221
-msgid "remove category"
+#: ../../include/permissions.php:30
+msgid "Can write to my file storage"
 msgstr ""
 
-#: ../../include/text.php:1291
-msgid "remove from file"
+#: ../../include/permissions.php:31
+msgid "Can edit my webpages"
 msgstr ""
 
-#: ../../include/text.php:1356 ../../include/text.php:1368
-msgid "Click to open/close"
+#: ../../include/permissions.php:33
+msgid "Can source my public posts in derived channels"
 msgstr ""
 
-#: ../../include/text.php:1523 ../../mod/events.php:409
-msgid "Link to Source"
+#: ../../include/permissions.php:33
+msgid "Somewhat advanced - very useful in open communities"
 msgstr ""
 
-#: ../../include/text.php:1542
-msgid "Select a page layout: "
+#: ../../include/permissions.php:35
+msgid "Can administer my channel resources"
 msgstr ""
 
-#: ../../include/text.php:1545 ../../include/text.php:1610
-msgid "default"
+#: ../../include/permissions.php:35
+msgid "Extremely advanced. Leave this alone unless you know what you are doing"
 msgstr ""
 
-#: ../../include/text.php:1581
-msgid "Page content type: "
+#: ../../include/permissions.php:785
+msgid "Social Networking"
 msgstr ""
 
-#: ../../include/text.php:1622
-msgid "Select an alternate language"
+#: ../../include/permissions.php:786 ../../include/permissions.php:788
+#: ../../include/permissions.php:790
+msgid "Mostly Public"
 msgstr ""
 
-#: ../../include/text.php:1756
-msgid "activity"
+#: ../../include/permissions.php:786 ../../include/permissions.php:788
+#: ../../include/permissions.php:790
+msgid "Restricted"
 msgstr ""
 
-#: ../../include/text.php:2028
-msgid "Design"
+#: ../../include/permissions.php:786 ../../include/permissions.php:788
+msgid "Private"
 msgstr ""
 
-#: ../../include/text.php:2030
-msgid "Blocks"
+#: ../../include/permissions.php:787
+msgid "Community Forum"
 msgstr ""
 
-#: ../../include/text.php:2031
-msgid "Menus"
+#: ../../include/permissions.php:789
+msgid "Feed Republish"
 msgstr ""
 
-#: ../../include/text.php:2032
-msgid "Layouts"
+#: ../../include/permissions.php:791
+msgid "Special Purpose"
 msgstr ""
 
-#: ../../include/text.php:2033
-msgid "Pages"
+#: ../../include/permissions.php:792
+msgid "Celebrity/Soapbox"
+msgstr ""
+
+#: ../../include/permissions.php:792
+msgid "Group Repository"
+msgstr ""
+
+#: ../../include/permissions.php:793 ../../include/profile_selectors.php:6
+#: ../../include/profile_selectors.php:23
+#: ../../include/profile_selectors.php:61
+#: ../../include/profile_selectors.php:97
+msgid "Other"
+msgstr ""
+
+#: ../../include/permissions.php:794
+msgid "Custom/Expert Mode"
+msgstr ""
+
+#: ../../include/Contact.php:123
+msgid "New window"
+msgstr ""
+
+#: ../../include/Contact.php:124
+msgid "Open the selected location in a different window or browser tab"
+msgstr ""
+
+#: ../../include/Contact.php:211 ../../mod/admin.php:646
+#, php-format
+msgid "User '%s' deleted"
 msgstr ""
 
 #: ../../include/features.php:23
@@ -2256,11 +2018,6 @@ msgstr ""
 msgid "Allow previewing posts and comments before publishing them"
 msgstr ""
 
-#: ../../include/features.php:49 ../../include/widgets.php:537
-#: ../../mod/sources.php:88
-msgid "Channel Sources"
-msgstr ""
-
 #: ../../include/features.php:49
 msgid "Automatically import channel content from other channels or feeds"
 msgstr ""
@@ -2294,10 +2051,6 @@ msgstr ""
 msgid "Enable widget to display Network posts only from selected collections"
 msgstr ""
 
-#: ../../include/features.php:58 ../../include/widgets.php:272
-msgid "Saved Searches"
-msgstr ""
-
 #: ../../include/features.php:58
 msgid "Save search terms for re-use"
 msgstr ""
@@ -2390,78 +2143,84 @@ msgstr ""
 msgid "Provide a personal tag cloud on your channel page"
 msgstr ""
 
-#: ../../include/follow.php:28
-msgid "Channel is blocked on this site."
+#: ../../include/account.php:23
+msgid "Not a valid email address"
 msgstr ""
 
-#: ../../include/follow.php:33
-msgid "Channel location missing."
+#: ../../include/account.php:25
+msgid "Your email domain is not among those allowed on this site"
 msgstr ""
 
-#: ../../include/follow.php:82
-msgid "Response from remote channel was incomplete."
+#: ../../include/account.php:31
+msgid "Your email address is already registered at this site."
 msgstr ""
 
-#: ../../include/follow.php:99
-msgid "Channel was deleted and no longer exists."
+#: ../../include/account.php:64
+msgid "An invitation is required."
 msgstr ""
 
-#: ../../include/follow.php:135 ../../include/follow.php:202
-msgid "Protocol disabled."
+#: ../../include/account.php:68
+msgid "Invitation could not be verified."
 msgstr ""
 
-#: ../../include/follow.php:176
-msgid "Channel discovery failed."
+#: ../../include/account.php:119
+msgid "Please enter the required information."
 msgstr ""
 
-#: ../../include/follow.php:192
-msgid "local account not found."
+#: ../../include/account.php:187
+msgid "Failed to store account information."
 msgstr ""
 
-#: ../../include/follow.php:220
-msgid "Cannot connect to yourself."
+#: ../../include/account.php:245
+#, php-format
+msgid "Registration confirmation for %s"
 msgstr ""
 
-#: ../../include/group.php:25
-msgid ""
-"A deleted group with this name was revived. Existing item permissions "
-"<strong>may</strong> apply to this group and any future members. If this is "
-"not what you intended, please create another group with a different name."
+#: ../../include/account.php:313
+#, php-format
+msgid "Registration request at %s"
 msgstr ""
 
-#: ../../include/group.php:234
-msgid "Default privacy group for new contacts"
+#: ../../include/account.php:315 ../../include/account.php:342
+#: ../../include/account.php:399
+msgid "Administrator"
 msgstr ""
 
-#: ../../include/group.php:253 ../../mod/admin.php:737
-msgid "All Channels"
+#: ../../include/account.php:337
+msgid "your registration password"
 msgstr ""
 
-#: ../../include/group.php:275
-msgid "edit"
+#: ../../include/account.php:340 ../../include/account.php:397
+#, php-format
+msgid "Registration details for %s"
 msgstr ""
 
-#: ../../include/group.php:297
-msgid "Collections"
+#: ../../include/account.php:406
+msgid "Account approved."
 msgstr ""
 
-#: ../../include/group.php:298
-msgid "Edit collection"
+#: ../../include/account.php:440
+#, php-format
+msgid "Registration revoked for %s"
 msgstr ""
 
-#: ../../include/group.php:299
-msgid "Create a new collection"
+#: ../../include/account.php:486
+msgid "Account verified. Please login."
 msgstr ""
 
-#: ../../include/group.php:300
-msgid "Channels not in any collection"
+#: ../../include/account.php:648 ../../include/account.php:650
+msgid "Click here to upgrade."
 msgstr ""
 
-#: ../../include/group.php:302 ../../include/widgets.php:273
-msgid "add"
+#: ../../include/account.php:656
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr ""
+
+#: ../../include/account.php:661
+msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: ../../include/identity.php:31 ../../mod/item.php:1361
+#: ../../include/identity.php:31 ../../mod/item.php:1368
 msgid "Unable to obtain identity information from database"
 msgstr ""
 
@@ -2498,27 +2257,19 @@ msgstr ""
 msgid "Default Profile"
 msgstr ""
 
-#: ../../include/identity.php:387 ../../include/identity.php:388
-#: ../../include/identity.php:395 ../../include/widgets.php:431
-#: ../../include/profile_selectors.php:80 ../../mod/settings.php:304
-#: ../../mod/settings.php:308 ../../mod/settings.php:309
-#: ../../mod/settings.php:312 ../../mod/settings.php:323
-#: ../../mod/connedit.php:509
-msgid "Friends"
-msgstr ""
-
 #: ../../include/identity.php:643
 msgid "Requested channel is not available."
 msgstr ""
 
 #: ../../include/identity.php:691 ../../mod/achievements.php:11
-#: ../../mod/profile.php:16 ../../mod/blocks.php:10 ../../mod/connect.php:13
-#: ../../mod/webpages.php:8 ../../mod/filestorage.php:48
-#: ../../mod/layouts.php:8 ../../mod/hcard.php:8
+#: ../../mod/connect.php:13 ../../mod/profile.php:16 ../../mod/blocks.php:29
+#: ../../mod/webpages.php:29 ../../mod/editblock.php:29
+#: ../../mod/editlayout.php:28 ../../mod/editwebpage.php:28
+#: ../../mod/filestorage.php:48 ../../mod/layouts.php:29 ../../mod/hcard.php:8
 msgid "Requested profile is not available."
 msgstr ""
 
-#: ../../include/identity.php:854 ../../mod/profiles.php:722
+#: ../../include/identity.php:854 ../../mod/profiles.php:740
 msgid "Change profile photo"
 msgstr ""
 
@@ -2530,15 +2281,11 @@ msgstr ""
 msgid "Manage/edit profiles"
 msgstr ""
 
-#: ../../include/identity.php:861 ../../mod/profiles.php:723
+#: ../../include/identity.php:861 ../../mod/profiles.php:741
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../include/identity.php:864 ../../include/nav.php:103
-msgid "Edit Profile"
-msgstr ""
-
-#: ../../include/identity.php:875 ../../mod/profiles.php:734
+#: ../../include/identity.php:875 ../../mod/profiles.php:752
 msgid "Profile Image"
 msgstr ""
 
@@ -2546,331 +2293,241 @@ msgstr ""
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../include/identity.php:879 ../../mod/profiles.php:617
-#: ../../mod/profiles.php:738
+#: ../../include/identity.php:879 ../../mod/profiles.php:635
+#: ../../mod/profiles.php:756
 msgid "Edit visibility"
 msgstr ""
 
-#: ../../include/identity.php:893 ../../include/identity.php:1130
-#: ../../mod/directory.php:158
+#: ../../include/identity.php:895 ../../include/identity.php:1132
 msgid "Gender:"
 msgstr ""
 
-#: ../../include/identity.php:894 ../../include/identity.php:1174
-#: ../../mod/directory.php:160
+#: ../../include/identity.php:896 ../../include/identity.php:1176
 msgid "Status:"
 msgstr ""
 
-#: ../../include/identity.php:895 ../../include/identity.php:1185
-#: ../../mod/directory.php:162
+#: ../../include/identity.php:897 ../../include/identity.php:1187
 msgid "Homepage:"
 msgstr ""
 
-#: ../../include/identity.php:896 ../../mod/dirprofile.php:151
+#: ../../include/identity.php:898
 msgid "Online Now"
 msgstr ""
 
-#: ../../include/identity.php:974 ../../include/identity.php:1054
-#: ../../mod/ping.php:316
+#: ../../include/identity.php:976 ../../include/identity.php:1056
+#: ../../mod/ping.php:318
 msgid "g A l F d"
 msgstr ""
 
-#: ../../include/identity.php:975 ../../include/identity.php:1055
+#: ../../include/identity.php:977 ../../include/identity.php:1057
 msgid "F d"
 msgstr ""
 
-#: ../../include/identity.php:1020 ../../include/identity.php:1095
-#: ../../mod/ping.php:338
+#: ../../include/identity.php:1022 ../../include/identity.php:1097
+#: ../../mod/ping.php:340
 msgid "[today]"
 msgstr ""
 
-#: ../../include/identity.php:1032
+#: ../../include/identity.php:1034
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../include/identity.php:1033
+#: ../../include/identity.php:1035
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../include/identity.php:1088
+#: ../../include/identity.php:1090
 msgid "[No description]"
 msgstr ""
 
-#: ../../include/identity.php:1106
+#: ../../include/identity.php:1108
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../include/identity.php:1107
+#: ../../include/identity.php:1109
 msgid "Events this week:"
 msgstr ""
 
-#: ../../include/identity.php:1128 ../../mod/settings.php:984
+#: ../../include/identity.php:1122 ../../include/identity.php:1240
+#: ../../include/apps.php:136 ../../mod/profperm.php:112
+msgid "Profile"
+msgstr ""
+
+#: ../../include/identity.php:1130 ../../mod/settings.php:984
 msgid "Full Name:"
 msgstr ""
 
-#: ../../include/identity.php:1135
+#: ../../include/identity.php:1137
 msgid "Like this channel"
 msgstr ""
 
-#: ../../include/identity.php:1159
+#: ../../include/identity.php:1161
 msgid "j F, Y"
 msgstr ""
 
-#: ../../include/identity.php:1160
+#: ../../include/identity.php:1162
 msgid "j F"
 msgstr ""
 
-#: ../../include/identity.php:1167
+#: ../../include/identity.php:1169
 msgid "Birthday:"
 msgstr ""
 
-#: ../../include/identity.php:1171
+#: ../../include/identity.php:1173
 msgid "Age:"
 msgstr ""
 
-#: ../../include/identity.php:1180
+#: ../../include/identity.php:1182
 #, php-format
 msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/identity.php:1183 ../../mod/profiles.php:639
+#: ../../include/identity.php:1185 ../../mod/profiles.php:657
 msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../include/identity.php:1187 ../../mod/profiles.php:641
+#: ../../include/identity.php:1189 ../../mod/profiles.php:659
 msgid "Hometown:"
 msgstr ""
 
-#: ../../include/identity.php:1189
+#: ../../include/identity.php:1191
 msgid "Tags:"
 msgstr ""
 
-#: ../../include/identity.php:1191 ../../mod/profiles.php:642
+#: ../../include/identity.php:1193 ../../mod/profiles.php:660
 msgid "Political Views:"
 msgstr ""
 
-#: ../../include/identity.php:1193
+#: ../../include/identity.php:1195
 msgid "Religion:"
 msgstr ""
 
-#: ../../include/identity.php:1195 ../../mod/directory.php:164
+#: ../../include/identity.php:1197
 msgid "About:"
 msgstr ""
 
-#: ../../include/identity.php:1197
+#: ../../include/identity.php:1199
 msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/identity.php:1199 ../../mod/profiles.php:645
+#: ../../include/identity.php:1201 ../../mod/profiles.php:663
 msgid "Likes:"
 msgstr ""
 
-#: ../../include/identity.php:1201 ../../mod/profiles.php:646
+#: ../../include/identity.php:1203 ../../mod/profiles.php:664
 msgid "Dislikes:"
 msgstr ""
 
-#: ../../include/identity.php:1204
+#: ../../include/identity.php:1206
 msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../include/identity.php:1206
+#: ../../include/identity.php:1208
 msgid "My other channels:"
 msgstr ""
 
-#: ../../include/identity.php:1208
+#: ../../include/identity.php:1210
 msgid "Musical interests:"
 msgstr ""
 
-#: ../../include/identity.php:1210
+#: ../../include/identity.php:1212
 msgid "Books, literature:"
 msgstr ""
 
-#: ../../include/identity.php:1212
+#: ../../include/identity.php:1214
 msgid "Television:"
 msgstr ""
 
-#: ../../include/identity.php:1214
+#: ../../include/identity.php:1216
 msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../include/identity.php:1216
+#: ../../include/identity.php:1218
 msgid "Love/Romance:"
 msgstr ""
 
-#: ../../include/identity.php:1218
+#: ../../include/identity.php:1220
 msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/identity.php:1220
+#: ../../include/identity.php:1222
 msgid "School/education:"
 msgstr ""
 
-#: ../../include/identity.php:1240
+#: ../../include/identity.php:1242
 msgid "Like this thing"
 msgstr ""
 
-#: ../../include/widgets.php:86 ../../include/nav.php:171
-#: ../../mod/apps.php:33
-msgid "Apps"
-msgstr ""
-
-#: ../../include/widgets.php:87
-msgid "System"
+#: ../../include/items.php:377 ../../mod/profperm.php:23
+#: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/like.php:246
+#: ../../index.php:389
+msgid "Permission denied"
 msgstr ""
 
-#: ../../include/widgets.php:90
-msgid "Create Personal App"
+#: ../../include/items.php:964 ../../include/items.php:1009
+msgid "(Unknown)"
 msgstr ""
 
-#: ../../include/widgets.php:91
-msgid "Edit Personal App"
+#: ../../include/items.php:1165
+msgid "Visible to anybody on the internet."
 msgstr ""
 
-#: ../../include/widgets.php:137 ../../mod/suggest.php:53
-msgid "Ignore/Hide"
+#: ../../include/items.php:1167
+msgid "Visible to you only."
 msgstr ""
 
-#: ../../include/widgets.php:143 ../../mod/connections.php:267
-msgid "Suggestions"
+#: ../../include/items.php:1169
+msgid "Visible to anybody in this network."
 msgstr ""
 
-#: ../../include/widgets.php:144
-msgid "See more..."
+#: ../../include/items.php:1171
+msgid "Visible to anybody authenticated."
 msgstr ""
 
-#: ../../include/widgets.php:166
+#: ../../include/items.php:1173
 #, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
-msgstr ""
-
-#: ../../include/widgets.php:172
-msgid "Add New Connection"
-msgstr ""
-
-#: ../../include/widgets.php:173
-msgid "Enter the channel address"
-msgstr ""
-
-#: ../../include/widgets.php:174
-msgid "Example: bob@example.com, http://example.com/barbara"
-msgstr ""
-
-#: ../../include/widgets.php:191
-msgid "Notes"
-msgstr ""
-
-#: ../../include/widgets.php:263
-msgid "Remove term"
-msgstr ""
-
-#: ../../include/widgets.php:352
-msgid "Archives"
-msgstr ""
-
-#: ../../include/widgets.php:428
-msgid "Refresh"
-msgstr ""
-
-#: ../../include/widgets.php:429 ../../mod/connedit.php:506
-msgid "Me"
-msgstr ""
-
-#: ../../include/widgets.php:430 ../../mod/connedit.php:508
-msgid "Best Friends"
-msgstr ""
-
-#: ../../include/widgets.php:432
-msgid "Co-workers"
-msgstr ""
-
-#: ../../include/widgets.php:433 ../../mod/connedit.php:510
-msgid "Former Friends"
-msgstr ""
-
-#: ../../include/widgets.php:434 ../../mod/connedit.php:511
-msgid "Acquaintances"
-msgstr ""
-
-#: ../../include/widgets.php:435
-msgid "Everybody"
-msgstr ""
-
-#: ../../include/widgets.php:469
-msgid "Account settings"
-msgstr ""
-
-#: ../../include/widgets.php:475
-msgid "Channel settings"
-msgstr ""
-
-#: ../../include/widgets.php:481
-msgid "Additional features"
-msgstr ""
-
-#: ../../include/widgets.php:487
-msgid "Feature settings"
-msgstr ""
-
-#: ../../include/widgets.php:493
-msgid "Display settings"
-msgstr ""
-
-#: ../../include/widgets.php:499
-msgid "Connected apps"
-msgstr ""
-
-#: ../../include/widgets.php:505
-msgid "Export channel"
-msgstr ""
-
-#: ../../include/widgets.php:511
-msgid "Export content"
-msgstr ""
-
-#: ../../include/widgets.php:520 ../../mod/connedit.php:538
-msgid "Connection Default Permissions"
-msgstr ""
-
-#: ../../include/widgets.php:528
-msgid "Premium Channel Settings"
+msgid "Visible to anybody on %s."
 msgstr ""
 
-#: ../../include/widgets.php:562 ../../mod/mail.php:124
-#: ../../mod/message.php:31
-msgid "Messages"
+#: ../../include/items.php:1175
+msgid "Visible to all connections."
 msgstr ""
 
-#: ../../include/widgets.php:567
-msgid "Check Mail"
+#: ../../include/items.php:1177
+msgid "Visible to approved connections."
 msgstr ""
 
-#: ../../include/widgets.php:572 ../../include/nav.php:209
-msgid "New Message"
+#: ../../include/items.php:1179
+msgid "Visible to specific connections."
 msgstr ""
 
-#: ../../include/widgets.php:648
-msgid "Chat Rooms"
+#: ../../include/items.php:3946 ../../mod/thing.php:76
+#: ../../mod/display.php:32 ../../mod/filestorage.php:26
+#: ../../mod/admin.php:168 ../../mod/admin.php:896 ../../mod/admin.php:1099
+#: ../../mod/viewsrc.php:20
+msgid "Item not found."
 msgstr ""
 
-#: ../../include/widgets.php:666
-msgid "Bookmarked Chatrooms"
+#: ../../include/items.php:4402 ../../mod/group.php:38 ../../mod/group.php:140
+msgid "Collection not found."
 msgstr ""
 
-#: ../../include/widgets.php:684
-msgid "Suggested Chatrooms"
+#: ../../include/items.php:4417
+msgid "Collection is empty."
 msgstr ""
 
-#: ../../include/Contact.php:123
-msgid "New window"
+#: ../../include/items.php:4424
+#, php-format
+msgid "Collection: %s"
 msgstr ""
 
-#: ../../include/Contact.php:124
-msgid "Open the selected location in a different window or browser tab"
+#: ../../include/items.php:4435
+#, php-format
+msgid "Connection: %s"
 msgstr ""
 
-#: ../../include/Contact.php:211 ../../mod/admin.php:649
-#, php-format
-msgid "User '%s' deleted"
+#: ../../include/items.php:4438
+msgid "Connection not found."
 msgstr ""
 
 #: ../../include/message.php:18
@@ -2889,249 +2546,200 @@ msgstr ""
 msgid "Stored post could not be verified."
 msgstr ""
 
-#: ../../include/nav.php:95 ../../include/nav.php:128 ../../boot.php:1512
-msgid "Logout"
-msgstr ""
-
-#: ../../include/nav.php:95 ../../include/nav.php:128
-msgid "End this session"
-msgstr ""
-
-#: ../../include/nav.php:98 ../../include/nav.php:159
-msgid "Home"
-msgstr ""
-
-#: ../../include/nav.php:98
-msgid "Your posts and conversations"
-msgstr ""
-
-#: ../../include/nav.php:99
-msgid "Your profile page"
-msgstr ""
-
-#: ../../include/nav.php:101
-msgid "Edit Profiles"
-msgstr ""
-
-#: ../../include/nav.php:101
-msgid "Manage/Edit profiles"
-msgstr ""
-
-#: ../../include/nav.php:103
-msgid "Edit your profile"
-msgstr ""
-
-#: ../../include/nav.php:105
-msgid "Your photos"
-msgstr ""
-
-#: ../../include/nav.php:106
-msgid "Your files"
+#: ../../include/network.php:590
+msgid "view full size"
 msgstr ""
 
-#: ../../include/nav.php:111
-msgid "Your chatrooms"
+#: ../../include/attach.php:221 ../../include/attach.php:275
+msgid "Item was not found."
 msgstr ""
 
-#: ../../include/nav.php:117
-msgid "Your bookmarks"
+#: ../../include/attach.php:331
+msgid "No source file."
 msgstr ""
 
-#: ../../include/nav.php:121
-msgid "Your webpages"
+#: ../../include/attach.php:348
+msgid "Cannot locate file to replace"
 msgstr ""
 
-#: ../../include/nav.php:125
-msgid "Sign in"
+#: ../../include/attach.php:366
+msgid "Cannot locate file to revise/update"
 msgstr ""
 
-#: ../../include/nav.php:142
+#: ../../include/attach.php:377
 #, php-format
-msgid "%s - click to logout"
-msgstr ""
-
-#: ../../include/nav.php:145
-msgid "Remote authentication"
-msgstr ""
-
-#: ../../include/nav.php:145
-msgid "Click to authenticate to your home hub"
-msgstr ""
-
-#: ../../include/nav.php:159
-msgid "Home Page"
-msgstr ""
-
-#: ../../include/nav.php:163 ../../mod/register.php:220 ../../boot.php:1489
-msgid "Register"
-msgstr ""
-
-#: ../../include/nav.php:163
-msgid "Create an account"
+msgid "File exceeds size limit of %d"
 msgstr ""
 
-#: ../../include/nav.php:168
-msgid "Help and documentation"
+#: ../../include/attach.php:389
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
 msgstr ""
 
-#: ../../include/nav.php:171
-msgid "Applications, utilities, links, games"
+#: ../../include/attach.php:472
+msgid "File upload failed. Possible system limit or action terminated."
 msgstr ""
 
-#: ../../include/nav.php:173
-msgid "Search site content"
+#: ../../include/attach.php:484
+msgid "Stored file could not be verified. Upload failed."
 msgstr ""
 
-#: ../../include/nav.php:176
-msgid "Channel Locator"
+#: ../../include/attach.php:526 ../../include/attach.php:543
+msgid "Path not available."
 msgstr ""
 
-#: ../../include/nav.php:190
-msgid "Your matrix"
+#: ../../include/attach.php:589
+msgid "Empty pathname"
 msgstr ""
 
-#: ../../include/nav.php:191
-msgid "Mark all matrix notifications seen"
+#: ../../include/attach.php:605
+msgid "duplicate filename or path"
 msgstr ""
 
-#: ../../include/nav.php:193
-msgid "Channel home"
+#: ../../include/attach.php:629
+msgid "Path not found."
 msgstr ""
 
-#: ../../include/nav.php:194
-msgid "Mark all channel notifications seen"
+#: ../../include/attach.php:680
+msgid "mkdir failed."
 msgstr ""
 
-#: ../../include/nav.php:197 ../../mod/connections.php:406
-msgid "Connections"
+#: ../../include/attach.php:684
+msgid "database storage failed."
 msgstr ""
 
-#: ../../include/nav.php:200
-msgid "Notices"
+#: ../../include/auth.php:116
+msgid "Logged out."
 msgstr ""
 
-#: ../../include/nav.php:200
-msgid "Notifications"
+#: ../../include/auth.php:257
+msgid "Failed authentication"
 msgstr ""
 
-#: ../../include/nav.php:201
-msgid "See all notifications"
+#: ../../include/auth.php:271 ../../mod/openid.php:190
+msgid "Login failed."
 msgstr ""
 
-#: ../../include/nav.php:202 ../../mod/notifications.php:99
-msgid "Mark all system notifications seen"
+#: ../../include/datetime.php:43 ../../include/datetime.php:45
+msgid "Miscellaneous"
 msgstr ""
 
-#: ../../include/nav.php:204
-msgid "Private mail"
+#: ../../include/datetime.php:142
+msgid "YYYY-MM-DD or MM-DD"
 msgstr ""
 
-#: ../../include/nav.php:205
-msgid "See all private messages"
+#: ../../include/datetime.php:248
+msgid "never"
 msgstr ""
 
-#: ../../include/nav.php:206
-msgid "Mark all private messages seen"
+#: ../../include/datetime.php:254
+msgid "less than a second ago"
 msgstr ""
 
-#: ../../include/nav.php:207
-msgid "Inbox"
+#: ../../include/datetime.php:257
+msgid "year"
 msgstr ""
 
-#: ../../include/nav.php:208
-msgid "Outbox"
+#: ../../include/datetime.php:257
+msgid "years"
 msgstr ""
 
-#: ../../include/nav.php:212
-msgid "Event Calendar"
+#: ../../include/datetime.php:258
+msgid "month"
 msgstr ""
 
-#: ../../include/nav.php:213
-msgid "See all events"
+#: ../../include/datetime.php:258
+msgid "months"
 msgstr ""
 
-#: ../../include/nav.php:214
-msgid "Mark all events seen"
+#: ../../include/datetime.php:259
+msgid "week"
 msgstr ""
 
-#: ../../include/nav.php:216
-msgid "Manage Your Channels"
+#: ../../include/datetime.php:259
+msgid "weeks"
 msgstr ""
 
-#: ../../include/nav.php:218
-msgid "Account/Channel Settings"
+#: ../../include/datetime.php:260
+msgid "day"
 msgstr ""
 
-#: ../../include/nav.php:226 ../../mod/admin.php:123
-msgid "Admin"
+#: ../../include/datetime.php:260
+msgid "days"
 msgstr ""
 
-#: ../../include/nav.php:226
-msgid "Site Setup and Configuration"
+#: ../../include/datetime.php:261
+msgid "hour"
 msgstr ""
 
-#: ../../include/nav.php:262
-msgid "Please wait..."
+#: ../../include/datetime.php:261
+msgid "hours"
 msgstr ""
 
-#: ../../include/network.php:590
-msgid "view full size"
+#: ../../include/datetime.php:262
+msgid "minute"
 msgstr ""
 
-#: ../../include/acl_selectors.php:240
-msgid "Visible to your default audience"
+#: ../../include/datetime.php:262
+msgid "minutes"
 msgstr ""
 
-#: ../../include/acl_selectors.php:241
-msgid "Show"
+#: ../../include/datetime.php:263
+msgid "second"
 msgstr ""
 
-#: ../../include/acl_selectors.php:242
-msgid "Don't show"
+#: ../../include/datetime.php:263
+msgid "seconds"
 msgstr ""
 
-#: ../../include/acl_selectors.php:248 ../../mod/photos.php:589
-#: ../../mod/photos.php:948 ../../mod/events.php:585 ../../mod/chat.php:209
-#: ../../mod/filestorage.php:137
-msgid "Permissions"
+#: ../../include/datetime.php:272
+#, php-format
+msgid "%1$d %2$s ago"
 msgstr ""
 
-#: ../../include/acl_selectors.php:249 ../../include/ItemObject.php:305
-#: ../../mod/photos.php:1145
-msgid "Close"
+#: ../../include/datetime.php:480
+#, php-format
+msgid "%1$s's birthday"
 msgstr ""
 
-#: ../../include/api.php:1084
-msgid "Public Timeline"
+#: ../../include/datetime.php:481
+#, php-format
+msgid "Happy Birthday %1$s"
 msgstr ""
 
-#: ../../include/photos.php:104
+#: ../../include/photos.php:105
 #, php-format
 msgid "Image exceeds website size limit of %lu bytes"
 msgstr ""
 
-#: ../../include/photos.php:111
+#: ../../include/photos.php:112
 msgid "Image file is empty."
 msgstr ""
 
-#: ../../include/photos.php:140 ../../mod/profile_photo.php:216
+#: ../../include/photos.php:141 ../../mod/profile_photo.php:216
 msgid "Unable to process image"
 msgstr ""
 
-#: ../../include/photos.php:212
+#: ../../include/photos.php:213
 msgid "Photo storage failed."
 msgstr ""
 
-#: ../../include/photos.php:344
+#: ../../include/photos.php:345
 msgid "Upload New Photos"
 msgstr ""
 
+#: ../../include/security.php:323
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
+msgstr ""
+
 #: ../../include/js_strings.php:5
 msgid "Delete this item?"
 msgstr ""
 
 #: ../../include/js_strings.php:6 ../../include/ItemObject.php:598
-#: ../../mod/photos.php:992 ../../mod/photos.php:1102
+#: ../../mod/photos.php:995 ../../mod/photos.php:1105
 msgid "Comment"
 msgstr ""
 
@@ -3492,16 +3100,407 @@ msgstr ""
 msgid "Ask me"
 msgstr ""
 
+#: ../../include/text.php:321
+msgid "prev"
+msgstr ""
+
+#: ../../include/text.php:323
+msgid "first"
+msgstr ""
+
+#: ../../include/text.php:352
+msgid "last"
+msgstr ""
+
+#: ../../include/text.php:355
+msgid "next"
+msgstr ""
+
+#: ../../include/text.php:367
+msgid "older"
+msgstr ""
+
+#: ../../include/text.php:369
+msgid "newer"
+msgstr ""
+
+#: ../../include/text.php:736
+msgid "No connections"
+msgstr ""
+
+#: ../../include/text.php:753
+#, php-format
+msgid "%d Connection"
+msgid_plural "%d Connections"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/text.php:766
+msgid "View Connections"
+msgstr ""
+
+#: ../../include/text.php:905
+msgid "poke"
+msgstr ""
+
+#: ../../include/text.php:906
+msgid "ping"
+msgstr ""
+
+#: ../../include/text.php:906
+msgid "pinged"
+msgstr ""
+
+#: ../../include/text.php:907
+msgid "prod"
+msgstr ""
+
+#: ../../include/text.php:907
+msgid "prodded"
+msgstr ""
+
+#: ../../include/text.php:908
+msgid "slap"
+msgstr ""
+
+#: ../../include/text.php:908
+msgid "slapped"
+msgstr ""
+
+#: ../../include/text.php:909
+msgid "finger"
+msgstr ""
+
+#: ../../include/text.php:909
+msgid "fingered"
+msgstr ""
+
+#: ../../include/text.php:910
+msgid "rebuff"
+msgstr ""
+
+#: ../../include/text.php:910
+msgid "rebuffed"
+msgstr ""
+
+#: ../../include/text.php:919
+msgid "happy"
+msgstr ""
+
+#: ../../include/text.php:920
+msgid "sad"
+msgstr ""
+
+#: ../../include/text.php:921
+msgid "mellow"
+msgstr ""
+
+#: ../../include/text.php:922
+msgid "tired"
+msgstr ""
+
+#: ../../include/text.php:923
+msgid "perky"
+msgstr ""
+
+#: ../../include/text.php:924
+msgid "angry"
+msgstr ""
+
+#: ../../include/text.php:925
+msgid "stupified"
+msgstr ""
+
+#: ../../include/text.php:926
+msgid "puzzled"
+msgstr ""
+
+#: ../../include/text.php:927
+msgid "interested"
+msgstr ""
+
+#: ../../include/text.php:928
+msgid "bitter"
+msgstr ""
+
+#: ../../include/text.php:929
+msgid "cheerful"
+msgstr ""
+
+#: ../../include/text.php:930
+msgid "alive"
+msgstr ""
+
+#: ../../include/text.php:931
+msgid "annoyed"
+msgstr ""
+
+#: ../../include/text.php:932
+msgid "anxious"
+msgstr ""
+
+#: ../../include/text.php:933
+msgid "cranky"
+msgstr ""
+
+#: ../../include/text.php:934
+msgid "disturbed"
+msgstr ""
+
+#: ../../include/text.php:935
+msgid "frustrated"
+msgstr ""
+
+#: ../../include/text.php:936
+msgid "depressed"
+msgstr ""
+
+#: ../../include/text.php:937
+msgid "motivated"
+msgstr ""
+
+#: ../../include/text.php:938
+msgid "relaxed"
+msgstr ""
+
+#: ../../include/text.php:939
+msgid "surprised"
+msgstr ""
+
+#: ../../include/text.php:1103
+msgid "Monday"
+msgstr ""
+
+#: ../../include/text.php:1103
+msgid "Tuesday"
+msgstr ""
+
+#: ../../include/text.php:1103
+msgid "Wednesday"
+msgstr ""
+
+#: ../../include/text.php:1103
+msgid "Thursday"
+msgstr ""
+
+#: ../../include/text.php:1103
+msgid "Friday"
+msgstr ""
+
+#: ../../include/text.php:1103
+msgid "Saturday"
+msgstr ""
+
+#: ../../include/text.php:1103
+msgid "Sunday"
+msgstr ""
+
+#: ../../include/text.php:1107
+msgid "January"
+msgstr ""
+
+#: ../../include/text.php:1107
+msgid "February"
+msgstr ""
+
+#: ../../include/text.php:1107
+msgid "March"
+msgstr ""
+
+#: ../../include/text.php:1107
+msgid "April"
+msgstr ""
+
+#: ../../include/text.php:1107
+msgid "May"
+msgstr ""
+
+#: ../../include/text.php:1107
+msgid "June"
+msgstr ""
+
+#: ../../include/text.php:1107
+msgid "July"
+msgstr ""
+
+#: ../../include/text.php:1107
+msgid "August"
+msgstr ""
+
+#: ../../include/text.php:1107
+msgid "September"
+msgstr ""
+
+#: ../../include/text.php:1107
+msgid "October"
+msgstr ""
+
+#: ../../include/text.php:1107
+msgid "November"
+msgstr ""
+
+#: ../../include/text.php:1107
+msgid "December"
+msgstr ""
+
+#: ../../include/text.php:1185
+msgid "unknown.???"
+msgstr ""
+
+#: ../../include/text.php:1186
+msgid "bytes"
+msgstr ""
+
+#: ../../include/text.php:1225
+msgid "remove category"
+msgstr ""
+
+#: ../../include/text.php:1295
+msgid "remove from file"
+msgstr ""
+
+#: ../../include/text.php:1360 ../../include/text.php:1372
+msgid "Click to open/close"
+msgstr ""
+
+#: ../../include/text.php:1527 ../../mod/events.php:409
+msgid "Link to Source"
+msgstr ""
+
+#: ../../include/text.php:1546
+msgid "Select a page layout: "
+msgstr ""
+
+#: ../../include/text.php:1549 ../../include/text.php:1614
+msgid "default"
+msgstr ""
+
+#: ../../include/text.php:1585
+msgid "Page content type: "
+msgstr ""
+
+#: ../../include/text.php:1626
+msgid "Select an alternate language"
+msgstr ""
+
+#: ../../include/text.php:1760
+msgid "activity"
+msgstr ""
+
+#: ../../include/text.php:2041
+msgid "Design"
+msgstr ""
+
+#: ../../include/text.php:2044
+msgid "Blocks"
+msgstr ""
+
+#: ../../include/text.php:2045
+msgid "Menus"
+msgstr ""
+
+#: ../../include/text.php:2046
+msgid "Layouts"
+msgstr ""
+
+#: ../../include/text.php:2047
+msgid "Pages"
+msgstr ""
+
+#: ../../include/acl_selectors.php:240
+msgid "Visible to your default audience"
+msgstr ""
+
+#: ../../include/acl_selectors.php:241
+msgid "Show"
+msgstr ""
+
+#: ../../include/acl_selectors.php:242
+msgid "Don't show"
+msgstr ""
+
+#: ../../include/acl_selectors.php:248 ../../mod/events.php:585
+#: ../../mod/chat.php:209 ../../mod/photos.php:588 ../../mod/photos.php:950
+#: ../../mod/filestorage.php:137
+msgid "Permissions"
+msgstr ""
+
+#: ../../include/acl_selectors.php:249 ../../include/ItemObject.php:305
+#: ../../mod/photos.php:1148
+msgid "Close"
+msgstr ""
+
+#: ../../include/api.php:1084
+msgid "Public Timeline"
+msgstr ""
+
+#: ../../include/apps.php:126
+msgid "Site Admin"
+msgstr ""
+
+#: ../../include/apps.php:128
+msgid "Address Book"
+msgstr ""
+
+#: ../../include/apps.php:142 ../../mod/mood.php:131
+msgid "Mood"
+msgstr ""
+
+#: ../../include/apps.php:146
+msgid "Probe"
+msgstr ""
+
+#: ../../include/apps.php:147
+msgid "Suggest"
+msgstr ""
+
+#: ../../include/apps.php:148
+msgid "Random Channel"
+msgstr ""
+
+#: ../../include/apps.php:149
+msgid "Invite"
+msgstr ""
+
+#: ../../include/apps.php:150
+msgid "Features"
+msgstr ""
+
+#: ../../include/apps.php:151
+msgid "Language"
+msgstr ""
+
+#: ../../include/apps.php:152
+msgid "Post"
+msgstr ""
+
+#: ../../include/apps.php:153
+msgid "Profile Photo"
+msgstr ""
+
+#: ../../include/apps.php:242 ../../mod/settings.php:81
+#: ../../mod/settings.php:575
+msgid "Update"
+msgstr ""
+
+#: ../../include/apps.php:242
+msgid "Install"
+msgstr ""
+
+#: ../../include/apps.php:247
+msgid "Purchase"
+msgstr ""
+
 #: ../../include/ItemObject.php:130
 msgid "Save to Folder"
 msgstr ""
 
 #: ../../include/ItemObject.php:142 ../../include/ItemObject.php:154
-#: ../../mod/photos.php:1019 ../../mod/photos.php:1031
+#: ../../mod/photos.php:1022 ../../mod/photos.php:1034
 msgid "View all"
 msgstr ""
 
-#: ../../include/ItemObject.php:151 ../../mod/photos.php:1028
+#: ../../include/ItemObject.php:151 ../../mod/photos.php:1031
 msgctxt "noun"
 msgid "Dislike"
 msgid_plural "Dislikes"
@@ -3528,11 +3527,11 @@ msgstr ""
 msgid "Add Tag"
 msgstr ""
 
-#: ../../include/ItemObject.php:221 ../../mod/photos.php:971
+#: ../../include/ItemObject.php:221 ../../mod/photos.php:974
 msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../include/ItemObject.php:222 ../../mod/photos.php:972
+#: ../../include/ItemObject.php:222 ../../mod/photos.php:975
 msgid "I don't like this (toggle)"
 msgstr ""
 
@@ -3573,12 +3572,12 @@ msgstr ""
 msgid "Add to Calendar"
 msgstr ""
 
-#: ../../include/ItemObject.php:299 ../../mod/photos.php:1139
+#: ../../include/ItemObject.php:299 ../../mod/photos.php:1142
 msgctxt "noun"
 msgid "Likes"
 msgstr ""
 
-#: ../../include/ItemObject.php:300 ../../mod/photos.php:1140
+#: ../../include/ItemObject.php:300 ../../mod/photos.php:1143
 msgctxt "noun"
 msgid "Dislikes"
 msgstr ""
@@ -3590,27 +3589,27 @@ msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/ItemObject.php:596 ../../mod/photos.php:990
-#: ../../mod/photos.php:1100
+#: ../../include/ItemObject.php:596 ../../mod/photos.php:993
+#: ../../mod/photos.php:1103
 msgid "This is you"
 msgstr ""
 
 #: ../../include/ItemObject.php:599 ../../mod/mood.php:135
-#: ../../mod/photos.php:595 ../../mod/photos.php:669 ../../mod/photos.php:953
-#: ../../mod/photos.php:993 ../../mod/photos.php:1103
-#: ../../mod/settings.php:549 ../../mod/settings.php:661
-#: ../../mod/settings.php:690 ../../mod/settings.php:714
-#: ../../mod/settings.php:790 ../../mod/settings.php:976
-#: ../../mod/poke.php:166 ../../mod/profiles.php:615 ../../mod/events.php:587
-#: ../../mod/chat.php:177 ../../mod/chat.php:211 ../../mod/connect.php:92
-#: ../../mod/connedit.php:555 ../../mod/setup.php:307 ../../mod/setup.php:350
-#: ../../mod/pdledit.php:58 ../../mod/sources.php:104
-#: ../../mod/sources.php:138 ../../mod/filestorage.php:146
-#: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/admin.php:414
-#: ../../mod/admin.php:725 ../../mod/admin.php:861 ../../mod/admin.php:994
-#: ../../mod/admin.php:1193 ../../mod/admin.php:1280 ../../mod/thing.php:284
-#: ../../mod/thing.php:327 ../../mod/import.php:480 ../../mod/invite.php:142
-#: ../../mod/locs.php:99 ../../mod/mail.php:348 ../../mod/appman.php:99
+#: ../../mod/profiles.php:633 ../../mod/connect.php:92 ../../mod/setup.php:313
+#: ../../mod/setup.php:358 ../../mod/poke.php:166 ../../mod/sources.php:104
+#: ../../mod/sources.php:138 ../../mod/events.php:587 ../../mod/chat.php:177
+#: ../../mod/chat.php:211 ../../mod/photos.php:594 ../../mod/photos.php:671
+#: ../../mod/photos.php:956 ../../mod/photos.php:996 ../../mod/photos.php:1106
+#: ../../mod/connedit.php:555 ../../mod/thing.php:284 ../../mod/thing.php:327
+#: ../../mod/pdledit.php:58 ../../mod/settings.php:549
+#: ../../mod/settings.php:661 ../../mod/settings.php:690
+#: ../../mod/settings.php:714 ../../mod/settings.php:790
+#: ../../mod/settings.php:976 ../../mod/fsuggest.php:108
+#: ../../mod/filestorage.php:146 ../../mod/group.php:81
+#: ../../mod/import.php:480 ../../mod/admin.php:412 ../../mod/admin.php:723
+#: ../../mod/admin.php:859 ../../mod/admin.php:992 ../../mod/admin.php:1191
+#: ../../mod/admin.php:1278 ../../mod/invite.php:142 ../../mod/locs.php:99
+#: ../../mod/mail.php:348 ../../mod/xchan.php:11 ../../mod/appman.php:99
 #: ../../mod/poll.php:68 ../../view/theme/apw/php/config.php:256
 #: ../../view/theme/blogga/php/config.php:67
 #: ../../view/theme/blogga/view/theme/blog/config.php:67
@@ -3654,273 +3653,139 @@ msgstr ""
 msgid "Set your current mood and tell your friends"
 msgstr ""
 
-#: ../../mod/photos.php:77
-msgid "Page owner information could not be retrieved."
-msgstr ""
-
-#: ../../mod/photos.php:97
-msgid "Album not found."
-msgstr ""
-
-#: ../../mod/photos.php:119 ../../mod/photos.php:670
-msgid "Delete Album"
-msgstr ""
-
-#: ../../mod/photos.php:159 ../../mod/photos.php:954
-msgid "Delete Photo"
-msgstr ""
-
-#: ../../mod/photos.php:459 ../../mod/search.php:13 ../../mod/directory.php:15
-#: ../../mod/dirprofile.php:9 ../../mod/display.php:9
-#: ../../mod/viewconnections.php:17
-msgid "Public access denied."
-msgstr ""
-
-#: ../../mod/photos.php:470
-msgid "No photos selected"
-msgstr ""
-
-#: ../../mod/photos.php:514
-msgid "Access to this item is restricted."
-msgstr ""
-
-#: ../../mod/photos.php:553
-#, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
-msgstr ""
-
-#: ../../mod/photos.php:556
-#, php-format
-msgid "%1$.2f MB photo storage used."
-msgstr ""
-
-#: ../../mod/photos.php:580
-msgid "Upload Photos"
-msgstr ""
-
-#: ../../mod/photos.php:584 ../../mod/photos.php:663 ../../mod/photos.php:941
-msgid "Enter a new album name"
-msgstr ""
-
-#: ../../mod/photos.php:585 ../../mod/photos.php:664 ../../mod/photos.php:942
-msgid "or select an existing one (doubleclick)"
-msgstr ""
-
-#: ../../mod/photos.php:586
-msgid "Do not show a status post for this upload"
-msgstr ""
-
-#: ../../mod/photos.php:614
-msgid "Album name could not be decoded"
-msgstr ""
-
-#: ../../mod/photos.php:652 ../../mod/photos.php:1163
-#: ../../mod/photos.php:1178
-msgid "Contact Photos"
-msgstr ""
-
-#: ../../mod/photos.php:676
-msgid "Show Newest First"
-msgstr ""
-
-#: ../../mod/photos.php:678
-msgid "Show Oldest First"
-msgstr ""
-
-#: ../../mod/photos.php:705 ../../mod/photos.php:1210
-msgid "View Photo"
-msgstr ""
-
-#: ../../mod/photos.php:734
-msgid "Edit Album"
-msgstr ""
-
-#: ../../mod/photos.php:779
-msgid "Permission denied. Access to this item may be restricted."
-msgstr ""
-
-#: ../../mod/photos.php:781
-msgid "Photo not available"
-msgstr ""
-
-#: ../../mod/photos.php:839
-msgid "Use as profile photo"
-msgstr ""
-
-#: ../../mod/photos.php:846
-msgid "Private Photo"
-msgstr ""
-
-#: ../../mod/photos.php:857 ../../mod/events.php:433
-msgid "Previous"
-msgstr ""
-
-#: ../../mod/photos.php:861
-msgid "View Full Size"
-msgstr ""
-
-#: ../../mod/photos.php:866 ../../mod/events.php:434 ../../mod/setup.php:261
-msgid "Next"
-msgstr ""
-
-#: ../../mod/photos.php:903 ../../mod/delegate.php:130 ../../mod/tagrm.php:133
-msgid "Remove"
-msgstr ""
-
-#: ../../mod/photos.php:935
-msgid "Edit photo"
-msgstr ""
-
-#: ../../mod/photos.php:937
-msgid "Rotate CW (right)"
-msgstr ""
-
-#: ../../mod/photos.php:938
-msgid "Rotate CCW (left)"
-msgstr ""
-
-#: ../../mod/photos.php:945
-msgid "Caption"
-msgstr ""
-
-#: ../../mod/photos.php:947
-msgid "Add a Tag"
-msgstr ""
-
-#: ../../mod/photos.php:950
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+#: ../../mod/profperm.php:29 ../../mod/profperm.php:58
+msgid "Invalid profile identifier."
 msgstr ""
 
-#: ../../mod/photos.php:952
-msgid "Flag as adult in album view"
+#: ../../mod/profperm.php:110
+msgid "Profile Visibility Editor"
 msgstr ""
 
-#: ../../mod/photos.php:1129
-msgid "In This Photo:"
+#: ../../mod/profperm.php:114
+msgid "Click on a contact to add or remove."
 msgstr ""
 
-#: ../../mod/photos.php:1216
-msgid "View Album"
+#: ../../mod/profperm.php:123
+msgid "Visible To"
 msgstr ""
 
-#: ../../mod/photos.php:1239
-msgid "Recent Photos"
+#: ../../mod/profperm.php:139 ../../mod/connections.php:279
+msgid "All Connections"
 msgstr ""
 
-#: ../../mod/mitem.php:14 ../../mod/menu.php:92
+#: ../../mod/mitem.php:24 ../../mod/menu.php:108
 msgid "Menu not found."
 msgstr ""
 
-#: ../../mod/mitem.php:47
+#: ../../mod/mitem.php:67
 msgid "Menu element updated."
 msgstr ""
 
-#: ../../mod/mitem.php:51
+#: ../../mod/mitem.php:71
 msgid "Unable to update menu element."
 msgstr ""
 
-#: ../../mod/mitem.php:57
+#: ../../mod/mitem.php:77
 msgid "Menu element added."
 msgstr ""
 
-#: ../../mod/mitem.php:61
+#: ../../mod/mitem.php:81
 msgid "Unable to add menu element."
 msgstr ""
 
-#: ../../mod/mitem.php:78 ../../mod/dirprofile.php:175 ../../mod/menu.php:120
-#: ../../mod/xchan.php:38
+#: ../../mod/mitem.php:111 ../../mod/menu.php:136 ../../mod/xchan.php:37
 msgid "Not found."
 msgstr ""
 
-#: ../../mod/mitem.php:96
+#: ../../mod/mitem.php:127
 msgid "Manage Menu Elements"
 msgstr ""
 
-#: ../../mod/mitem.php:99
+#: ../../mod/mitem.php:130
 msgid "Edit menu"
 msgstr ""
 
-#: ../../mod/mitem.php:102
+#: ../../mod/mitem.php:133
 msgid "Edit element"
 msgstr ""
 
-#: ../../mod/mitem.php:103
+#: ../../mod/mitem.php:134
 msgid "Drop element"
 msgstr ""
 
-#: ../../mod/mitem.php:104
+#: ../../mod/mitem.php:135
 msgid "New element"
 msgstr ""
 
-#: ../../mod/mitem.php:105
+#: ../../mod/mitem.php:136
 msgid "Edit this menu container"
 msgstr ""
 
-#: ../../mod/mitem.php:106
+#: ../../mod/mitem.php:137
 msgid "Add menu element"
 msgstr ""
 
-#: ../../mod/mitem.php:107
+#: ../../mod/mitem.php:138
 msgid "Delete this menu item"
 msgstr ""
 
-#: ../../mod/mitem.php:108
+#: ../../mod/mitem.php:139
 msgid "Edit this menu item"
 msgstr ""
 
-#: ../../mod/mitem.php:131
+#: ../../mod/mitem.php:158
 msgid "New Menu Element"
 msgstr ""
 
-#: ../../mod/mitem.php:133 ../../mod/mitem.php:176
+#: ../../mod/mitem.php:160 ../../mod/mitem.php:203
 msgid "Menu Item Permissions"
 msgstr ""
 
-#: ../../mod/mitem.php:134 ../../mod/mitem.php:177 ../../mod/settings.php:1011
+#: ../../mod/mitem.php:161 ../../mod/mitem.php:204 ../../mod/settings.php:1011
 msgid "(click to open/close)"
 msgstr ""
 
-#: ../../mod/mitem.php:136 ../../mod/mitem.php:180
+#: ../../mod/mitem.php:163 ../../mod/mitem.php:207
 msgid "Link text"
 msgstr ""
 
-#: ../../mod/mitem.php:137 ../../mod/mitem.php:181
+#: ../../mod/mitem.php:164 ../../mod/mitem.php:208
 msgid "URL of link"
 msgstr ""
 
-#: ../../mod/mitem.php:138 ../../mod/mitem.php:182
-msgid "Use Red magic-auth if available"
+#: ../../mod/mitem.php:165 ../../mod/mitem.php:209
+msgid "Use RedMatrix magic-auth if available"
 msgstr ""
 
-#: ../../mod/mitem.php:139 ../../mod/mitem.php:183
+#: ../../mod/mitem.php:166 ../../mod/mitem.php:210
 msgid "Open link in new window"
 msgstr ""
 
-#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
+#: ../../mod/mitem.php:168 ../../mod/mitem.php:212
 msgid "Order in list"
 msgstr ""
 
-#: ../../mod/mitem.php:141 ../../mod/mitem.php:185
+#: ../../mod/mitem.php:168 ../../mod/mitem.php:212
 msgid "Higher numbers will sink to bottom of listing"
 msgstr ""
 
-#: ../../mod/mitem.php:154
+#: ../../mod/mitem.php:181
 msgid "Menu item not found."
 msgstr ""
 
-#: ../../mod/mitem.php:163
+#: ../../mod/mitem.php:190
 msgid "Menu item deleted."
 msgstr ""
 
-#: ../../mod/mitem.php:165
+#: ../../mod/mitem.php:192
 msgid "Menu item could not be deleted."
 msgstr ""
 
-#: ../../mod/mitem.php:174
+#: ../../mod/mitem.php:201
 msgid "Edit Menu Element"
 msgstr ""
 
-#: ../../mod/mitem.php:186 ../../mod/menu.php:114
+#: ../../mod/mitem.php:213 ../../mod/menu.php:130
 msgid "Modify"
 msgstr ""
 
@@ -3928,627 +3793,718 @@ msgstr ""
 msgid "Some blurb about what to do when you're new here"
 msgstr ""
 
-#: ../../mod/ping.php:255
-msgid "sent you a private message"
+#: ../../mod/profiles.php:18 ../../mod/profiles.php:165
+#: ../../mod/profiles.php:222 ../../mod/profiles.php:565
+msgid "Profile not found."
 msgstr ""
 
-#: ../../mod/ping.php:306
-msgid "added your channel"
+#: ../../mod/profiles.php:38
+msgid "Profile deleted."
 msgstr ""
 
-#: ../../mod/ping.php:347
-msgid "posted an event"
+#: ../../mod/profiles.php:56 ../../mod/profiles.php:92
+msgid "Profile-"
 msgstr ""
 
-#: ../../mod/acl.php:244
-msgid "network"
+#: ../../mod/profiles.php:77 ../../mod/profiles.php:120
+msgid "New profile created."
 msgstr ""
 
-#: ../../mod/settings.php:73
-msgid "Name is required"
+#: ../../mod/profiles.php:98
+msgid "Profile unavailable to clone."
 msgstr ""
 
-#: ../../mod/settings.php:77
-msgid "Key and Secret are required"
+#: ../../mod/profiles.php:136
+msgid "Profile unavailable to export."
 msgstr ""
 
-#: ../../mod/settings.php:197
-msgid "Passwords do not match. Password unchanged."
+#: ../../mod/profiles.php:232
+msgid "Profile Name is required."
 msgstr ""
 
-#: ../../mod/settings.php:201
-msgid "Empty passwords are not allowed. Password unchanged."
+#: ../../mod/profiles.php:378
+msgid "Marital Status"
 msgstr ""
 
-#: ../../mod/settings.php:215
-msgid "Password changed."
+#: ../../mod/profiles.php:382
+msgid "Romantic Partner"
 msgstr ""
 
-#: ../../mod/settings.php:217
-msgid "Password update failed. Please try again."
+#: ../../mod/profiles.php:386
+msgid "Likes"
 msgstr ""
 
-#: ../../mod/settings.php:231
-msgid "Not valid email."
+#: ../../mod/profiles.php:390
+msgid "Dislikes"
 msgstr ""
 
-#: ../../mod/settings.php:234
-msgid "Protected email address. Cannot change to that email."
+#: ../../mod/profiles.php:394
+msgid "Work/Employment"
 msgstr ""
 
-#: ../../mod/settings.php:243
-msgid "System failure storing new email. Please try again."
+#: ../../mod/profiles.php:397
+msgid "Religion"
 msgstr ""
 
-#: ../../mod/settings.php:479
-msgid "Settings updated."
+#: ../../mod/profiles.php:401
+msgid "Political Views"
 msgstr ""
 
-#: ../../mod/settings.php:548 ../../mod/settings.php:574
-#: ../../mod/settings.php:610
-msgid "Add application"
+#: ../../mod/profiles.php:405
+msgid "Gender"
 msgstr ""
 
-#: ../../mod/settings.php:551
-msgid "Name of application"
+#: ../../mod/profiles.php:409
+msgid "Sexual Preference"
 msgstr ""
 
-#: ../../mod/settings.php:552 ../../mod/settings.php:578
-msgid "Consumer Key"
+#: ../../mod/profiles.php:413
+msgid "Homepage"
 msgstr ""
 
-#: ../../mod/settings.php:552 ../../mod/settings.php:553
-msgid "Automatically generated - change if desired. Max length 20"
+#: ../../mod/profiles.php:417
+msgid "Interests"
 msgstr ""
 
-#: ../../mod/settings.php:553 ../../mod/settings.php:579
-msgid "Consumer Secret"
+#: ../../mod/profiles.php:421 ../../mod/admin.php:866
+msgid "Address"
 msgstr ""
 
-#: ../../mod/settings.php:554 ../../mod/settings.php:580
-msgid "Redirect"
+#: ../../mod/profiles.php:428 ../../mod/pubsites.php:25
+msgid "Location"
 msgstr ""
 
-#: ../../mod/settings.php:554
-msgid ""
-"Redirect URI - leave blank unless your application specifically requires this"
+#: ../../mod/profiles.php:511
+msgid "Profile updated."
 msgstr ""
 
-#: ../../mod/settings.php:555 ../../mod/settings.php:581
-msgid "Icon url"
+#: ../../mod/profiles.php:590
+msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr ""
 
-#: ../../mod/settings.php:555
-msgid "Optional"
+#: ../../mod/profiles.php:591 ../../mod/api.php:105 ../../mod/settings.php:916
+#: ../../mod/settings.php:921 ../../mod/settings.php:1004
+#: ../../mod/admin.php:392
+msgid "Yes"
 msgstr ""
 
-#: ../../mod/settings.php:566
-msgid "You can't edit this application."
+#: ../../mod/profiles.php:592 ../../mod/api.php:106 ../../mod/settings.php:916
+#: ../../mod/settings.php:921 ../../mod/settings.php:1004
+#: ../../mod/admin.php:390
+msgid "No"
 msgstr ""
 
-#: ../../mod/settings.php:609
-msgid "Connected Apps"
+#: ../../mod/profiles.php:632
+msgid "Edit Profile Details"
 msgstr ""
 
-#: ../../mod/settings.php:613
-msgid "Client key starts with"
+#: ../../mod/profiles.php:634
+msgid "View this profile"
 msgstr ""
 
-#: ../../mod/settings.php:614
-msgid "No name"
+#: ../../mod/profiles.php:636
+msgid "Change Profile Photo"
 msgstr ""
 
-#: ../../mod/settings.php:615
-msgid "Remove authorization"
+#: ../../mod/profiles.php:637
+msgid "Create a new profile using these settings"
 msgstr ""
 
-#: ../../mod/settings.php:626
-msgid "No feature settings configured"
+#: ../../mod/profiles.php:638
+msgid "Clone this profile"
 msgstr ""
 
-#: ../../mod/settings.php:634
-msgid "Feature Settings"
+#: ../../mod/profiles.php:639
+msgid "Delete this profile"
 msgstr ""
 
-#: ../../mod/settings.php:657
-msgid "Account Settings"
+#: ../../mod/profiles.php:641
+msgid "Import profile from file"
 msgstr ""
 
-#: ../../mod/settings.php:658
-msgid "Password Settings"
+#: ../../mod/profiles.php:642
+msgid "Export profile to file"
 msgstr ""
 
-#: ../../mod/settings.php:659
-msgid "New Password:"
+#: ../../mod/profiles.php:643
+msgid "Profile Name:"
 msgstr ""
 
-#: ../../mod/settings.php:660
-msgid "Confirm:"
+#: ../../mod/profiles.php:644
+msgid "Your Full Name:"
 msgstr ""
 
-#: ../../mod/settings.php:660
-msgid "Leave password fields blank unless changing"
+#: ../../mod/profiles.php:645
+msgid "Title/Description:"
 msgstr ""
 
-#: ../../mod/settings.php:662 ../../mod/settings.php:985
-msgid "Email Address:"
+#: ../../mod/profiles.php:646
+msgid "Your Gender:"
 msgstr ""
 
-#: ../../mod/settings.php:663 ../../mod/removeaccount.php:61
-msgid "Remove Account"
+#: ../../mod/profiles.php:647
+msgid "Birthday :"
 msgstr ""
 
-#: ../../mod/settings.php:664
-msgid "Remove this account from this server including all its channels"
+#: ../../mod/profiles.php:648
+msgid "Street Address:"
 msgstr ""
 
-#: ../../mod/settings.php:665 ../../mod/settings.php:1067
-msgid "Warning: This action is permanent and cannot be reversed."
+#: ../../mod/profiles.php:649
+msgid "Locality/City:"
 msgstr ""
 
-#: ../../mod/settings.php:681
-msgid "Off"
+#: ../../mod/profiles.php:650
+msgid "Postal/Zip Code:"
 msgstr ""
 
-#: ../../mod/settings.php:681
-msgid "On"
+#: ../../mod/profiles.php:651
+msgid "Country:"
 msgstr ""
 
-#: ../../mod/settings.php:688
-msgid "Additional Features"
+#: ../../mod/profiles.php:652
+msgid "Region/State:"
 msgstr ""
 
-#: ../../mod/settings.php:713
-msgid "Connector Settings"
+#: ../../mod/profiles.php:653
+msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr ""
 
-#: ../../mod/settings.php:743 ../../mod/admin.php:362
-msgid "No special theme for mobile devices"
+#: ../../mod/profiles.php:654
+msgid "Who: (if applicable)"
 msgstr ""
 
-#: ../../mod/settings.php:752
-#, php-format
-msgid "%s - (Experimental)"
+#: ../../mod/profiles.php:655
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: ../../mod/settings.php:788
-msgid "Display Settings"
+#: ../../mod/profiles.php:656
+msgid "Since [date]:"
 msgstr ""
 
-#: ../../mod/settings.php:794
-msgid "Display Theme:"
+#: ../../mod/profiles.php:658
+msgid "Homepage URL:"
 msgstr ""
 
-#: ../../mod/settings.php:795
-msgid "Mobile Theme:"
+#: ../../mod/profiles.php:661
+msgid "Religious Views:"
 msgstr ""
 
-#: ../../mod/settings.php:796
-msgid "Enable user zoom on mobile devices"
+#: ../../mod/profiles.php:662
+msgid "Keywords:"
 msgstr ""
 
-#: ../../mod/settings.php:797
-msgid "Update browser every xx seconds"
+#: ../../mod/profiles.php:665
+msgid "Example: fishing photography software"
 msgstr ""
 
-#: ../../mod/settings.php:797
-msgid "Minimum of 10 seconds, no maximum"
+#: ../../mod/profiles.php:666
+msgid "Used in directory listings"
 msgstr ""
 
-#: ../../mod/settings.php:798
-msgid "Maximum number of conversations to load at any time:"
+#: ../../mod/profiles.php:667
+msgid "Tell us about yourself..."
 msgstr ""
 
-#: ../../mod/settings.php:798
-msgid "Maximum of 100 items"
+#: ../../mod/profiles.php:668
+msgid "Hobbies/Interests"
 msgstr ""
 
-#: ../../mod/settings.php:799
-msgid "Don't show emoticons"
+#: ../../mod/profiles.php:669
+msgid "Contact information and Social Networks"
 msgstr ""
 
-#: ../../mod/settings.php:800
-msgid "Link post titles to source"
+#: ../../mod/profiles.php:670
+msgid "My other channels"
 msgstr ""
 
-#: ../../mod/settings.php:801
-msgid "System Page Layout Editor - (advanced)"
+#: ../../mod/profiles.php:671
+msgid "Musical interests"
 msgstr ""
 
-#: ../../mod/settings.php:835
-msgid "Nobody except yourself"
+#: ../../mod/profiles.php:672
+msgid "Books, literature"
 msgstr ""
 
-#: ../../mod/settings.php:836
-msgid "Only those you specifically allow"
+#: ../../mod/profiles.php:673
+msgid "Television"
 msgstr ""
 
-#: ../../mod/settings.php:837
-msgid "Approved connections"
+#: ../../mod/profiles.php:674
+msgid "Film/dance/culture/entertainment"
 msgstr ""
 
-#: ../../mod/settings.php:838
-msgid "Any connections"
+#: ../../mod/profiles.php:675
+msgid "Love/romance"
 msgstr ""
 
-#: ../../mod/settings.php:839
-msgid "Anybody on this website"
+#: ../../mod/profiles.php:676
+msgid "Work/employment"
 msgstr ""
 
-#: ../../mod/settings.php:840
-msgid "Anybody in this network"
+#: ../../mod/profiles.php:677
+msgid "School/education"
 msgstr ""
 
-#: ../../mod/settings.php:841
-msgid "Anybody authenticated"
+#: ../../mod/profiles.php:683
+msgid "This is your default profile."
 msgstr ""
 
-#: ../../mod/settings.php:842
-msgid "Anybody on the internet"
+#: ../../mod/profiles.php:694 ../../mod/directory.php:148
+msgid "Age: "
 msgstr ""
 
-#: ../../mod/settings.php:916
-msgid "Publish your default profile in the network directory"
+#: ../../mod/profiles.php:737
+msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/settings.php:916 ../../mod/settings.php:921
-#: ../../mod/settings.php:1004 ../../mod/api.php:106
-#: ../../mod/profiles.php:574 ../../mod/admin.php:392
-msgid "No"
+#: ../../mod/profiles.php:738
+msgid "Add profile things"
 msgstr ""
 
-#: ../../mod/settings.php:916 ../../mod/settings.php:921
-#: ../../mod/settings.php:1004 ../../mod/api.php:105
-#: ../../mod/profiles.php:573 ../../mod/admin.php:394
-msgid "Yes"
+#: ../../mod/profiles.php:739
+msgid "Include desirable objects in your profile"
 msgstr ""
 
-#: ../../mod/settings.php:921
-msgid "Allow us to suggest you as a potential friend to new members?"
+#: ../../mod/connect.php:55 ../../mod/connect.php:103
+msgid "Continue"
 msgstr ""
 
-#: ../../mod/settings.php:925 ../../mod/profile_photo.php:365
-msgid "or"
+#: ../../mod/connect.php:84
+msgid "Premium Channel Setup"
 msgstr ""
 
-#: ../../mod/settings.php:930
-msgid "Your channel address is"
+#: ../../mod/connect.php:86
+msgid "Enable premium channel connection restrictions"
 msgstr ""
 
-#: ../../mod/settings.php:974
-msgid "Channel Settings"
+#: ../../mod/connect.php:87
+msgid ""
+"Please enter your restrictions or conditions, such as paypal receipt, usage "
+"guidelines, etc."
 msgstr ""
 
-#: ../../mod/settings.php:983
-msgid "Basic Settings"
+#: ../../mod/connect.php:89 ../../mod/connect.php:109
+msgid ""
+"This channel may require additional steps or acknowledgement of the "
+"following conditions prior to connecting:"
 msgstr ""
 
-#: ../../mod/settings.php:986
-msgid "Your Timezone:"
+#: ../../mod/connect.php:90
+msgid ""
+"Potential connections will then see the following text before proceeding:"
 msgstr ""
 
-#: ../../mod/settings.php:987
-msgid "Default Post Location:"
+#: ../../mod/connect.php:91 ../../mod/connect.php:112
+msgid ""
+"By continuing, I certify that I have complied with any instructions provided "
+"on this page."
 msgstr ""
 
-#: ../../mod/settings.php:987
-msgid "Geographical location to display on your posts"
+#: ../../mod/connect.php:100
+msgid "(No specific instructions have been provided by the channel owner.)"
 msgstr ""
 
-#: ../../mod/settings.php:988
-msgid "Use Browser Location:"
+#: ../../mod/connect.php:108
+msgid "Restricted or Premium Channel"
 msgstr ""
 
-#: ../../mod/settings.php:990
-msgid "Adult Content"
+#: ../../mod/post.php:229
+msgid ""
+"Remote authentication blocked. You are logged into this site locally. Please "
+"logout and retry."
 msgstr ""
 
-#: ../../mod/settings.php:990
+#: ../../mod/post.php:261 ../../mod/openid.php:72 ../../mod/openid.php:180
+#, php-format
+msgid "Welcome %s. Remote authentication successful."
+msgstr ""
+
+#: ../../mod/setup.php:166
+msgid "Red Matrix Server - Setup"
+msgstr ""
+
+#: ../../mod/setup.php:172
+msgid "Could not connect to database."
+msgstr ""
+
+#: ../../mod/setup.php:176
 msgid ""
-"This channel frequently or regularly publishes adult content. (Please tag "
-"any adult material and/or nudity with #NSFW)"
+"Could not connect to specified site URL. Possible SSL certificate or DNS "
+"issue."
 msgstr ""
 
-#: ../../mod/settings.php:992
-msgid "Security and Privacy Settings"
+#: ../../mod/setup.php:183
+msgid "Could not create table."
 msgstr ""
 
-#: ../../mod/settings.php:994
-msgid "Your permissions are already configured. Click to view/adjust"
+#: ../../mod/setup.php:189
+msgid "Your site database has been installed."
 msgstr ""
 
-#: ../../mod/settings.php:996
-msgid "Hide my online presence"
+#: ../../mod/setup.php:194
+msgid ""
+"You may need to import the file \"install/schema_xxx.sql\" manually using a "
+"database client."
 msgstr ""
 
-#: ../../mod/settings.php:996
-msgid "Prevents displaying in your profile that you are online"
+#: ../../mod/setup.php:195 ../../mod/setup.php:264 ../../mod/setup.php:663
+msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr ""
 
-#: ../../mod/settings.php:998
-msgid "Simple Privacy Settings:"
+#: ../../mod/setup.php:261
+msgid "System check"
 msgstr ""
 
-#: ../../mod/settings.php:999
+#: ../../mod/setup.php:265 ../../mod/events.php:434 ../../mod/photos.php:868
+msgid "Next"
+msgstr ""
+
+#: ../../mod/setup.php:266
+msgid "Check again"
+msgstr ""
+
+#: ../../mod/setup.php:289
+msgid "Database connection"
+msgstr ""
+
+#: ../../mod/setup.php:290
 msgid ""
-"Very Public - <em>extremely permissive (should be used with caution)</em>"
+"In order to install Red Matrix we need to know how to connect to your "
+"database."
 msgstr ""
 
-#: ../../mod/settings.php:1000
+#: ../../mod/setup.php:291
 msgid ""
-"Typical - <em>default public, privacy when desired (similar to social "
-"network permissions but with improved privacy)</em>"
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
 msgstr ""
 
-#: ../../mod/settings.php:1001
-msgid "Private - <em>default private, never open or public</em>"
+#: ../../mod/setup.php:292
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
 msgstr ""
 
-#: ../../mod/settings.php:1002
-msgid "Blocked - <em>default blocked to/from everybody</em>"
+#: ../../mod/setup.php:296
+msgid "Database Server Name"
 msgstr ""
 
-#: ../../mod/settings.php:1004
-msgid "Allow others to tag your posts"
+#: ../../mod/setup.php:296
+msgid "Default is localhost"
 msgstr ""
 
-#: ../../mod/settings.php:1004
-msgid ""
-"Often used by the community to retro-actively flag inappropriate content"
+#: ../../mod/setup.php:297
+msgid "Database Port"
 msgstr ""
 
-#: ../../mod/settings.php:1006
-msgid "Advanced Privacy Settings"
+#: ../../mod/setup.php:297
+msgid "Communication port number - use 0 for default"
 msgstr ""
 
-#: ../../mod/settings.php:1008
-msgid "Expire other channel content after this many days"
+#: ../../mod/setup.php:298
+msgid "Database Login Name"
 msgstr ""
 
-#: ../../mod/settings.php:1008
-msgid "0 or blank prevents expiration"
+#: ../../mod/setup.php:299
+msgid "Database Login Password"
 msgstr ""
 
-#: ../../mod/settings.php:1009
-msgid "Maximum Friend Requests/Day:"
+#: ../../mod/setup.php:300
+msgid "Database Name"
 msgstr ""
 
-#: ../../mod/settings.php:1009
-msgid "May reduce spam activity"
+#: ../../mod/setup.php:301
+msgid "Database Type"
 msgstr ""
 
-#: ../../mod/settings.php:1010
-msgid "Default Post Permissions"
+#: ../../mod/setup.php:303 ../../mod/setup.php:347
+msgid "Site administrator email address"
 msgstr ""
 
-#: ../../mod/settings.php:1015
-msgid "Channel permissions category:"
+#: ../../mod/setup.php:303 ../../mod/setup.php:347
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
 msgstr ""
 
-#: ../../mod/settings.php:1023
-msgid "Maximum private messages per day from unknown people:"
+#: ../../mod/setup.php:304 ../../mod/setup.php:349
+msgid "Website URL"
 msgstr ""
 
-#: ../../mod/settings.php:1023
-msgid "Useful to reduce spamming"
+#: ../../mod/setup.php:304 ../../mod/setup.php:349
+msgid "Please use SSL (https) URL if available."
 msgstr ""
 
-#: ../../mod/settings.php:1026
-msgid "Notification Settings"
+#: ../../mod/setup.php:307 ../../mod/setup.php:352
+msgid "Please select a default timezone for your website"
 msgstr ""
 
-#: ../../mod/settings.php:1027
-msgid "By default post a status message when:"
+#: ../../mod/setup.php:335
+msgid "Site settings"
 msgstr ""
 
-#: ../../mod/settings.php:1028
-msgid "accepting a friend request"
+#: ../../mod/setup.php:395
+msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 
-#: ../../mod/settings.php:1029
-msgid "joining a forum/community"
+#: ../../mod/setup.php:396
+msgid ""
+"If you don't have a command line version of PHP installed on server, you "
+"will not be able to run background polling via cron."
 msgstr ""
 
-#: ../../mod/settings.php:1030
-msgid "making an <em>interesting</em> profile change"
+#: ../../mod/setup.php:400
+msgid "PHP executable path"
 msgstr ""
 
-#: ../../mod/settings.php:1031
-msgid "Send a notification email when:"
+#: ../../mod/setup.php:400
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
 msgstr ""
 
-#: ../../mod/settings.php:1032
-msgid "You receive a connection request"
+#: ../../mod/setup.php:405
+msgid "Command line PHP"
 msgstr ""
 
-#: ../../mod/settings.php:1033
-msgid "Your connections are confirmed"
+#: ../../mod/setup.php:414
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
 msgstr ""
 
-#: ../../mod/settings.php:1034
-msgid "Someone writes on your profile wall"
+#: ../../mod/setup.php:415
+msgid "This is required for message delivery to work."
 msgstr ""
 
-#: ../../mod/settings.php:1035
-msgid "Someone writes a followup comment"
+#: ../../mod/setup.php:417
+msgid "PHP register_argc_argv"
 msgstr ""
 
-#: ../../mod/settings.php:1036
-msgid "You receive a private message"
+#: ../../mod/setup.php:438
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
 msgstr ""
 
-#: ../../mod/settings.php:1037
-msgid "You receive a friend suggestion"
+#: ../../mod/setup.php:439
+msgid ""
+"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
+"installation.php\"."
 msgstr ""
 
-#: ../../mod/settings.php:1038
-msgid "You are tagged in a post"
+#: ../../mod/setup.php:441
+msgid "Generate encryption keys"
 msgstr ""
 
-#: ../../mod/settings.php:1039
-msgid "You are poked/prodded/etc. in a post"
+#: ../../mod/setup.php:448
+msgid "libCurl PHP module"
 msgstr ""
 
-#: ../../mod/settings.php:1042
-msgid "Show visual notifications including:"
+#: ../../mod/setup.php:449
+msgid "GD graphics PHP module"
 msgstr ""
 
-#: ../../mod/settings.php:1044
-msgid "Unseen matrix activity"
+#: ../../mod/setup.php:450
+msgid "OpenSSL PHP module"
 msgstr ""
 
-#: ../../mod/settings.php:1045
-msgid "Unseen channel activity"
+#: ../../mod/setup.php:451
+msgid "mysqli or postgres PHP module"
 msgstr ""
 
-#: ../../mod/settings.php:1046
-msgid "Unseen private messages"
+#: ../../mod/setup.php:452
+msgid "mb_string PHP module"
 msgstr ""
 
-#: ../../mod/settings.php:1046 ../../mod/settings.php:1051
-#: ../../mod/settings.php:1052 ../../mod/settings.php:1053
-msgid "Recommended"
+#: ../../mod/setup.php:453
+msgid "mcrypt PHP module"
 msgstr ""
 
-#: ../../mod/settings.php:1047
-msgid "Upcoming events"
+#: ../../mod/setup.php:458 ../../mod/setup.php:460
+msgid "Apache mod_rewrite module"
 msgstr ""
 
-#: ../../mod/settings.php:1048
-msgid "Events today"
+#: ../../mod/setup.php:458
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: ../../mod/settings.php:1049
-msgid "Upcoming birthdays"
+#: ../../mod/setup.php:464 ../../mod/setup.php:467
+msgid "proc_open"
 msgstr ""
 
-#: ../../mod/settings.php:1049
-msgid "Not available in all themes"
+#: ../../mod/setup.php:464
+msgid ""
+"Error: proc_open is required but is either not installed or has been "
+"disabled in php.ini"
 msgstr ""
 
-#: ../../mod/settings.php:1050
-msgid "System (personal) notifications"
+#: ../../mod/setup.php:472
+msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/settings.php:1051
-msgid "System info messages"
+#: ../../mod/setup.php:476
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: ../../mod/settings.php:1052
-msgid "System critical alerts"
+#: ../../mod/setup.php:480
+msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/settings.php:1053
-msgid "New connections"
+#: ../../mod/setup.php:484
+msgid ""
+"Error: mysqli or postgres PHP module required but neither are installed."
 msgstr ""
 
-#: ../../mod/settings.php:1054
-msgid "System Registrations"
+#: ../../mod/setup.php:488
+msgid "Error: mb_string PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/settings.php:1056
-msgid "Notify me of events this many days in advance"
+#: ../../mod/setup.php:492
+msgid "Error: mcrypt PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/settings.php:1056
-msgid "Must be greater than 0"
+#: ../../mod/setup.php:508
+msgid ""
+"The web installer needs to be able to create a file called \".htconfig.php\" "
+"in the top folder of your web server and it is unable to do so."
 msgstr ""
 
-#: ../../mod/settings.php:1058
-msgid "Advanced Account/Page Type Settings"
+#: ../../mod/setup.php:509
+msgid ""
+"This is most often a permission setting, as the web server may not be able "
+"to write files in your folder - even if you can."
 msgstr ""
 
-#: ../../mod/settings.php:1059
-msgid "Change the behaviour of this account for special situations"
+#: ../../mod/setup.php:510
+msgid ""
+"At the end of this procedure, we will give you a text to save in a file "
+"named .htconfig.php in your Red top folder."
 msgstr ""
 
-#: ../../mod/settings.php:1062
+#: ../../mod/setup.php:511
 msgid ""
-"Please enable expert mode (in <a href=\"settings/features\">Settings > "
-"Additional features</a>) to adjust!"
+"You can alternatively skip this procedure and perform a manual installation. "
+"Please see the file \"install/INSTALL.txt\" for instructions."
 msgstr ""
 
-#: ../../mod/settings.php:1063
-msgid "Miscellaneous Settings"
+#: ../../mod/setup.php:514
+msgid ".htconfig.php is writable"
 msgstr ""
 
-#: ../../mod/settings.php:1065
-msgid "Personal menu to display in your channel pages"
+#: ../../mod/setup.php:524
+msgid ""
+"Red uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
 msgstr ""
 
-#: ../../mod/settings.php:1066
-msgid "Remove this channel"
+#: ../../mod/setup.php:525
+#, php-format
+msgid ""
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory %s under the Red top level folder."
 msgstr ""
 
-#: ../../mod/poke.php:159
-msgid "Poke/Prod"
+#: ../../mod/setup.php:526 ../../mod/setup.php:544
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has "
+"write access to this folder."
 msgstr ""
 
-#: ../../mod/poke.php:160
-msgid "poke, prod or do other things to somebody"
+#: ../../mod/setup.php:527
+#, php-format
+msgid ""
+"Note: as a security measure, you should give the web server write access to "
+"%s only--not the template files (.tpl) that it contains."
 msgstr ""
 
-#: ../../mod/poke.php:161
-msgid "Recipient"
+#: ../../mod/setup.php:530
+#, php-format
+msgid "%s is writable"
 msgstr ""
 
-#: ../../mod/poke.php:162
-msgid "Choose what you wish to do to recipient"
+#: ../../mod/setup.php:543
+msgid ""
+"Red uses the store directory to save uploaded files. The web server needs to "
+"have write access to the store directory under the Red top level folder"
 msgstr ""
 
-#: ../../mod/poke.php:165
-msgid "Make this post private"
+#: ../../mod/setup.php:547
+msgid "store is writable"
 msgstr ""
 
-#: ../../mod/api.php:76 ../../mod/api.php:102
-msgid "Authorize application connection"
+#: ../../mod/setup.php:577
+msgid ""
+"SSL certificate cannot be validated. Fix certificate or disable https access "
+"to this site."
 msgstr ""
 
-#: ../../mod/api.php:77
-msgid "Return to your app and insert this Securty Code:"
+#: ../../mod/setup.php:578
+msgid ""
+"If you have https access to your website or allow connections to TCP port "
+"443 (the https: port), you MUST use a browser-valid certificate. You MUST "
+"NOT use self-signed certificates!"
 msgstr ""
 
-#: ../../mod/api.php:89
-msgid "Please login to continue."
+#: ../../mod/setup.php:579
+msgid ""
+"This restriction is incorporated because public posts from you may for "
+"example contain references to images on your own hub."
 msgstr ""
 
-#: ../../mod/api.php:104
+#: ../../mod/setup.php:580
 msgid ""
-"Do you want to authorize this application to access your posts and contacts, "
-"and/or create new posts for you?"
+"If your certificate is not recognized, members of other sites (who may "
+"themselves have valid certificates) will get a warning message on their own "
+"site complaining about security issues."
 msgstr ""
 
-#: ../../mod/post.php:229
+#: ../../mod/setup.php:581
 msgid ""
-"Remote authentication blocked. You are logged into this site locally. Please "
-"logout and retry."
+"This can cause usability issues elsewhere (not just on your own site) so we "
+"must insist on this requirement."
 msgstr ""
 
-#: ../../mod/post.php:261 ../../mod/openid.php:72 ../../mod/openid.php:180
-#, php-format
-msgid "Welcome %s. Remote authentication successful."
+#: ../../mod/setup.php:582
+msgid ""
+"Providers are available that issue free certificates which are browser-valid."
 msgstr ""
 
-#: ../../mod/attach.php:9
-msgid "Item not available."
+#: ../../mod/setup.php:584
+msgid "SSL certificate validation"
 msgstr ""
 
-#: ../../mod/probe.php:23 ../../mod/probe.php:29
-#, php-format
-msgid "Fetching URL returns error: %1$s"
+#: ../../mod/setup.php:590
+msgid ""
+"Url rewrite in .htaccess is not working. Check your server configuration."
+"Test: "
 msgstr ""
 
-#: ../../mod/block.php:27 ../../mod/page.php:33
-msgid "Invalid item."
+#: ../../mod/setup.php:592
+msgid "Url rewrite is working"
 msgstr ""
 
-#: ../../mod/block.php:39 ../../mod/wall_upload.php:28 ../../mod/page.php:45
-msgid "Channel not found."
+#: ../../mod/setup.php:602
+msgid ""
+"The database configuration file \".htconfig.php\" could not be written. "
+"Please use the enclosed text to create a configuration file in your web "
+"server root."
 msgstr ""
 
-#: ../../mod/block.php:75 ../../mod/display.php:102 ../../mod/help.php:70
-#: ../../mod/page.php:81 ../../index.php:241
-msgid "Page not found."
+#: ../../mod/setup.php:626
+msgid "Errors encountered creating database tables."
+msgstr ""
+
+#: ../../mod/setup.php:661
+msgid "<h1>What next</h1>"
+msgstr ""
+
+#: ../../mod/setup.php:662
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
 #: ../../mod/siteinfo.php:90
@@ -4597,290 +4553,258 @@ msgstr ""
 msgid "Site Administrators"
 msgstr ""
 
-#: ../../mod/blocks.php:62
-msgid "Block Name"
-msgstr ""
-
-#: ../../mod/profiles.php:18 ../../mod/profiles.php:165
-#: ../../mod/profiles.php:222 ../../mod/profiles.php:547
-msgid "Profile not found."
-msgstr ""
-
-#: ../../mod/profiles.php:38
-msgid "Profile deleted."
-msgstr ""
-
-#: ../../mod/profiles.php:56 ../../mod/profiles.php:92
-msgid "Profile-"
-msgstr ""
-
-#: ../../mod/profiles.php:77 ../../mod/profiles.php:120
-msgid "New profile created."
-msgstr ""
-
-#: ../../mod/profiles.php:98
-msgid "Profile unavailable to clone."
-msgstr ""
-
-#: ../../mod/profiles.php:136
-msgid "Profile unavailable to export."
-msgstr ""
-
-#: ../../mod/profiles.php:232
-msgid "Profile Name is required."
-msgstr ""
-
-#: ../../mod/profiles.php:362
-msgid "Marital Status"
-msgstr ""
-
-#: ../../mod/profiles.php:366
-msgid "Romantic Partner"
-msgstr ""
-
-#: ../../mod/profiles.php:370
-msgid "Likes"
-msgstr ""
-
-#: ../../mod/profiles.php:374
-msgid "Dislikes"
+#: ../../mod/poke.php:159
+msgid "Poke/Prod"
 msgstr ""
 
-#: ../../mod/profiles.php:378
-msgid "Work/Employment"
+#: ../../mod/poke.php:160
+msgid "poke, prod or do other things to somebody"
 msgstr ""
 
-#: ../../mod/profiles.php:381
-msgid "Religion"
+#: ../../mod/poke.php:161
+msgid "Recipient"
 msgstr ""
 
-#: ../../mod/profiles.php:385
-msgid "Political Views"
+#: ../../mod/poke.php:162
+msgid "Choose what you wish to do to recipient"
 msgstr ""
 
-#: ../../mod/profiles.php:389
-msgid "Gender"
+#: ../../mod/poke.php:165
+msgid "Make this post private"
 msgstr ""
 
-#: ../../mod/profiles.php:393
-msgid "Sexual Preference"
+#: ../../mod/api.php:76 ../../mod/api.php:102
+msgid "Authorize application connection"
 msgstr ""
 
-#: ../../mod/profiles.php:397
-msgid "Homepage"
+#: ../../mod/api.php:77
+msgid "Return to your app and insert this Securty Code:"
 msgstr ""
 
-#: ../../mod/profiles.php:401
-msgid "Interests"
+#: ../../mod/api.php:89
+msgid "Please login to continue."
 msgstr ""
 
-#: ../../mod/profiles.php:405 ../../mod/admin.php:868
-msgid "Address"
+#: ../../mod/api.php:104
+msgid ""
+"Do you want to authorize this application to access your posts and contacts, "
+"and/or create new posts for you?"
 msgstr ""
 
-#: ../../mod/profiles.php:412 ../../mod/pubsites.php:25
-msgid "Location"
+#: ../../mod/attach.php:9
+msgid "Item not available."
 msgstr ""
 
-#: ../../mod/profiles.php:495
-msgid "Profile updated."
+#: ../../mod/probe.php:23 ../../mod/probe.php:29
+#, php-format
+msgid "Fetching URL returns error: %1$s"
 msgstr ""
 
-#: ../../mod/profiles.php:572
-msgid "Hide your contact/friend list from viewers of this profile?"
+#: ../../mod/block.php:27 ../../mod/page.php:33
+msgid "Invalid item."
 msgstr ""
 
-#: ../../mod/profiles.php:614
-msgid "Edit Profile Details"
+#: ../../mod/block.php:39 ../../mod/wall_upload.php:28 ../../mod/page.php:45
+msgid "Channel not found."
 msgstr ""
 
-#: ../../mod/profiles.php:616
-msgid "View this profile"
+#: ../../mod/block.php:75 ../../mod/display.php:102 ../../mod/help.php:70
+#: ../../mod/page.php:81 ../../index.php:241
+msgid "Page not found."
 msgstr ""
 
-#: ../../mod/profiles.php:618
-msgid "Change Profile Photo"
+#: ../../mod/sources.php:32
+msgid "Failed to create source. No channel selected."
 msgstr ""
 
-#: ../../mod/profiles.php:619
-msgid "Create a new profile using these settings"
+#: ../../mod/sources.php:45
+msgid "Source created."
 msgstr ""
 
-#: ../../mod/profiles.php:620
-msgid "Clone this profile"
+#: ../../mod/sources.php:57
+msgid "Source updated."
 msgstr ""
 
-#: ../../mod/profiles.php:621
-msgid "Delete this profile"
+#: ../../mod/sources.php:82
+msgid "*"
 msgstr ""
 
-#: ../../mod/profiles.php:623
-msgid "Import profile from file"
+#: ../../mod/sources.php:89
+msgid "Manage remote sources of content for your channel."
 msgstr ""
 
-#: ../../mod/profiles.php:624
-msgid "Export profile to file"
+#: ../../mod/sources.php:90 ../../mod/sources.php:100
+msgid "New Source"
 msgstr ""
 
-#: ../../mod/profiles.php:625
-msgid "Profile Name:"
+#: ../../mod/sources.php:101 ../../mod/sources.php:133
+msgid ""
+"Import all or selected content from the following channel into this channel "
+"and distribute it according to your channel settings."
 msgstr ""
 
-#: ../../mod/profiles.php:626
-msgid "Your Full Name:"
+#: ../../mod/sources.php:102 ../../mod/sources.php:134
+msgid "Only import content with these words (one per line)"
 msgstr ""
 
-#: ../../mod/profiles.php:627
-msgid "Title/Description:"
+#: ../../mod/sources.php:102 ../../mod/sources.php:134
+msgid "Leave blank to import all public content"
 msgstr ""
 
-#: ../../mod/profiles.php:628
-msgid "Your Gender:"
+#: ../../mod/sources.php:103 ../../mod/sources.php:137
+#: ../../mod/new_channel.php:112
+msgid "Channel Name"
 msgstr ""
 
-#: ../../mod/profiles.php:629
-msgid "Birthday :"
+#: ../../mod/sources.php:123 ../../mod/sources.php:150
+msgid "Source not found."
 msgstr ""
 
-#: ../../mod/profiles.php:630
-msgid "Street Address:"
+#: ../../mod/sources.php:130
+msgid "Edit Source"
 msgstr ""
 
-#: ../../mod/profiles.php:631
-msgid "Locality/City:"
+#: ../../mod/sources.php:131
+msgid "Delete Source"
 msgstr ""
 
-#: ../../mod/profiles.php:632
-msgid "Postal/Zip Code:"
+#: ../../mod/sources.php:158
+msgid "Source removed"
 msgstr ""
 
-#: ../../mod/profiles.php:633
-msgid "Country:"
+#: ../../mod/sources.php:160
+msgid "Unable to remove source."
 msgstr ""
 
-#: ../../mod/profiles.php:634
-msgid "Region/State:"
+#: ../../mod/blocks.php:99
+msgid "Block Name"
 msgstr ""
 
-#: ../../mod/profiles.php:635
-msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
+#: ../../mod/search.php:13 ../../mod/directory.php:15 ../../mod/photos.php:458
+#: ../../mod/display.php:9 ../../mod/viewconnections.php:17
+msgid "Public access denied."
 msgstr ""
 
-#: ../../mod/profiles.php:636
-msgid "Who: (if applicable)"
+#: ../../mod/directory.php:161
+msgid "Gender: "
 msgstr ""
 
-#: ../../mod/profiles.php:637
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+#: ../../mod/directory.php:163
+msgid "Status: "
 msgstr ""
 
-#: ../../mod/profiles.php:638
-msgid "Since [date]:"
+#: ../../mod/directory.php:165
+msgid "Homepage: "
 msgstr ""
 
-#: ../../mod/profiles.php:640
-msgid "Homepage URL:"
+#: ../../mod/directory.php:168
+msgid "Hometown: "
 msgstr ""
 
-#: ../../mod/profiles.php:643
-msgid "Religious Views:"
+#: ../../mod/directory.php:170
+msgid "About: "
 msgstr ""
 
-#: ../../mod/profiles.php:644
-msgid "Keywords:"
+#: ../../mod/directory.php:225
+msgid "Public Forum:"
 msgstr ""
 
-#: ../../mod/profiles.php:647
-msgid "Example: fishing photography software"
+#: ../../mod/directory.php:228
+msgid "Keywords: "
 msgstr ""
 
-#: ../../mod/profiles.php:648
-msgid "Used in directory listings"
+#: ../../mod/directory.php:268
+msgid "Finding:"
 msgstr ""
 
-#: ../../mod/profiles.php:649
-msgid "Tell us about yourself..."
+#: ../../mod/directory.php:273
+msgid "next page"
 msgstr ""
 
-#: ../../mod/profiles.php:650
-msgid "Hobbies/Interests"
+#: ../../mod/directory.php:273
+msgid "previous page"
 msgstr ""
 
-#: ../../mod/profiles.php:651
-msgid "Contact information and Social Networks"
+#: ../../mod/directory.php:290
+msgid "No entries (some entries may be hidden)."
 msgstr ""
 
-#: ../../mod/profiles.php:652
-msgid "My other channels"
+#: ../../mod/register.php:44
+msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
 msgstr ""
 
-#: ../../mod/profiles.php:653
-msgid "Musical interests"
+#: ../../mod/register.php:50
+msgid ""
+"Please indicate acceptance of the Terms of Service. Registration failed."
 msgstr ""
 
-#: ../../mod/profiles.php:654
-msgid "Books, literature"
+#: ../../mod/register.php:84
+msgid "Passwords do not match."
 msgstr ""
 
-#: ../../mod/profiles.php:655
-msgid "Television"
+#: ../../mod/register.php:117
+msgid ""
+"Registration successful. Please check your email for validation instructions."
 msgstr ""
 
-#: ../../mod/profiles.php:656
-msgid "Film/dance/culture/entertainment"
+#: ../../mod/register.php:123
+msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: ../../mod/profiles.php:657
-msgid "Love/romance"
+#: ../../mod/register.php:126
+msgid "Your registration can not be processed."
 msgstr ""
 
-#: ../../mod/profiles.php:658
-msgid "Work/employment"
+#: ../../mod/register.php:163
+msgid "Registration on this site/hub is by approval only."
 msgstr ""
 
-#: ../../mod/profiles.php:659
-msgid "School/education"
+#: ../../mod/register.php:164
+msgid "<a href=\"pubsites\">Register at another affiliated site/hub</a>"
 msgstr ""
 
-#: ../../mod/profiles.php:665
-msgid "This is your default profile."
+#: ../../mod/register.php:174
+msgid ""
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
 msgstr ""
 
-#: ../../mod/profiles.php:676 ../../mod/directory.php:143
-#: ../../mod/dirprofile.php:92
-msgid "Age: "
+#: ../../mod/register.php:185
+msgid "Terms of Service"
 msgstr ""
 
-#: ../../mod/profiles.php:719
-msgid "Edit/Manage Profiles"
+#: ../../mod/register.php:191
+#, php-format
+msgid "I accept the %s for this website"
 msgstr ""
 
-#: ../../mod/profiles.php:720
-msgid "Add profile things"
+#: ../../mod/register.php:193
+#, php-format
+msgid "I am over 13 years of age and accept the %s for this website"
 msgstr ""
 
-#: ../../mod/profiles.php:721
-msgid "Include desirable objects in your profile"
+#: ../../mod/register.php:207 ../../mod/admin.php:413
+msgid "Registration"
 msgstr ""
 
-#: ../../mod/profperm.php:29 ../../mod/profperm.php:58
-msgid "Invalid profile identifier."
+#: ../../mod/register.php:212
+msgid "Membership on this site is by invitation only."
 msgstr ""
 
-#: ../../mod/profperm.php:110
-msgid "Profile Visibility Editor"
+#: ../../mod/register.php:213
+msgid "Please enter your invitation code"
 msgstr ""
 
-#: ../../mod/profperm.php:114
-msgid "Click on a contact to add or remove."
+#: ../../mod/register.php:216
+msgid "Your email address"
 msgstr ""
 
-#: ../../mod/profperm.php:123
-msgid "Visible To"
+#: ../../mod/register.php:217
+msgid "Choose a password"
 msgstr ""
 
-#: ../../mod/profperm.php:139 ../../mod/connections.php:279
-msgid "All Connections"
+#: ../../mod/register.php:218
+msgid "Please re-enter your password"
 msgstr ""
 
 #: ../../mod/events.php:81
@@ -4907,6 +4831,10 @@ msgstr ""
 msgid "Create New Event"
 msgstr ""
 
+#: ../../mod/events.php:433 ../../mod/photos.php:859
+msgid "Previous"
+msgstr ""
+
 #: ../../mod/events.php:560
 msgid "Event details"
 msgstr ""
@@ -5038,94 +4966,45 @@ msgstr ""
 msgid "%1$s's Chatrooms"
 msgstr ""
 
-#: ../../mod/register.php:42
-msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
-msgstr ""
-
-#: ../../mod/register.php:48
-msgid ""
-"Please indicate acceptance of the Terms of Service. Registration failed."
-msgstr ""
-
-#: ../../mod/register.php:82
-msgid "Passwords do not match."
-msgstr ""
-
-#: ../../mod/register.php:115
-msgid ""
-"Registration successful. Please check your email for validation instructions."
-msgstr ""
-
-#: ../../mod/register.php:121
-msgid "Your registration is pending approval by the site owner."
-msgstr ""
-
-#: ../../mod/register.php:124
-msgid "Your registration can not be processed."
-msgstr ""
-
-#: ../../mod/register.php:161
-msgid "Registration on this site/hub is by approval only."
-msgstr ""
-
-#: ../../mod/register.php:162
-msgid "<a href=\"pubsites\">Register at another affiliated site/hub</a>"
-msgstr ""
-
-#: ../../mod/register.php:170
-msgid ""
-"This site has exceeded the number of allowed daily account registrations. "
-"Please try again tomorrow."
-msgstr ""
-
-#: ../../mod/register.php:181
-msgid "Terms of Service"
-msgstr ""
-
-#: ../../mod/register.php:187
-#, php-format
-msgid "I accept the %s for this website"
-msgstr ""
-
-#: ../../mod/register.php:189
+#: ../../mod/subthread.php:103
 #, php-format
-msgid "I am over 13 years of age and accept the %s for this website"
+msgid "%1$s is following %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/register.php:203 ../../mod/admin.php:415
-msgid "Registration"
+#: ../../mod/chatsvc.php:111
+msgid "Away"
 msgstr ""
 
-#: ../../mod/register.php:208
-msgid "Membership on this site is by invitation only."
+#: ../../mod/chatsvc.php:115
+msgid "Online"
 msgstr ""
 
-#: ../../mod/register.php:209
-msgid "Please enter your invitation code"
+#: ../../mod/regmod.php:11
+msgid "Please login."
 msgstr ""
 
-#: ../../mod/register.php:212
-msgid "Your email address"
+#: ../../mod/network.php:79
+msgid "No such group"
 msgstr ""
 
-#: ../../mod/register.php:213
-msgid "Choose a password"
+#: ../../mod/network.php:118
+msgid "Search Results For:"
 msgstr ""
 
-#: ../../mod/register.php:214
-msgid "Please re-enter your password"
+#: ../../mod/network.php:172
+msgid "Collection is empty"
 msgstr ""
 
-#: ../../mod/chatsvc.php:111
-msgid "Away"
+#: ../../mod/network.php:180
+msgid "Collection: "
 msgstr ""
 
-#: ../../mod/chatsvc.php:115
-msgid "Online"
+#: ../../mod/network.php:193
+msgid "Connection: "
 msgstr ""
 
-#: ../../mod/regmod.php:11
-msgid "Please login."
+#: ../../mod/network.php:196
+msgid "Invalid connection."
 msgstr ""
 
 #: ../../mod/removeme.php:29
@@ -5200,71 +5079,147 @@ msgstr ""
 msgid "Authenticate"
 msgstr ""
 
-#: ../../mod/connect.php:55 ../../mod/connect.php:103
-msgid "Continue"
+#: ../../mod/filer.php:49
+msgid "- select -"
 msgstr ""
 
-#: ../../mod/connect.php:84
-msgid "Premium Channel Setup"
+#: ../../mod/photos.php:77
+msgid "Page owner information could not be retrieved."
 msgstr ""
 
-#: ../../mod/connect.php:86
-msgid "Enable premium channel connection restrictions"
+#: ../../mod/photos.php:97
+msgid "Album not found."
 msgstr ""
 
-#: ../../mod/connect.php:87
-msgid ""
-"Please enter your restrictions or conditions, such as paypal receipt, usage "
-"guidelines, etc."
+#: ../../mod/photos.php:119 ../../mod/photos.php:672
+msgid "Delete Album"
 msgstr ""
 
-#: ../../mod/connect.php:89 ../../mod/connect.php:109
-msgid ""
-"This channel may require additional steps or acknowledgement of the "
-"following conditions prior to connecting:"
+#: ../../mod/photos.php:159 ../../mod/photos.php:957
+msgid "Delete Photo"
 msgstr ""
 
-#: ../../mod/connect.php:90
-msgid ""
-"Potential connections will then see the following text before proceeding:"
+#: ../../mod/photos.php:469
+msgid "No photos selected"
 msgstr ""
 
-#: ../../mod/connect.php:91 ../../mod/connect.php:112
-msgid ""
-"By continuing, I certify that I have complied with any instructions provided "
-"on this page."
+#: ../../mod/photos.php:513
+msgid "Access to this item is restricted."
 msgstr ""
 
-#: ../../mod/connect.php:100
-msgid "(No specific instructions have been provided by the channel owner.)"
+#: ../../mod/photos.php:552
+#, php-format
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr ""
 
-#: ../../mod/connect.php:108
-msgid "Restricted or Premium Channel"
+#: ../../mod/photos.php:555
+#, php-format
+msgid "%1$.2f MB photo storage used."
 msgstr ""
 
-#: ../../mod/network.php:79
-msgid "No such group"
+#: ../../mod/photos.php:579
+msgid "Upload Photos"
 msgstr ""
 
-#: ../../mod/network.php:118
-msgid "Search Results For:"
+#: ../../mod/photos.php:583 ../../mod/photos.php:665 ../../mod/photos.php:943
+msgid "Enter a new album name"
 msgstr ""
 
-#: ../../mod/network.php:172
-msgid "Collection is empty"
+#: ../../mod/photos.php:584 ../../mod/photos.php:666 ../../mod/photos.php:944
+msgid "or select an existing one (doubleclick)"
 msgstr ""
 
-#: ../../mod/network.php:180
-msgid "Collection: "
+#: ../../mod/photos.php:585
+msgid "Do not show a status post for this upload"
 msgstr ""
 
-#: ../../mod/network.php:193
-msgid "Connection: "
+#: ../../mod/photos.php:613
+msgid "Album name could not be decoded"
 msgstr ""
 
-#: ../../mod/network.php:196
-msgid "Invalid connection."
+#: ../../mod/photos.php:654 ../../mod/photos.php:1166
+#: ../../mod/photos.php:1182
+msgid "Contact Photos"
+msgstr ""
+
+#: ../../mod/photos.php:678
+msgid "Show Newest First"
+msgstr ""
+
+#: ../../mod/photos.php:680
+msgid "Show Oldest First"
+msgstr ""
+
+#: ../../mod/photos.php:707 ../../mod/photos.php:1214
+msgid "View Photo"
+msgstr ""
+
+#: ../../mod/photos.php:736
+msgid "Edit Album"
+msgstr ""
+
+#: ../../mod/photos.php:781
+msgid "Permission denied. Access to this item may be restricted."
+msgstr ""
+
+#: ../../mod/photos.php:783
+msgid "Photo not available"
+msgstr ""
+
+#: ../../mod/photos.php:841
+msgid "Use as profile photo"
+msgstr ""
+
+#: ../../mod/photos.php:848
+msgid "Private Photo"
+msgstr ""
+
+#: ../../mod/photos.php:863
+msgid "View Full Size"
+msgstr ""
+
+#: ../../mod/photos.php:905 ../../mod/delegate.php:130 ../../mod/tagrm.php:133
+msgid "Remove"
+msgstr ""
+
+#: ../../mod/photos.php:937
+msgid "Edit photo"
+msgstr ""
+
+#: ../../mod/photos.php:939
+msgid "Rotate CW (right)"
+msgstr ""
+
+#: ../../mod/photos.php:940
+msgid "Rotate CCW (left)"
+msgstr ""
+
+#: ../../mod/photos.php:947
+msgid "Caption"
+msgstr ""
+
+#: ../../mod/photos.php:949
+msgid "Add a Tag"
+msgstr ""
+
+#: ../../mod/photos.php:953
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+msgstr ""
+
+#: ../../mod/photos.php:955
+msgid "Flag as adult in album view"
+msgstr ""
+
+#: ../../mod/photos.php:1132
+msgid "In This Photo:"
+msgstr ""
+
+#: ../../mod/photos.php:1220
+msgid "View Album"
+msgstr ""
+
+#: ../../mod/photos.php:1243
+msgid "Recent Photos"
 msgstr ""
 
 #: ../../mod/connections.php:37 ../../mod/connedit.php:64
@@ -5360,6 +5315,31 @@ msgstr ""
 msgid "Finding: "
 msgstr ""
 
+#: ../../mod/manage.php:136
+#, php-format
+msgid "You have created %1$.0f of %2$.0f allowed channels."
+msgstr ""
+
+#: ../../mod/manage.php:144
+msgid "Create a new channel"
+msgstr ""
+
+#: ../../mod/manage.php:149
+msgid "Current Channel"
+msgstr ""
+
+#: ../../mod/manage.php:151
+msgid "Attach to one of your channels by selecting it."
+msgstr ""
+
+#: ../../mod/manage.php:152
+msgid "Default Channel"
+msgstr ""
+
+#: ../../mod/manage.php:153
+msgid "Make Default"
+msgstr ""
+
 #: ../../mod/rpost.php:97 ../../mod/editpost.php:42
 msgid "Edit post"
 msgstr ""
@@ -5448,12 +5428,12 @@ msgid "View recent posts and comments"
 msgstr ""
 
 #: ../../mod/connedit.php:450 ../../mod/connedit.php:594
-#: ../../mod/admin.php:734
+#: ../../mod/admin.php:732
 msgid "Unblock"
 msgstr ""
 
 #: ../../mod/connedit.php:450 ../../mod/connedit.php:594
-#: ../../mod/admin.php:733
+#: ../../mod/admin.php:731
 msgid "Block"
 msgstr ""
 
@@ -5673,59 +5653,138 @@ msgid ""
 "Replies/likes to your public posts <strong>may</strong> still be visible"
 msgstr ""
 
-#: ../../mod/delegate.php:95
-msgid "No potential page delegates located."
+#: ../../mod/openid.php:26
+msgid "OpenID protocol error. No ID returned."
 msgstr ""
 
-#: ../../mod/delegate.php:121
-msgid "Delegate Page Management"
+#: ../../mod/thing.php:96
+msgid "Thing updated"
 msgstr ""
 
-#: ../../mod/delegate.php:123
+#: ../../mod/thing.php:156
+msgid "Object store: failed"
+msgstr ""
+
+#: ../../mod/thing.php:160
+msgid "Thing added"
+msgstr ""
+
+#: ../../mod/thing.php:180
+#, php-format
+msgid "OBJ: %1$s %2$s %3$s"
+msgstr ""
+
+#: ../../mod/thing.php:232
+msgid "Show Thing"
+msgstr ""
+
+#: ../../mod/thing.php:239
+msgid "item not found."
+msgstr ""
+
+#: ../../mod/thing.php:270
+msgid "Edit Thing"
+msgstr ""
+
+#: ../../mod/thing.php:272 ../../mod/thing.php:319
+msgid "Select a profile"
+msgstr ""
+
+#: ../../mod/thing.php:276 ../../mod/thing.php:322
+msgid "Post an activity"
+msgstr ""
+
+#: ../../mod/thing.php:276 ../../mod/thing.php:322
+msgid "Only sends to viewers of the applicable profile"
+msgstr ""
+
+#: ../../mod/thing.php:278 ../../mod/thing.php:324
+msgid "Name of thing e.g. something"
+msgstr ""
+
+#: ../../mod/thing.php:280 ../../mod/thing.php:325
+msgid "URL of thing (optional)"
+msgstr ""
+
+#: ../../mod/thing.php:282 ../../mod/thing.php:326
+msgid "URL for photo of thing (optional)"
+msgstr ""
+
+#: ../../mod/thing.php:317
+msgid "Add Thing to your Profile"
+msgstr ""
+
+#: ../../mod/lostpass.php:15
+msgid "No valid account found."
+msgstr ""
+
+#: ../../mod/lostpass.php:29
+msgid "Password reset request issued. Check your email."
+msgstr ""
+
+#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102
+#, php-format
+msgid "Site Member (%s)"
+msgstr ""
+
+#: ../../mod/lostpass.php:40
+#, php-format
+msgid "Password reset requested at %s"
+msgstr ""
+
+#: ../../mod/lostpass.php:63
 msgid ""
-"Delegates are able to manage all aspects of this account/page except for "
-"basic account settings. Please do not delegate your personal account to "
-"anybody that you do not trust completely."
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
 msgstr ""
 
-#: ../../mod/delegate.php:124
-msgid "Existing Page Managers"
+#: ../../mod/lostpass.php:85 ../../boot.php:1494
+msgid "Password Reset"
 msgstr ""
 
-#: ../../mod/delegate.php:126
-msgid "Existing Page Delegates"
+#: ../../mod/lostpass.php:86
+msgid "Your password has been reset as requested."
 msgstr ""
 
-#: ../../mod/delegate.php:128
-msgid "Potential Delegates"
+#: ../../mod/lostpass.php:87
+msgid "Your new password is"
 msgstr ""
 
-#: ../../mod/delegate.php:131
-msgid "Add"
+#: ../../mod/lostpass.php:88
+msgid "Save or copy your new password - and then"
 msgstr ""
 
-#: ../../mod/delegate.php:132
-msgid "No entries."
+#: ../../mod/lostpass.php:89
+msgid "click here to login"
 msgstr ""
 
-#: ../../mod/directory.php:146 ../../mod/dirprofile.php:95
-msgid "Gender: "
+#: ../../mod/lostpass.php:90
+msgid ""
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
 msgstr ""
 
-#: ../../mod/directory.php:223
-msgid "Finding:"
+#: ../../mod/lostpass.php:107
+#, php-format
+msgid "Your password has changed at %s"
 msgstr ""
 
-#: ../../mod/directory.php:228
-msgid "next page"
+#: ../../mod/lostpass.php:122
+msgid "Forgot your Password?"
 msgstr ""
 
-#: ../../mod/directory.php:228
-msgid "previous page"
+#: ../../mod/lostpass.php:123
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
 msgstr ""
 
-#: ../../mod/directory.php:245
-msgid "No entries (some entries may be hidden)."
+#: ../../mod/lostpass.php:124
+msgid "Email Address"
+msgstr ""
+
+#: ../../mod/lostpass.php:125
+msgid "Reset"
 msgstr ""
 
 #: ../../mod/bookmarks.php:38
@@ -5740,497 +5799,632 @@ msgstr ""
 msgid "My Connections Bookmarks"
 msgstr ""
 
-#: ../../mod/dirprofile.php:108
-msgid "Status: "
+#: ../../mod/dirsearch.php:21
+msgid "This site is not a directory server"
 msgstr ""
 
-#: ../../mod/dirprofile.php:109
-msgid "Sexual Preference: "
+#: ../../mod/cloud.php:130
+msgid "RedMatrix - Guests: Username: {your email address}, Password: +++"
 msgstr ""
 
-#: ../../mod/dirprofile.php:111
-msgid "Homepage: "
+#: ../../mod/ping.php:257
+msgid "sent you a private message"
 msgstr ""
 
-#: ../../mod/dirprofile.php:112
-msgid "Hometown: "
+#: ../../mod/ping.php:308
+msgid "added your channel"
 msgstr ""
 
-#: ../../mod/dirprofile.php:114
-msgid "About: "
+#: ../../mod/ping.php:349
+msgid "posted an event"
 msgstr ""
 
-#: ../../mod/dirprofile.php:162
-msgid "Keywords: "
+#: ../../mod/editblock.php:79 ../../mod/editblock.php:95
+#: ../../mod/editlayout.php:78 ../../mod/editpost.php:20
+#: ../../mod/editwebpage.php:77
+msgid "Item not found"
 msgstr ""
 
-#: ../../mod/dirsearch.php:21
-msgid "This site is not a directory server"
+#: ../../mod/editblock.php:115
+msgid "Edit Block"
 msgstr ""
 
-#: ../../mod/cloud.php:130
-msgid "RedMatrix - Guests: Username: {your email address}, Password: +++"
+#: ../../mod/editblock.php:125
+msgid "Delete block?"
 msgstr ""
 
-#: ../../mod/setup.php:162
-msgid "Red Matrix Server - Setup"
+#: ../../mod/editblock.php:147 ../../mod/editlayout.php:143
+#: ../../mod/editpost.php:116 ../../mod/editwebpage.php:178
+msgid "Insert YouTube video"
 msgstr ""
 
-#: ../../mod/setup.php:168
-msgid "Could not connect to database."
+#: ../../mod/editblock.php:148 ../../mod/editlayout.php:144
+#: ../../mod/editpost.php:117 ../../mod/editwebpage.php:179
+msgid "Insert Vorbis [.ogg] video"
 msgstr ""
 
-#: ../../mod/setup.php:172
-msgid ""
-"Could not connect to specified site URL. Possible SSL certificate or DNS "
-"issue."
+#: ../../mod/editblock.php:149 ../../mod/editlayout.php:145
+#: ../../mod/editpost.php:118 ../../mod/editwebpage.php:180
+msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../mod/setup.php:179
-msgid "Could not create table."
+#: ../../mod/editblock.php:183
+msgid "Delete Block"
 msgstr ""
 
-#: ../../mod/setup.php:185
-msgid "Your site database has been installed."
+#: ../../mod/pdledit.php:13
+msgid "Layout updated."
 msgstr ""
 
-#: ../../mod/setup.php:190
-msgid ""
-"You may need to import the file \"install/database.sql\" manually using "
-"phpmyadmin or mysql."
+#: ../../mod/pdledit.php:28 ../../mod/pdledit.php:53
+msgid "Edit System Page Description"
 msgstr ""
 
-#: ../../mod/setup.php:191 ../../mod/setup.php:260 ../../mod/setup.php:655
-msgid "Please see the file \"install/INSTALL.txt\"."
+#: ../../mod/pdledit.php:48
+msgid "Layout not found."
 msgstr ""
 
-#: ../../mod/setup.php:257
-msgid "System check"
+#: ../../mod/pdledit.php:54
+msgid "Module Name:"
 msgstr ""
 
-#: ../../mod/setup.php:262
-msgid "Check again"
+#: ../../mod/pdledit.php:55 ../../mod/layouts.php:107
+msgid "Layout Help"
 msgstr ""
 
-#: ../../mod/setup.php:284
-msgid "Database connection"
+#: ../../mod/editlayout.php:108
+msgid "Edit Layout"
 msgstr ""
 
-#: ../../mod/setup.php:285
-msgid ""
-"In order to install Red Matrix we need to know how to connect to your "
-"database."
+#: ../../mod/editlayout.php:117
+msgid "Delete layout?"
 msgstr ""
 
-#: ../../mod/setup.php:286
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
+#: ../../mod/editlayout.php:178
+msgid "Delete Layout"
 msgstr ""
 
-#: ../../mod/setup.php:287
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
+#: ../../mod/editpost.php:31
+msgid "Item is not editable"
 msgstr ""
 
-#: ../../mod/setup.php:291
-msgid "Database Server Name"
+#: ../../mod/editpost.php:53
+msgid "Delete item?"
 msgstr ""
 
-#: ../../mod/setup.php:291
-msgid "Default is localhost"
+#: ../../mod/settings.php:73
+msgid "Name is required"
 msgstr ""
 
-#: ../../mod/setup.php:292
-msgid "Database Port"
+#: ../../mod/settings.php:77
+msgid "Key and Secret are required"
 msgstr ""
 
-#: ../../mod/setup.php:292
-msgid "Communication port number - use 0 for default"
+#: ../../mod/settings.php:197
+msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../mod/setup.php:293
-msgid "Database Login Name"
+#: ../../mod/settings.php:201
+msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../mod/setup.php:294
-msgid "Database Login Password"
+#: ../../mod/settings.php:215
+msgid "Password changed."
 msgstr ""
 
-#: ../../mod/setup.php:295
-msgid "Database Name"
+#: ../../mod/settings.php:217
+msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/setup.php:297 ../../mod/setup.php:339
-msgid "Site administrator email address"
+#: ../../mod/settings.php:231
+msgid "Not valid email."
 msgstr ""
 
-#: ../../mod/setup.php:297 ../../mod/setup.php:339
-msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
+#: ../../mod/settings.php:234
+msgid "Protected email address. Cannot change to that email."
 msgstr ""
 
-#: ../../mod/setup.php:298 ../../mod/setup.php:341
-msgid "Website URL"
+#: ../../mod/settings.php:243
+msgid "System failure storing new email. Please try again."
 msgstr ""
 
-#: ../../mod/setup.php:298 ../../mod/setup.php:341
-msgid "Please use SSL (https) URL if available."
+#: ../../mod/settings.php:479
+msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/setup.php:301 ../../mod/setup.php:344
-msgid "Please select a default timezone for your website"
+#: ../../mod/settings.php:548 ../../mod/settings.php:574
+#: ../../mod/settings.php:610
+msgid "Add application"
 msgstr ""
 
-#: ../../mod/setup.php:328
-msgid "Site settings"
+#: ../../mod/settings.php:551
+msgid "Name of application"
 msgstr ""
 
-#: ../../mod/setup.php:387
-msgid "Could not find a command line version of PHP in the web server PATH."
+#: ../../mod/settings.php:552 ../../mod/settings.php:578
+msgid "Consumer Key"
 msgstr ""
 
-#: ../../mod/setup.php:388
-msgid ""
-"If you don't have a command line version of PHP installed on server, you "
-"will not be able to run background polling via cron."
+#: ../../mod/settings.php:552 ../../mod/settings.php:553
+msgid "Automatically generated - change if desired. Max length 20"
 msgstr ""
 
-#: ../../mod/setup.php:392
-msgid "PHP executable path"
+#: ../../mod/settings.php:553 ../../mod/settings.php:579
+msgid "Consumer Secret"
 msgstr ""
 
-#: ../../mod/setup.php:392
+#: ../../mod/settings.php:554 ../../mod/settings.php:580
+msgid "Redirect"
+msgstr ""
+
+#: ../../mod/settings.php:554
 msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
+"Redirect URI - leave blank unless your application specifically requires this"
 msgstr ""
 
-#: ../../mod/setup.php:397
-msgid "Command line PHP"
+#: ../../mod/settings.php:555 ../../mod/settings.php:581
+msgid "Icon url"
 msgstr ""
 
-#: ../../mod/setup.php:406
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
+#: ../../mod/settings.php:555
+msgid "Optional"
 msgstr ""
 
-#: ../../mod/setup.php:407
-msgid "This is required for message delivery to work."
+#: ../../mod/settings.php:566
+msgid "You can't edit this application."
 msgstr ""
 
-#: ../../mod/setup.php:409
-msgid "PHP register_argc_argv"
+#: ../../mod/settings.php:609
+msgid "Connected Apps"
 msgstr ""
 
-#: ../../mod/setup.php:430
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
+#: ../../mod/settings.php:613
+msgid "Client key starts with"
 msgstr ""
 
-#: ../../mod/setup.php:431
-msgid ""
-"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
-"installation.php\"."
+#: ../../mod/settings.php:614
+msgid "No name"
 msgstr ""
 
-#: ../../mod/setup.php:433
-msgid "Generate encryption keys"
+#: ../../mod/settings.php:615
+msgid "Remove authorization"
 msgstr ""
 
-#: ../../mod/setup.php:440
-msgid "libCurl PHP module"
+#: ../../mod/settings.php:626
+msgid "No feature settings configured"
 msgstr ""
 
-#: ../../mod/setup.php:441
-msgid "GD graphics PHP module"
+#: ../../mod/settings.php:634
+msgid "Feature Settings"
 msgstr ""
 
-#: ../../mod/setup.php:442
-msgid "OpenSSL PHP module"
+#: ../../mod/settings.php:657
+msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/setup.php:443
-msgid "mysqli PHP module"
+#: ../../mod/settings.php:658
+msgid "Password Settings"
 msgstr ""
 
-#: ../../mod/setup.php:444
-msgid "mb_string PHP module"
+#: ../../mod/settings.php:659
+msgid "New Password:"
 msgstr ""
 
-#: ../../mod/setup.php:445
-msgid "mcrypt PHP module"
+#: ../../mod/settings.php:660
+msgid "Confirm:"
 msgstr ""
 
-#: ../../mod/setup.php:450 ../../mod/setup.php:452
-msgid "Apache mod_rewrite module"
+#: ../../mod/settings.php:660
+msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/setup.php:450
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
+#: ../../mod/settings.php:662 ../../mod/settings.php:985
+msgid "Email Address:"
 msgstr ""
 
-#: ../../mod/setup.php:456 ../../mod/setup.php:459
-msgid "proc_open"
+#: ../../mod/settings.php:663 ../../mod/removeaccount.php:61
+msgid "Remove Account"
 msgstr ""
 
-#: ../../mod/setup.php:456
-msgid ""
-"Error: proc_open is required but is either not installed or has been "
-"disabled in php.ini"
+#: ../../mod/settings.php:664
+msgid "Remove this account from this server including all its channels"
 msgstr ""
 
-#: ../../mod/setup.php:464
-msgid "Error: libCURL PHP module required but not installed."
+#: ../../mod/settings.php:665 ../../mod/settings.php:1067
+msgid "Warning: This action is permanent and cannot be reversed."
 msgstr ""
 
-#: ../../mod/setup.php:468
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
+#: ../../mod/settings.php:681
+msgid "Off"
 msgstr ""
 
-#: ../../mod/setup.php:472
-msgid "Error: openssl PHP module required but not installed."
+#: ../../mod/settings.php:681
+msgid "On"
 msgstr ""
 
-#: ../../mod/setup.php:476
-msgid "Error: mysqli PHP module required but not installed."
+#: ../../mod/settings.php:688
+msgid "Additional Features"
 msgstr ""
 
-#: ../../mod/setup.php:480
-msgid "Error: mb_string PHP module required but not installed."
+#: ../../mod/settings.php:713
+msgid "Connector Settings"
 msgstr ""
 
-#: ../../mod/setup.php:484
-msgid "Error: mcrypt PHP module required but not installed."
+#: ../../mod/settings.php:743
+msgid "No special theme for mobile devices"
 msgstr ""
 
-#: ../../mod/setup.php:500
-msgid ""
-"The web installer needs to be able to create a file called \".htconfig.php\" "
-"in the top folder of your web server and it is unable to do so."
+#: ../../mod/settings.php:752
+#, php-format
+msgid "%s - (Experimental)"
 msgstr ""
 
-#: ../../mod/setup.php:501
-msgid ""
-"This is most often a permission setting, as the web server may not be able "
-"to write files in your folder - even if you can."
+#: ../../mod/settings.php:788
+msgid "Display Settings"
 msgstr ""
 
-#: ../../mod/setup.php:502
-msgid ""
-"At the end of this procedure, we will give you a text to save in a file "
-"named .htconfig.php in your Red top folder."
+#: ../../mod/settings.php:794
+msgid "Display Theme:"
 msgstr ""
 
-#: ../../mod/setup.php:503
-msgid ""
-"You can alternatively skip this procedure and perform a manual installation. "
-"Please see the file \"install/INSTALL.txt\" for instructions."
+#: ../../mod/settings.php:795
+msgid "Mobile Theme:"
 msgstr ""
 
-#: ../../mod/setup.php:506
-msgid ".htconfig.php is writable"
+#: ../../mod/settings.php:796
+msgid "Enable user zoom on mobile devices"
 msgstr ""
 
-#: ../../mod/setup.php:516
-msgid ""
-"Red uses the Smarty3 template engine to render its web views. Smarty3 "
-"compiles templates to PHP to speed up rendering."
+#: ../../mod/settings.php:797
+msgid "Update browser every xx seconds"
 msgstr ""
 
-#: ../../mod/setup.php:517
-#, php-format
-msgid ""
-"In order to store these compiled templates, the web server needs to have "
-"write access to the directory %s under the Red top level folder."
+#: ../../mod/settings.php:797
+msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
-#: ../../mod/setup.php:518 ../../mod/setup.php:536
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has "
-"write access to this folder."
+#: ../../mod/settings.php:798
+msgid "Maximum number of conversations to load at any time:"
 msgstr ""
 
-#: ../../mod/setup.php:519
-#, php-format
-msgid ""
-"Note: as a security measure, you should give the web server write access to "
-"%s only--not the template files (.tpl) that it contains."
+#: ../../mod/settings.php:798
+msgid "Maximum of 100 items"
 msgstr ""
 
-#: ../../mod/setup.php:522
-#, php-format
-msgid "%s is writable"
+#: ../../mod/settings.php:799
+msgid "Don't show emoticons"
 msgstr ""
 
-#: ../../mod/setup.php:535
-msgid ""
-"Red uses the store directory to save uploaded files. The web server needs to "
-"have write access to the store directory under the Red top level folder"
+#: ../../mod/settings.php:800
+msgid "Link post titles to source"
 msgstr ""
 
-#: ../../mod/setup.php:539
-msgid "store is writable"
+#: ../../mod/settings.php:801
+msgid "System Page Layout Editor - (advanced)"
 msgstr ""
 
-#: ../../mod/setup.php:569
-msgid ""
-"SSL certificate cannot be validated. Fix certificate or disable https access "
-"to this site."
+#: ../../mod/settings.php:835
+msgid "Nobody except yourself"
 msgstr ""
 
-#: ../../mod/setup.php:570
-msgid ""
-"If you have https access to your website or allow connections to TCP port "
-"443 (the https: port), you MUST use a browser-valid certificate. You MUST "
-"NOT use self-signed certificates!"
+#: ../../mod/settings.php:836
+msgid "Only those you specifically allow"
 msgstr ""
 
-#: ../../mod/setup.php:571
-msgid ""
-"This restriction is incorporated because public posts from you may for "
-"example contain references to images on your own hub."
+#: ../../mod/settings.php:837
+msgid "Approved connections"
+msgstr ""
+
+#: ../../mod/settings.php:838
+msgid "Any connections"
+msgstr ""
+
+#: ../../mod/settings.php:839
+msgid "Anybody on this website"
+msgstr ""
+
+#: ../../mod/settings.php:840
+msgid "Anybody in this network"
+msgstr ""
+
+#: ../../mod/settings.php:841
+msgid "Anybody authenticated"
+msgstr ""
+
+#: ../../mod/settings.php:842
+msgid "Anybody on the internet"
+msgstr ""
+
+#: ../../mod/settings.php:916
+msgid "Publish your default profile in the network directory"
+msgstr ""
+
+#: ../../mod/settings.php:921
+msgid "Allow us to suggest you as a potential friend to new members?"
+msgstr ""
+
+#: ../../mod/settings.php:925 ../../mod/profile_photo.php:365
+msgid "or"
+msgstr ""
+
+#: ../../mod/settings.php:930
+msgid "Your channel address is"
+msgstr ""
+
+#: ../../mod/settings.php:974
+msgid "Channel Settings"
+msgstr ""
+
+#: ../../mod/settings.php:983
+msgid "Basic Settings"
+msgstr ""
+
+#: ../../mod/settings.php:986
+msgid "Your Timezone:"
+msgstr ""
+
+#: ../../mod/settings.php:987
+msgid "Default Post Location:"
+msgstr ""
+
+#: ../../mod/settings.php:987
+msgid "Geographical location to display on your posts"
+msgstr ""
+
+#: ../../mod/settings.php:988
+msgid "Use Browser Location:"
+msgstr ""
+
+#: ../../mod/settings.php:990
+msgid "Adult Content"
 msgstr ""
 
-#: ../../mod/setup.php:572
+#: ../../mod/settings.php:990
 msgid ""
-"If your certificate is not recognized, members of other sites (who may "
-"themselves have valid certificates) will get a warning message on their own "
-"site complaining about security issues."
+"This channel frequently or regularly publishes adult content. (Please tag "
+"any adult material and/or nudity with #NSFW)"
+msgstr ""
+
+#: ../../mod/settings.php:992
+msgid "Security and Privacy Settings"
+msgstr ""
+
+#: ../../mod/settings.php:994
+msgid "Your permissions are already configured. Click to view/adjust"
+msgstr ""
+
+#: ../../mod/settings.php:996
+msgid "Hide my online presence"
+msgstr ""
+
+#: ../../mod/settings.php:996
+msgid "Prevents displaying in your profile that you are online"
+msgstr ""
+
+#: ../../mod/settings.php:998
+msgid "Simple Privacy Settings:"
 msgstr ""
 
-#: ../../mod/setup.php:573
+#: ../../mod/settings.php:999
 msgid ""
-"This can cause usability issues elsewhere (not just on your own site) so we "
-"must insist on this requirement."
+"Very Public - <em>extremely permissive (should be used with caution)</em>"
 msgstr ""
 
-#: ../../mod/setup.php:574
+#: ../../mod/settings.php:1000
 msgid ""
-"Providers are available that issue free certificates which are browser-valid."
+"Typical - <em>default public, privacy when desired (similar to social "
+"network permissions but with improved privacy)</em>"
 msgstr ""
 
-#: ../../mod/setup.php:576
-msgid "SSL certificate validation"
+#: ../../mod/settings.php:1001
+msgid "Private - <em>default private, never open or public</em>"
 msgstr ""
 
-#: ../../mod/setup.php:582
-msgid ""
-"Url rewrite in .htaccess is not working. Check your server configuration."
+#: ../../mod/settings.php:1002
+msgid "Blocked - <em>default blocked to/from everybody</em>"
 msgstr ""
 
-#: ../../mod/setup.php:584
-msgid "Url rewrite is working"
+#: ../../mod/settings.php:1004
+msgid "Allow others to tag your posts"
 msgstr ""
 
-#: ../../mod/setup.php:594
+#: ../../mod/settings.php:1004
 msgid ""
-"The database configuration file \".htconfig.php\" could not be written. "
-"Please use the enclosed text to create a configuration file in your web "
-"server root."
+"Often used by the community to retro-actively flag inappropriate content"
 msgstr ""
 
-#: ../../mod/setup.php:618
-msgid "Errors encountered creating database tables."
+#: ../../mod/settings.php:1006
+msgid "Advanced Privacy Settings"
 msgstr ""
 
-#: ../../mod/setup.php:653
-msgid "<h1>What next</h1>"
+#: ../../mod/settings.php:1008
+msgid "Expire other channel content after this many days"
 msgstr ""
 
-#: ../../mod/setup.php:654
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
+#: ../../mod/settings.php:1008
+msgid "0 or blank prevents expiration"
 msgstr ""
 
-#: ../../mod/editblock.php:8 ../../mod/editblock.php:27
-#: ../../mod/editblock.php:53 ../../mod/editlayout.php:36
-#: ../../mod/editpost.php:20 ../../mod/editwebpage.php:32
-msgid "Item not found"
+#: ../../mod/settings.php:1009
+msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/editblock.php:77
-msgid "Edit Block"
+#: ../../mod/settings.php:1009
+msgid "May reduce spam activity"
 msgstr ""
 
-#: ../../mod/editblock.php:87
-msgid "Delete block?"
+#: ../../mod/settings.php:1010
+msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/editblock.php:115 ../../mod/editlayout.php:110
-#: ../../mod/editpost.php:116 ../../mod/editwebpage.php:147
-msgid "Insert YouTube video"
+#: ../../mod/settings.php:1015
+msgid "Channel permissions category:"
 msgstr ""
 
-#: ../../mod/editblock.php:116 ../../mod/editlayout.php:111
-#: ../../mod/editpost.php:117 ../../mod/editwebpage.php:148
-msgid "Insert Vorbis [.ogg] video"
+#: ../../mod/settings.php:1023
+msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: ../../mod/editblock.php:117 ../../mod/editlayout.php:112
-#: ../../mod/editpost.php:118 ../../mod/editwebpage.php:149
-msgid "Insert Vorbis [.ogg] audio"
+#: ../../mod/settings.php:1023
+msgid "Useful to reduce spamming"
 msgstr ""
 
-#: ../../mod/editblock.php:153
-msgid "Delete Block"
+#: ../../mod/settings.php:1026
+msgid "Notification Settings"
 msgstr ""
 
-#: ../../mod/pdledit.php:13
-msgid "Layout updated."
+#: ../../mod/settings.php:1027
+msgid "By default post a status message when:"
 msgstr ""
 
-#: ../../mod/pdledit.php:28 ../../mod/pdledit.php:53
-msgid "Edit System Page Description"
+#: ../../mod/settings.php:1028
+msgid "accepting a friend request"
 msgstr ""
 
-#: ../../mod/pdledit.php:48
-msgid "Layout not found."
+#: ../../mod/settings.php:1029
+msgid "joining a forum/community"
 msgstr ""
 
-#: ../../mod/pdledit.php:54
-msgid "Module Name:"
+#: ../../mod/settings.php:1030
+msgid "making an <em>interesting</em> profile change"
 msgstr ""
 
-#: ../../mod/pdledit.php:55 ../../mod/layouts.php:59
-msgid "Layout Help"
+#: ../../mod/settings.php:1031
+msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../mod/editlayout.php:72
-msgid "Edit Layout"
+#: ../../mod/settings.php:1032
+msgid "You receive a connection request"
 msgstr ""
 
-#: ../../mod/editlayout.php:82
-msgid "Delete layout?"
+#: ../../mod/settings.php:1033
+msgid "Your connections are confirmed"
 msgstr ""
 
-#: ../../mod/editlayout.php:146
-msgid "Delete Layout"
+#: ../../mod/settings.php:1034
+msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../mod/editpost.php:31
-msgid "Item is not editable"
+#: ../../mod/settings.php:1035
+msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../mod/editpost.php:53
-msgid "Delete item?"
+#: ../../mod/settings.php:1036
+msgid "You receive a private message"
 msgstr ""
 
-#: ../../mod/editwebpage.php:106
+#: ../../mod/settings.php:1037
+msgid "You receive a friend suggestion"
+msgstr ""
+
+#: ../../mod/settings.php:1038
+msgid "You are tagged in a post"
+msgstr ""
+
+#: ../../mod/settings.php:1039
+msgid "You are poked/prodded/etc. in a post"
+msgstr ""
+
+#: ../../mod/settings.php:1042
+msgid "Show visual notifications including:"
+msgstr ""
+
+#: ../../mod/settings.php:1044
+msgid "Unseen matrix activity"
+msgstr ""
+
+#: ../../mod/settings.php:1045
+msgid "Unseen channel activity"
+msgstr ""
+
+#: ../../mod/settings.php:1046
+msgid "Unseen private messages"
+msgstr ""
+
+#: ../../mod/settings.php:1046 ../../mod/settings.php:1051
+#: ../../mod/settings.php:1052 ../../mod/settings.php:1053
+msgid "Recommended"
+msgstr ""
+
+#: ../../mod/settings.php:1047
+msgid "Upcoming events"
+msgstr ""
+
+#: ../../mod/settings.php:1048
+msgid "Events today"
+msgstr ""
+
+#: ../../mod/settings.php:1049
+msgid "Upcoming birthdays"
+msgstr ""
+
+#: ../../mod/settings.php:1049
+msgid "Not available in all themes"
+msgstr ""
+
+#: ../../mod/settings.php:1050
+msgid "System (personal) notifications"
+msgstr ""
+
+#: ../../mod/settings.php:1051
+msgid "System info messages"
+msgstr ""
+
+#: ../../mod/settings.php:1052
+msgid "System critical alerts"
+msgstr ""
+
+#: ../../mod/settings.php:1053
+msgid "New connections"
+msgstr ""
+
+#: ../../mod/settings.php:1054
+msgid "System Registrations"
+msgstr ""
+
+#: ../../mod/settings.php:1056
+msgid "Notify me of events this many days in advance"
+msgstr ""
+
+#: ../../mod/settings.php:1056
+msgid "Must be greater than 0"
+msgstr ""
+
+#: ../../mod/settings.php:1058
+msgid "Advanced Account/Page Type Settings"
+msgstr ""
+
+#: ../../mod/settings.php:1059
+msgid "Change the behaviour of this account for special situations"
+msgstr ""
+
+#: ../../mod/settings.php:1062
+msgid ""
+"Please enable expert mode (in <a href=\"settings/features\">Settings > "
+"Additional features</a>) to adjust!"
+msgstr ""
+
+#: ../../mod/settings.php:1063
+msgid "Miscellaneous Settings"
+msgstr ""
+
+#: ../../mod/settings.php:1065
+msgid "Personal menu to display in your channel pages"
+msgstr ""
+
+#: ../../mod/settings.php:1066
+msgid "Remove this channel"
+msgstr ""
+
+#: ../../mod/editwebpage.php:140
 msgid "Edit Webpage"
 msgstr ""
 
-#: ../../mod/editwebpage.php:116
+#: ../../mod/editwebpage.php:150
 msgid "Delete webpage?"
 msgstr ""
 
-#: ../../mod/editwebpage.php:186
+#: ../../mod/editwebpage.php:215
 msgid "Delete Webpage"
 msgstr ""
 
@@ -6323,71 +6517,21 @@ msgstr ""
 msgid "Image size reduction [%s] failed."
 msgstr ""
 
-#: ../../mod/sources.php:32
-msgid "Failed to create source. No channel selected."
-msgstr ""
-
-#: ../../mod/sources.php:45
-msgid "Source created."
-msgstr ""
-
-#: ../../mod/sources.php:57
-msgid "Source updated."
-msgstr ""
-
-#: ../../mod/sources.php:82
-msgid "*"
-msgstr ""
-
-#: ../../mod/sources.php:89
-msgid "Manage remote sources of content for your channel."
-msgstr ""
-
-#: ../../mod/sources.php:90 ../../mod/sources.php:100
-msgid "New Source"
-msgstr ""
-
-#: ../../mod/sources.php:101 ../../mod/sources.php:133
-msgid ""
-"Import all or selected content from the following channel into this channel "
-"and distribute it according to your channel settings."
-msgstr ""
-
-#: ../../mod/sources.php:102 ../../mod/sources.php:134
-msgid "Only import content with these words (one per line)"
-msgstr ""
-
-#: ../../mod/sources.php:102 ../../mod/sources.php:134
-msgid "Leave blank to import all public content"
-msgstr ""
-
-#: ../../mod/sources.php:103 ../../mod/sources.php:137
-#: ../../mod/new_channel.php:112
-msgid "Channel Name"
-msgstr ""
-
-#: ../../mod/sources.php:123 ../../mod/sources.php:150
-msgid "Source not found."
-msgstr ""
-
-#: ../../mod/sources.php:130
-msgid "Edit Source"
-msgstr ""
-
-#: ../../mod/sources.php:131
-msgid "Delete Source"
+#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92
+msgid "Contact not found."
 msgstr ""
 
-#: ../../mod/sources.php:158
-msgid "Source removed"
+#: ../../mod/fsuggest.php:63
+msgid "Friend suggestion sent."
 msgstr ""
 
-#: ../../mod/sources.php:160
-msgid "Unable to remove source."
+#: ../../mod/fsuggest.php:97
+msgid "Suggest Friends"
 msgstr ""
 
-#: ../../mod/filer.php:49
-msgid "- select -"
+#: ../../mod/fsuggest.php:99
+#, php-format
+msgid "Suggest a friend for %s"
 msgstr ""
 
 #: ../../mod/filestorage.php:76
@@ -6430,36 +6574,47 @@ msgstr ""
 msgid "Not Found"
 msgstr ""
 
+#: ../../mod/acl.php:245
+msgid "network"
+msgstr ""
+
 #: ../../mod/follow.php:25
 msgid "Channel added."
 msgstr ""
 
-#: ../../mod/subthread.php:103
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
+#: ../../mod/delegate.php:95
+msgid "No potential page delegates located."
 msgstr ""
 
-#: ../../mod/fsuggest.php:20 ../../mod/fsuggest.php:92
-msgid "Contact not found."
+#: ../../mod/delegate.php:121
+msgid "Delegate Page Management"
 msgstr ""
 
-#: ../../mod/fsuggest.php:63
-msgid "Friend suggestion sent."
+#: ../../mod/delegate.php:123
+msgid ""
+"Delegates are able to manage all aspects of this account/page except for "
+"basic account settings. Please do not delegate your personal account to "
+"anybody that you do not trust completely."
 msgstr ""
 
-#: ../../mod/fsuggest.php:97
-msgid "Suggest Friends"
+#: ../../mod/delegate.php:124
+msgid "Existing Page Managers"
 msgstr ""
 
-#: ../../mod/fsuggest.php:99
-#, php-format
-msgid "Suggest a friend for %s"
+#: ../../mod/delegate.php:126
+msgid "Existing Page Delegates"
 msgstr ""
 
-#: ../../mod/suggest.php:35
-msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
+#: ../../mod/delegate.php:128
+msgid "Potential Delegates"
+msgstr ""
+
+#: ../../mod/delegate.php:131
+msgid "Add"
+msgstr ""
+
+#: ../../mod/delegate.php:132
+msgid "No entries."
 msgstr ""
 
 #: ../../mod/group.php:20
@@ -6510,47 +6665,101 @@ msgstr ""
 msgid "Click on a channel to add or remove."
 msgstr ""
 
-#: ../../mod/tagger.php:98
+#: ../../mod/suggest.php:35
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
+msgstr ""
+
+#: ../../mod/import.php:25
 #, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
+msgid "Your service plan only allows %d channels."
 msgstr ""
 
-#: ../../mod/like.php:15
-msgid "Like/Dislike"
+#: ../../mod/import.php:51
+msgid "Nothing to import."
 msgstr ""
 
-#: ../../mod/like.php:20
-msgid "This action is restricted to members."
+#: ../../mod/import.php:75
+msgid "Unable to download data from old server"
 msgstr ""
 
-#: ../../mod/like.php:21
+#: ../../mod/import.php:81
+msgid "Imported file is empty."
+msgstr ""
+
+#: ../../mod/import.php:105
 msgid ""
-"Please <a href=\"rmagic\">login with your RedMatrix ID</a> or <a href="
-"\"register\">register as a new RedMatrix member</a> to continue."
+"Cannot create a duplicate channel identifier on this system. Import failed."
 msgstr ""
 
-#: ../../mod/like.php:77 ../../mod/like.php:104 ../../mod/like.php:142
-msgid "Invalid request."
+#: ../../mod/import.php:123
+msgid "Channel clone failed. Import failed."
 msgstr ""
 
-#: ../../mod/like.php:119
-msgid "thing"
+#: ../../mod/import.php:133
+msgid "Cloned channel not found. Import failed."
 msgstr ""
 
-#: ../../mod/like.php:165
-msgid "Channel unavailable."
+#: ../../mod/import.php:451
+msgid "Import completed."
 msgstr ""
 
-#: ../../mod/like.php:204
-msgid "Previous action reversed."
+#: ../../mod/import.php:463
+msgid "You must be logged in to use this feature."
 msgstr ""
 
-#: ../../mod/like.php:430
-msgid "Action completed."
+#: ../../mod/import.php:468
+msgid "Import Channel"
 msgstr ""
 
-#: ../../mod/like.php:431
-msgid "Thank you."
+#: ../../mod/import.php:469
+msgid ""
+"Use this form to import an existing channel from a different server/hub. You "
+"may retrieve the channel identity from the old server/hub via the network or "
+"provide an export file. Only identity and connections/relationships will be "
+"imported. Importation of content is not yet available."
+msgstr ""
+
+#: ../../mod/import.php:470
+msgid "File to Upload"
+msgstr ""
+
+#: ../../mod/import.php:471
+msgid "Or provide the old server/hub details"
+msgstr ""
+
+#: ../../mod/import.php:472
+msgid "Your old identity address (xyz@example.com)"
+msgstr ""
+
+#: ../../mod/import.php:473
+msgid "Your old login email address"
+msgstr ""
+
+#: ../../mod/import.php:474
+msgid "Your old login password"
+msgstr ""
+
+#: ../../mod/import.php:475
+msgid ""
+"For either option, please choose whether to make this hub your new primary "
+"address, or whether your old location should continue this role. You will be "
+"able to post from either location, but only one can be marked as the primary "
+"location for files, photos, and media."
+msgstr ""
+
+#: ../../mod/import.php:476
+msgid "Make this hub my primary location"
+msgstr ""
+
+#: ../../mod/import.php:477
+msgid "Import existing posts if possible"
+msgstr ""
+
+#: ../../mod/tagger.php:98
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
 
 #: ../../mod/tagrm.php:44 ../../mod/tagrm.php:94
@@ -6569,7 +6778,7 @@ msgstr ""
 msgid "Theme settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:97 ../../mod/admin.php:413
+#: ../../mod/admin.php:97 ../../mod/admin.php:411
 msgid "Site"
 msgstr ""
 
@@ -6577,19 +6786,19 @@ msgstr ""
 msgid "Accounts"
 msgstr ""
 
-#: ../../mod/admin.php:99 ../../mod/admin.php:860
+#: ../../mod/admin.php:99 ../../mod/admin.php:858
 msgid "Channels"
 msgstr ""
 
-#: ../../mod/admin.php:100 ../../mod/admin.php:951 ../../mod/admin.php:993
+#: ../../mod/admin.php:100 ../../mod/admin.php:949 ../../mod/admin.php:991
 msgid "Plugins"
 msgstr ""
 
-#: ../../mod/admin.php:101 ../../mod/admin.php:1156 ../../mod/admin.php:1192
+#: ../../mod/admin.php:101 ../../mod/admin.php:1154 ../../mod/admin.php:1190
 msgid "Themes"
 msgstr ""
 
-#: ../../mod/admin.php:102 ../../mod/admin.php:515
+#: ../../mod/admin.php:102 ../../mod/admin.php:512
 msgid "Server"
 msgstr ""
 
@@ -6601,7 +6810,7 @@ msgstr ""
 msgid "DB updates"
 msgstr ""
 
-#: ../../mod/admin.php:118 ../../mod/admin.php:125 ../../mod/admin.php:1279
+#: ../../mod/admin.php:118 ../../mod/admin.php:125 ../../mod/admin.php:1277
 msgid "Logs"
 msgstr ""
 
@@ -6617,10 +6826,10 @@ msgstr ""
 msgid "Message queues"
 msgstr ""
 
-#: ../../mod/admin.php:211 ../../mod/admin.php:412 ../../mod/admin.php:514
-#: ../../mod/admin.php:723 ../../mod/admin.php:859 ../../mod/admin.php:950
-#: ../../mod/admin.php:992 ../../mod/admin.php:1155 ../../mod/admin.php:1191
-#: ../../mod/admin.php:1278
+#: ../../mod/admin.php:211 ../../mod/admin.php:410 ../../mod/admin.php:511
+#: ../../mod/admin.php:721 ../../mod/admin.php:857 ../../mod/admin.php:948
+#: ../../mod/admin.php:990 ../../mod/admin.php:1153 ../../mod/admin.php:1189
+#: ../../mod/admin.php:1276
 msgid "Administration"
 msgstr ""
 
@@ -6632,7 +6841,7 @@ msgstr ""
 msgid "Registered users"
 msgstr ""
 
-#: ../../mod/admin.php:216 ../../mod/admin.php:518
+#: ../../mod/admin.php:216 ../../mod/admin.php:515
 msgid "Pending registrations"
 msgstr ""
 
@@ -6640,716 +6849,637 @@ msgstr ""
 msgid "Version"
 msgstr ""
 
-#: ../../mod/admin.php:219 ../../mod/admin.php:519
+#: ../../mod/admin.php:219 ../../mod/admin.php:516
 msgid "Active plugins"
 msgstr ""
 
-#: ../../mod/admin.php:333
+#: ../../mod/admin.php:326
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:364
-msgid "No special theme for accessibility"
+#: ../../mod/admin.php:363
+msgid "mobile"
+msgstr ""
+
+#: ../../mod/admin.php:365
+msgid "experimental"
 msgstr ""
 
-#: ../../mod/admin.php:393
+#: ../../mod/admin.php:367
+msgid "unsupported"
+msgstr ""
+
+#: ../../mod/admin.php:391
 msgid "Yes - with approval"
 msgstr ""
 
-#: ../../mod/admin.php:399
+#: ../../mod/admin.php:397
 msgid "My site is not a public server"
 msgstr ""
 
-#: ../../mod/admin.php:400
+#: ../../mod/admin.php:398
 msgid "My site has paid access only"
 msgstr ""
 
-#: ../../mod/admin.php:401
+#: ../../mod/admin.php:399
 msgid "My site has free access only"
 msgstr ""
 
-#: ../../mod/admin.php:402
+#: ../../mod/admin.php:400
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr ""
 
-#: ../../mod/admin.php:416
+#: ../../mod/admin.php:414
 msgid "File upload"
 msgstr ""
 
-#: ../../mod/admin.php:417
+#: ../../mod/admin.php:415
 msgid "Policies"
 msgstr ""
 
-#: ../../mod/admin.php:422
+#: ../../mod/admin.php:420
 msgid "Site name"
 msgstr ""
 
-#: ../../mod/admin.php:423
+#: ../../mod/admin.php:421
 msgid "Banner/Logo"
 msgstr ""
 
-#: ../../mod/admin.php:424
+#: ../../mod/admin.php:422
 msgid "Administrator Information"
 msgstr ""
 
-#: ../../mod/admin.php:424
+#: ../../mod/admin.php:422
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr ""
 
-#: ../../mod/admin.php:425
+#: ../../mod/admin.php:423
 msgid "System language"
 msgstr ""
 
-#: ../../mod/admin.php:426
+#: ../../mod/admin.php:424
 msgid "System theme"
 msgstr ""
 
-#: ../../mod/admin.php:426
+#: ../../mod/admin.php:424
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr ""
 
-#: ../../mod/admin.php:427
+#: ../../mod/admin.php:425
 msgid "Mobile system theme"
 msgstr ""
 
-#: ../../mod/admin.php:427
+#: ../../mod/admin.php:425
 msgid "Theme for mobile devices"
 msgstr ""
 
-#: ../../mod/admin.php:428
-msgid "Accessibility system theme"
-msgstr ""
-
-#: ../../mod/admin.php:428
-msgid "Accessibility theme"
-msgstr ""
-
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:427
 msgid "Enable Diaspora Protocol"
 msgstr ""
 
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:427
 msgid "Communicate with Diaspora and Friendica - experimental"
 msgstr ""
 
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:428
 msgid "Allow Feeds as Connections"
 msgstr ""
 
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:428
 msgid "(Heavy system resource usage)"
 msgstr ""
 
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:429
 msgid "Maximum image size"
 msgstr ""
 
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:429
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
-#: ../../mod/admin.php:433
+#: ../../mod/admin.php:430
 msgid "Does this site allow new member registration?"
 msgstr ""
 
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:431
 msgid "Which best describes the types of account offered by this hub?"
 msgstr ""
 
-#: ../../mod/admin.php:435
+#: ../../mod/admin.php:432
 msgid "Register text"
 msgstr ""
 
-#: ../../mod/admin.php:435
+#: ../../mod/admin.php:432
 msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:433
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:433
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:434
 msgid "Allowed friend domains"
 msgstr ""
 
-#: ../../mod/admin.php:437
+#: ../../mod/admin.php:434
 msgid ""
 "Comma separated list of domains which are allowed to establish friendships "
 "with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr ""
 
-#: ../../mod/admin.php:438
+#: ../../mod/admin.php:435
 msgid "Allowed email domains"
 msgstr ""
 
-#: ../../mod/admin.php:438
+#: ../../mod/admin.php:435
 msgid ""
 "Comma separated list of domains which are allowed in email addresses for "
 "registrations to this site. Wildcards are accepted. Empty to allow any "
 "domains"
 msgstr ""
 
-#: ../../mod/admin.php:439
+#: ../../mod/admin.php:436
 msgid "Block public"
 msgstr ""
 
-#: ../../mod/admin.php:439
+#: ../../mod/admin.php:436
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently logged in."
 msgstr ""
 
-#: ../../mod/admin.php:440
+#: ../../mod/admin.php:437
 msgid "Verify Email Addresses"
 msgstr ""
 
-#: ../../mod/admin.php:440
+#: ../../mod/admin.php:437
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr ""
 
-#: ../../mod/admin.php:441
+#: ../../mod/admin.php:438
 msgid "Force publish"
 msgstr ""
 
-#: ../../mod/admin.php:441
+#: ../../mod/admin.php:438
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: ../../mod/admin.php:442
+#: ../../mod/admin.php:439
 msgid "Disable discovery tab"
 msgstr ""
 
-#: ../../mod/admin.php:442
+#: ../../mod/admin.php:439
 msgid ""
 "Remove the tab in the network view with public content pulled from sources "
 "chosen for this site."
 msgstr ""
 
-#: ../../mod/admin.php:443
+#: ../../mod/admin.php:440
 msgid "No login on Homepage"
 msgstr ""
 
-#: ../../mod/admin.php:443
+#: ../../mod/admin.php:440
 msgid ""
 "Check to hide the login form from your sites homepage when visitors arrive "
 "who are not logged in (e.g. when you put the content of the homepage in via "
 "the site channel)."
 msgstr ""
 
-#: ../../mod/admin.php:445
+#: ../../mod/admin.php:442
 msgid "Proxy user"
 msgstr ""
 
-#: ../../mod/admin.php:446
+#: ../../mod/admin.php:443
 msgid "Proxy URL"
 msgstr ""
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:444
 msgid "Network timeout"
 msgstr ""
 
-#: ../../mod/admin.php:447
+#: ../../mod/admin.php:444
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:445
 msgid "Delivery interval"
 msgstr ""
 
-#: ../../mod/admin.php:448
+#: ../../mod/admin.php:445
 msgid ""
 "Delay background delivery processes by this many seconds to reduce system "
 "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
 "for large dedicated servers."
 msgstr ""
 
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:446
 msgid "Poll interval"
 msgstr ""
 
-#: ../../mod/admin.php:449
+#: ../../mod/admin.php:446
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr ""
 
-#: ../../mod/admin.php:450
+#: ../../mod/admin.php:447
 msgid "Maximum Load Average"
 msgstr ""
 
-#: ../../mod/admin.php:450
+#: ../../mod/admin.php:447
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr ""
 
-#: ../../mod/admin.php:506
+#: ../../mod/admin.php:503
 msgid "No server found"
 msgstr ""
 
-#: ../../mod/admin.php:513 ../../mod/admin.php:737
+#: ../../mod/admin.php:510 ../../mod/admin.php:735
 msgid "ID"
 msgstr ""
 
-#: ../../mod/admin.php:513
+#: ../../mod/admin.php:510
 msgid "for channel"
 msgstr ""
 
-#: ../../mod/admin.php:513
+#: ../../mod/admin.php:510
 msgid "on server"
 msgstr ""
 
-#: ../../mod/admin.php:513
+#: ../../mod/admin.php:510
 msgid "Status"
 msgstr ""
 
-#: ../../mod/admin.php:534
+#: ../../mod/admin.php:531
 msgid "Update has been marked successful"
 msgstr ""
 
-#: ../../mod/admin.php:544
+#: ../../mod/admin.php:541
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr ""
 
-#: ../../mod/admin.php:547
+#: ../../mod/admin.php:544
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr ""
 
-#: ../../mod/admin.php:551
+#: ../../mod/admin.php:548
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: ../../mod/admin.php:554
+#: ../../mod/admin.php:551
 #, php-format
 msgid "Update function %s could not be found."
 msgstr ""
 
-#: ../../mod/admin.php:569
+#: ../../mod/admin.php:566
 msgid "No failed updates."
 msgstr ""
 
-#: ../../mod/admin.php:573
+#: ../../mod/admin.php:570
 msgid "Failed Updates"
 msgstr ""
 
-#: ../../mod/admin.php:575
+#: ../../mod/admin.php:572
 msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: ../../mod/admin.php:576
+#: ../../mod/admin.php:573
 msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: ../../mod/admin.php:602
+#: ../../mod/admin.php:599
 #, php-format
 msgid "%s user blocked/unblocked"
 msgid_plural "%s users blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:609
+#: ../../mod/admin.php:606
 #, php-format
 msgid "%s user deleted"
 msgid_plural "%s users deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:638
+#: ../../mod/admin.php:635
 msgid "Account not found"
 msgstr ""
 
-#: ../../mod/admin.php:658
+#: ../../mod/admin.php:655
 #, php-format
 msgid "User '%s' unblocked"
 msgstr ""
 
-#: ../../mod/admin.php:658
+#: ../../mod/admin.php:655
 #, php-format
 msgid "User '%s' blocked"
 msgstr ""
 
-#: ../../mod/admin.php:724 ../../mod/admin.php:736
+#: ../../mod/admin.php:722 ../../mod/admin.php:734
 msgid "Users"
 msgstr ""
 
-#: ../../mod/admin.php:726 ../../mod/admin.php:862
+#: ../../mod/admin.php:724 ../../mod/admin.php:860
 msgid "select all"
 msgstr ""
 
-#: ../../mod/admin.php:727
+#: ../../mod/admin.php:725
 msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../mod/admin.php:728
+#: ../../mod/admin.php:726
 msgid "Request date"
 msgstr ""
 
-#: ../../mod/admin.php:729
+#: ../../mod/admin.php:727
 msgid "No registrations."
 msgstr ""
 
-#: ../../mod/admin.php:730
+#: ../../mod/admin.php:728
 msgid "Approve"
 msgstr ""
 
-#: ../../mod/admin.php:731
+#: ../../mod/admin.php:729
 msgid "Deny"
 msgstr ""
 
-#: ../../mod/admin.php:737
+#: ../../mod/admin.php:735
 msgid "Register date"
 msgstr ""
 
-#: ../../mod/admin.php:737
+#: ../../mod/admin.php:735
 msgid "Last login"
 msgstr ""
 
-#: ../../mod/admin.php:737
+#: ../../mod/admin.php:735
 msgid "Expires"
 msgstr ""
 
-#: ../../mod/admin.php:737
+#: ../../mod/admin.php:735
 msgid "Service Class"
 msgstr ""
 
-#: ../../mod/admin.php:739
+#: ../../mod/admin.php:737
 msgid ""
 "Selected users will be deleted!\\n\\nEverything these users had posted on "
 "this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:740
+#: ../../mod/admin.php:738
 msgid ""
 "The user {0} will be deleted!\\n\\nEverything this user has posted on this "
 "site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:773
+#: ../../mod/admin.php:771
 #, php-format
 msgid "%s channel censored/uncensored"
 msgid_plural "%s channels censored/uncensored"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:780
+#: ../../mod/admin.php:778
 #, php-format
 msgid "%s channel deleted"
 msgid_plural "%s channels deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../mod/admin.php:799
+#: ../../mod/admin.php:797
 msgid "Channel not found"
 msgstr ""
 
-#: ../../mod/admin.php:810
+#: ../../mod/admin.php:808
 #, php-format
 msgid "Channel '%s' deleted"
 msgstr ""
 
-#: ../../mod/admin.php:821
+#: ../../mod/admin.php:819
 #, php-format
 msgid "Channel '%s' uncensored"
 msgstr ""
 
-#: ../../mod/admin.php:821
+#: ../../mod/admin.php:819
 #, php-format
 msgid "Channel '%s' censored"
 msgstr ""
 
-#: ../../mod/admin.php:864
+#: ../../mod/admin.php:862
 msgid "Censor"
 msgstr ""
 
-#: ../../mod/admin.php:865
+#: ../../mod/admin.php:863
 msgid "Uncensor"
 msgstr ""
 
-#: ../../mod/admin.php:868
+#: ../../mod/admin.php:866
 msgid "UID"
 msgstr ""
 
-#: ../../mod/admin.php:870
+#: ../../mod/admin.php:868
 msgid ""
 "Selected channels will be deleted!\\n\\nEverything that was posted in these "
 "channels on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:871
+#: ../../mod/admin.php:869
 msgid ""
 "The channel {0} will be deleted!\\n\\nEverything that was posted in this "
 "channel on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../mod/admin.php:910
+#: ../../mod/admin.php:908
 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../mod/admin.php:914
+#: ../../mod/admin.php:912
 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../mod/admin.php:924 ../../mod/admin.php:1126
+#: ../../mod/admin.php:922 ../../mod/admin.php:1124
 msgid "Disable"
 msgstr ""
 
-#: ../../mod/admin.php:926 ../../mod/admin.php:1128
+#: ../../mod/admin.php:924 ../../mod/admin.php:1126
 msgid "Enable"
 msgstr ""
 
-#: ../../mod/admin.php:952 ../../mod/admin.php:1157
+#: ../../mod/admin.php:950 ../../mod/admin.php:1155
 msgid "Toggle"
 msgstr ""
 
-#: ../../mod/admin.php:960 ../../mod/admin.php:1167
+#: ../../mod/admin.php:958 ../../mod/admin.php:1165
 msgid "Author: "
 msgstr ""
 
-#: ../../mod/admin.php:961 ../../mod/admin.php:1168
+#: ../../mod/admin.php:959 ../../mod/admin.php:1166
 msgid "Maintainer: "
 msgstr ""
 
-#: ../../mod/admin.php:1090
+#: ../../mod/admin.php:1088
 msgid "No themes found."
 msgstr ""
 
-#: ../../mod/admin.php:1149
+#: ../../mod/admin.php:1147
 msgid "Screenshot"
 msgstr ""
 
-#: ../../mod/admin.php:1197
+#: ../../mod/admin.php:1195
 msgid "[Experimental]"
 msgstr ""
 
-#: ../../mod/admin.php:1198
+#: ../../mod/admin.php:1196
 msgid "[Unsupported]"
 msgstr ""
 
-#: ../../mod/admin.php:1225
+#: ../../mod/admin.php:1223
 msgid "Log settings updated."
 msgstr ""
 
-#: ../../mod/admin.php:1281
+#: ../../mod/admin.php:1279
 msgid "Clear"
 msgstr ""
 
-#: ../../mod/admin.php:1287
+#: ../../mod/admin.php:1285
 msgid "Debugging"
 msgstr ""
 
-#: ../../mod/admin.php:1288
+#: ../../mod/admin.php:1286
 msgid "Log file"
 msgstr ""
 
-#: ../../mod/admin.php:1288
+#: ../../mod/admin.php:1286
 msgid ""
 "Must be writable by web server. Relative to your Red top-level directory."
 msgstr ""
 
-#: ../../mod/admin.php:1289
+#: ../../mod/admin.php:1287
 msgid "Log level"
 msgstr ""
 
-#: ../../mod/admin.php:1336
+#: ../../mod/admin.php:1334
 msgid "New Profile Field"
 msgstr ""
 
-#: ../../mod/admin.php:1337 ../../mod/admin.php:1358
+#: ../../mod/admin.php:1335 ../../mod/admin.php:1356
 msgid "Field nickname"
 msgstr ""
 
-#: ../../mod/admin.php:1337 ../../mod/admin.php:1358
+#: ../../mod/admin.php:1335 ../../mod/admin.php:1356
 msgid "System name of field"
 msgstr ""
 
-#: ../../mod/admin.php:1338 ../../mod/admin.php:1359
+#: ../../mod/admin.php:1336 ../../mod/admin.php:1357
 msgid "Input type"
 msgstr ""
 
-#: ../../mod/admin.php:1339 ../../mod/admin.php:1360
+#: ../../mod/admin.php:1337 ../../mod/admin.php:1358
 msgid "Field Name"
 msgstr ""
 
-#: ../../mod/admin.php:1339 ../../mod/admin.php:1360
+#: ../../mod/admin.php:1337 ../../mod/admin.php:1358
 msgid "Label on profile pages"
 msgstr ""
 
-#: ../../mod/admin.php:1340 ../../mod/admin.php:1361
+#: ../../mod/admin.php:1338 ../../mod/admin.php:1359
 msgid "Help text"
 msgstr ""
 
-#: ../../mod/admin.php:1340 ../../mod/admin.php:1361
+#: ../../mod/admin.php:1338 ../../mod/admin.php:1359
 msgid "Additional info (optional)"
 msgstr ""
 
-#: ../../mod/admin.php:1351
+#: ../../mod/admin.php:1349
 msgid "Field definition not found"
 msgstr ""
 
-#: ../../mod/admin.php:1357
+#: ../../mod/admin.php:1355
 msgid "Edit Profile Field"
 msgstr ""
 
-#: ../../mod/thing.php:96
-msgid "Thing updated"
-msgstr ""
-
-#: ../../mod/thing.php:156
-msgid "Object store: failed"
-msgstr ""
-
-#: ../../mod/thing.php:160
-msgid "Thing added"
-msgstr ""
-
-#: ../../mod/thing.php:180
-#, php-format
-msgid "OBJ: %1$s %2$s %3$s"
-msgstr ""
-
-#: ../../mod/thing.php:232
-msgid "Show Thing"
-msgstr ""
-
-#: ../../mod/thing.php:239
-msgid "item not found."
-msgstr ""
-
-#: ../../mod/thing.php:270
-msgid "Edit Thing"
-msgstr ""
-
-#: ../../mod/thing.php:272 ../../mod/thing.php:319
-msgid "Select a profile"
-msgstr ""
-
-#: ../../mod/thing.php:276 ../../mod/thing.php:322
-msgid "Post an activity"
-msgstr ""
-
-#: ../../mod/thing.php:276 ../../mod/thing.php:322
-msgid "Only sends to viewers of the applicable profile"
-msgstr ""
-
-#: ../../mod/thing.php:278 ../../mod/thing.php:324
-msgid "Name of thing e.g. something"
+#: ../../mod/item.php:159
+msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../mod/thing.php:280 ../../mod/thing.php:325
-msgid "URL of thing (optional)"
+#: ../../mod/item.php:418
+msgid "Empty post discarded."
 msgstr ""
 
-#: ../../mod/thing.php:282 ../../mod/thing.php:326
-msgid "URL for photo of thing (optional)"
+#: ../../mod/item.php:460
+msgid "Executable content type not permitted to this channel."
 msgstr ""
 
-#: ../../mod/thing.php:317
-msgid "Add Thing to your Profile"
+#: ../../mod/item.php:898
+msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/import.php:25
+#: ../../mod/item.php:1373
 #, php-format
-msgid "Your service plan only allows %d channels."
-msgstr ""
-
-#: ../../mod/import.php:51
-msgid "Nothing to import."
-msgstr ""
-
-#: ../../mod/import.php:75
-msgid "Unable to download data from old server"
-msgstr ""
-
-#: ../../mod/import.php:81
-msgid "Imported file is empty."
-msgstr ""
-
-#: ../../mod/import.php:105
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
-msgstr ""
-
-#: ../../mod/import.php:123
-msgid "Channel clone failed. Import failed."
-msgstr ""
-
-#: ../../mod/import.php:133
-msgid "Cloned channel not found. Import failed."
+msgid "You have reached your limit of %1$.0f top level posts."
 msgstr ""
 
-#: ../../mod/import.php:451
-msgid "Import completed."
+#: ../../mod/item.php:1379
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
 msgstr ""
 
-#: ../../mod/import.php:463
-msgid "You must be logged in to use this feature."
+#: ../../mod/like.php:15
+msgid "Like/Dislike"
 msgstr ""
 
-#: ../../mod/import.php:468
-msgid "Import Channel"
+#: ../../mod/like.php:20
+msgid "This action is restricted to members."
 msgstr ""
 
-#: ../../mod/import.php:469
+#: ../../mod/like.php:21
 msgid ""
-"Use this form to import an existing channel from a different server/hub. You "
-"may retrieve the channel identity from the old server/hub via the network or "
-"provide an export file. Only identity and connections/relationships will be "
-"imported. Importation of content is not yet available."
-msgstr ""
-
-#: ../../mod/import.php:470
-msgid "File to Upload"
-msgstr ""
-
-#: ../../mod/import.php:471
-msgid "Or provide the old server/hub details"
+"Please <a href=\"rmagic\">login with your RedMatrix ID</a> or <a href="
+"\"register\">register as a new RedMatrix member</a> to continue."
 msgstr ""
 
-#: ../../mod/import.php:472
-msgid "Your old identity address (xyz@example.com)"
+#: ../../mod/like.php:77 ../../mod/like.php:104 ../../mod/like.php:142
+msgid "Invalid request."
 msgstr ""
 
-#: ../../mod/import.php:473
-msgid "Your old login email address"
+#: ../../mod/like.php:119
+msgid "thing"
 msgstr ""
 
-#: ../../mod/import.php:474
-msgid "Your old login password"
+#: ../../mod/like.php:165
+msgid "Channel unavailable."
 msgstr ""
 
-#: ../../mod/import.php:475
-msgid ""
-"For either option, please choose whether to make this hub your new primary "
-"address, or whether your old location should continue this role. You will be "
-"able to post from either location, but only one can be marked as the primary "
-"location for files, photos, and media."
+#: ../../mod/like.php:204
+msgid "Previous action reversed."
 msgstr ""
 
-#: ../../mod/import.php:476
-msgid "Make this hub my primary location"
+#: ../../mod/like.php:430
+msgid "Action completed."
 msgstr ""
 
-#: ../../mod/import.php:477
-msgid "Import existing posts if possible"
+#: ../../mod/like.php:431
+msgid "Thank you."
 msgstr ""
 
 #: ../../mod/invite.php:25
@@ -7421,45 +7551,6 @@ msgstr ""
 msgid "3. Click [Connect]"
 msgstr ""
 
-#: ../../mod/item.php:151
-msgid "Unable to locate original post."
-msgstr ""
-
-#: ../../mod/item.php:411
-msgid "Empty post discarded."
-msgstr ""
-
-#: ../../mod/item.php:453
-msgid "Executable content type not permitted to this channel."
-msgstr ""
-
-#: ../../mod/item.php:891
-msgid "System error. Post not saved."
-msgstr ""
-
-#: ../../mod/item.php:1366
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
-msgstr ""
-
-#: ../../mod/item.php:1372
-#, php-format
-msgid "You have reached your limit of %1$.0f webpages."
-msgstr ""
-
-#: ../../mod/update_channel.php:43 ../../mod/update_display.php:25
-#: ../../mod/update_network.php:23 ../../mod/update_search.php:46
-msgid "[Embedded content - reload page to view]"
-msgstr ""
-
-#: ../../mod/layouts.php:62
-msgid "Help with this feature"
-msgstr ""
-
-#: ../../mod/layouts.php:85
-msgid "Layout Name"
-msgstr ""
-
 #: ../../mod/locs.php:19 ../../mod/locs.php:46
 msgid "Location not found."
 msgstr ""
@@ -7488,6 +7579,19 @@ msgstr ""
 msgid "Drop location"
 msgstr ""
 
+#: ../../mod/update_channel.php:43 ../../mod/update_display.php:25
+#: ../../mod/update_network.php:23 ../../mod/update_search.php:46
+msgid "[Embedded content - reload page to view]"
+msgstr ""
+
+#: ../../mod/layouts.php:110
+msgid "Help with this feature"
+msgstr ""
+
+#: ../../mod/layouts.php:130
+msgid "Layout Name"
+msgstr ""
+
 #: ../../mod/lockview.php:31
 msgid "Remote privacy information not available."
 msgstr ""
@@ -7509,79 +7613,6 @@ msgstr ""
 msgid "View Connnections"
 msgstr ""
 
-#: ../../mod/lostpass.php:15
-msgid "No valid account found."
-msgstr ""
-
-#: ../../mod/lostpass.php:29
-msgid "Password reset request issued. Check your email."
-msgstr ""
-
-#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102
-#, php-format
-msgid "Site Member (%s)"
-msgstr ""
-
-#: ../../mod/lostpass.php:40
-#, php-format
-msgid "Password reset requested at %s"
-msgstr ""
-
-#: ../../mod/lostpass.php:63
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
-msgstr ""
-
-#: ../../mod/lostpass.php:85 ../../boot.php:1523
-msgid "Password Reset"
-msgstr ""
-
-#: ../../mod/lostpass.php:86
-msgid "Your password has been reset as requested."
-msgstr ""
-
-#: ../../mod/lostpass.php:87
-msgid "Your new password is"
-msgstr ""
-
-#: ../../mod/lostpass.php:88
-msgid "Save or copy your new password - and then"
-msgstr ""
-
-#: ../../mod/lostpass.php:89
-msgid "click here to login"
-msgstr ""
-
-#: ../../mod/lostpass.php:90
-msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
-msgstr ""
-
-#: ../../mod/lostpass.php:107
-#, php-format
-msgid "Your password has changed at %s"
-msgstr ""
-
-#: ../../mod/lostpass.php:122
-msgid "Forgot your Password?"
-msgstr ""
-
-#: ../../mod/lostpass.php:123
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
-msgstr ""
-
-#: ../../mod/lostpass.php:124
-msgid "Email Address"
-msgstr ""
-
-#: ../../mod/lostpass.php:125
-msgid "Reset"
-msgstr ""
-
 #: ../../mod/magic.php:70
 msgid "Hub not found."
 msgstr ""
@@ -7668,31 +7699,6 @@ msgstr ""
 msgid "Send Reply"
 msgstr ""
 
-#: ../../mod/manage.php:136
-#, php-format
-msgid "You have created %1$.0f of %2$.0f allowed channels."
-msgstr ""
-
-#: ../../mod/manage.php:144
-msgid "Create a new channel"
-msgstr ""
-
-#: ../../mod/manage.php:149
-msgid "Current Channel"
-msgstr ""
-
-#: ../../mod/manage.php:151
-msgid "Attach to one of your channels by selecting it."
-msgstr ""
-
-#: ../../mod/manage.php:152
-msgid "Default Channel"
-msgstr ""
-
-#: ../../mod/manage.php:153
-msgid "Make Default"
-msgstr ""
-
 #: ../../mod/wall_upload.php:34
 msgid "Wall Photos"
 msgstr ""
@@ -7713,87 +7719,91 @@ msgstr ""
 msgid "No matches"
 msgstr ""
 
-#: ../../mod/menu.php:21
+#: ../../mod/menu.php:31
 msgid "Menu updated."
 msgstr ""
 
-#: ../../mod/menu.php:25
+#: ../../mod/menu.php:35
 msgid "Unable to update menu."
 msgstr ""
 
-#: ../../mod/menu.php:30
+#: ../../mod/menu.php:40
 msgid "Menu created."
 msgstr ""
 
-#: ../../mod/menu.php:34
+#: ../../mod/menu.php:44
 msgid "Unable to create menu."
 msgstr ""
 
-#: ../../mod/menu.php:57
+#: ../../mod/menu.php:76
 msgid "Manage Menus"
 msgstr ""
 
-#: ../../mod/menu.php:60
+#: ../../mod/menu.php:79
 msgid "Drop"
 msgstr ""
 
-#: ../../mod/menu.php:62
+#: ../../mod/menu.php:81
+msgid "Bookmarks allowed"
+msgstr ""
+
+#: ../../mod/menu.php:82
 msgid "Create a new menu"
 msgstr ""
 
-#: ../../mod/menu.php:63
+#: ../../mod/menu.php:83
 msgid "Delete this menu"
 msgstr ""
 
-#: ../../mod/menu.php:64 ../../mod/menu.php:109
+#: ../../mod/menu.php:84 ../../mod/menu.php:125
 msgid "Edit menu contents"
 msgstr ""
 
-#: ../../mod/menu.php:65
+#: ../../mod/menu.php:85
 msgid "Edit this menu"
 msgstr ""
 
-#: ../../mod/menu.php:80
+#: ../../mod/menu.php:96
 msgid "New Menu"
 msgstr ""
 
-#: ../../mod/menu.php:81 ../../mod/menu.php:110
+#: ../../mod/menu.php:97 ../../mod/menu.php:126
 msgid "Menu name"
 msgstr ""
 
-#: ../../mod/menu.php:81 ../../mod/menu.php:110
+#: ../../mod/menu.php:97 ../../mod/menu.php:126
 msgid "Must be unique, only seen by you"
 msgstr ""
 
-#: ../../mod/menu.php:82 ../../mod/menu.php:111
+#: ../../mod/menu.php:98 ../../mod/menu.php:127
 msgid "Menu title"
 msgstr ""
 
-#: ../../mod/menu.php:82 ../../mod/menu.php:111
+#: ../../mod/menu.php:98 ../../mod/menu.php:127
 msgid "Menu title as seen by others"
 msgstr ""
 
-#: ../../mod/menu.php:83 ../../mod/menu.php:112
+#: ../../mod/menu.php:99 ../../mod/menu.php:128
 msgid "Allow bookmarks"
 msgstr ""
 
-#: ../../mod/menu.php:83 ../../mod/menu.php:112
+#: ../../mod/menu.php:99 ../../mod/menu.php:128
 msgid "Menu may be used to store saved bookmarks"
 msgstr ""
 
-#: ../../mod/menu.php:98
+#: ../../mod/menu.php:114
 msgid "Menu deleted."
 msgstr ""
 
-#: ../../mod/menu.php:100
+#: ../../mod/menu.php:116
 msgid "Menu could not be deleted."
 msgstr ""
 
-#: ../../mod/menu.php:106
+#: ../../mod/menu.php:122
 msgid "Edit Menu"
 msgstr ""
 
-#: ../../mod/menu.php:108
+#: ../../mod/menu.php:124
 msgid "Add or remove entries to this menu"
 msgstr ""
 
@@ -7877,6 +7887,14 @@ msgstr ""
 msgid "System Notifications"
 msgstr ""
 
+#: ../../mod/xchan.php:6
+msgid "Xchan Lookup"
+msgstr ""
+
+#: ../../mod/xchan.php:9
+msgid "Lookup xchan beginning with (or webbie): "
+msgstr ""
+
 #: ../../mod/oexchange.php:23
 msgid "Unable to find your hub."
 msgstr ""
@@ -7889,10 +7907,6 @@ msgstr ""
 msgid "invalid target signature"
 msgstr ""
 
-#: ../../mod/openid.php:26
-msgid "OpenID protocol error. No ID returned."
-msgstr ""
-
 #: ../../mod/appman.php:28 ../../mod/appman.php:44
 msgid "App installed."
 msgstr ""
@@ -8266,41 +8280,41 @@ msgstr ""
 msgid "Are you a clean desk or a messy desk person?"
 msgstr ""
 
-#: ../../boot.php:1311
+#: ../../boot.php:1293
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:1314
+#: ../../boot.php:1296
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:1488
+#: ../../boot.php:1463
 msgid ""
 "Create an account to access services and applications within the Red Matrix"
 msgstr ""
 
-#: ../../boot.php:1516
+#: ../../boot.php:1489
 msgid "Password"
 msgstr ""
 
-#: ../../boot.php:1517
+#: ../../boot.php:1490
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:1522
+#: ../../boot.php:1493
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:1587
+#: ../../boot.php:1567
 msgid "permission denied"
 msgstr ""
 
-#: ../../boot.php:1588
+#: ../../boot.php:1568
 msgid "Got Zot?"
 msgstr ""
 
-#: ../../boot.php:2021
+#: ../../boot.php:2030
 msgid "toggle mobile"
 msgstr ""
diff --git a/version.inc b/version.inc
index d86614502..0ea73e309 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-11-13.858
+2014-11-15.860