Merge remote-tracking branch 'upstream/dev' into wiki

15 files changed, 3645 insertions, 3589 deletions

diff --git a/Zotlabs/Daemon/Cron.php b/Zotlabs/Daemon/Cron.php
index f23cb14dc..d5b41274b 100644
--- a/Zotlabs/Daemon/Cron.php
+++ b/Zotlabs/Daemon/Cron.php
@@ -41,7 +41,6 @@ class Cron {
 		require_once('include/sharedwithme.php');
 		apply_updates();
 	
-
 		// expire any expired mail
 
 		q("delete from mail where expires != '%s' and expires < %s ",
@@ -93,6 +92,18 @@ class Cron {
 					intval($rr['id'])
 				);
 				if($x) {
+					$z = q("select * from item where id = %d",
+						intval($message_id)
+					);
+					if($z) {
+						xchan_query($z);
+						$sync_item = fetch_post_tags($z);
+						build_sync_packet($sync_item[0]['uid'],
+							[ 
+								'item' => [ encode_item($sync_item[0],true) ]
+							]
+						);
+					}
 					Master::Summon(array('Notifier','wall-new',$rr['id']));
 				}
 			}
diff --git a/Zotlabs/Daemon/Cron_weekly.php b/Zotlabs/Daemon/Cron_weekly.php
index 1d8420947..ba4b67ff5 100644
--- a/Zotlabs/Daemon/Cron_weekly.php
+++ b/Zotlabs/Daemon/Cron_weekly.php
@@ -15,7 +15,6 @@ class Cron_weekly {
 
 		call_hooks('cron_weekly',datetime_convert());
 
-
 		z_check_cert();
 
 		require_once('include/hubloc.php');
diff --git a/Zotlabs/Lib/Apps.php b/Zotlabs/Lib/Apps.php
index 20556212a..19ed1b612 100644
--- a/Zotlabs/Lib/Apps.php
+++ b/Zotlabs/Lib/Apps.php
@@ -33,8 +33,9 @@ class Apps {
 		$files = glob('addon/*/*.apd');
 		if($files) {
 			foreach($files as $f) {
-				$n = basename($f,'.apd');
-				if(plugin_is_installed($n)) {
+				$path = explode('/',$f);
+				$plugin = $path[1];
+				if(plugin_is_installed($plugin)) {
 					$x = self::parse_app_description($f,$translate);
 					if($x) {
 						$ret[] = $x;
diff --git a/Zotlabs/Module/Events.php b/Zotlabs/Module/Events.php
index 3f3f9fb4c..3187cddb4 100644
--- a/Zotlabs/Module/Events.php
+++ b/Zotlabs/Module/Events.php
@@ -668,8 +668,10 @@ class Events extends \Zotlabs\Web\Controller {
 				'$export'	=> array(z_root()."/events/$y/$m/export",t('Export'),'',''),
 				'$calendar'	=> cal($y,$m,$links, ' eventcal'),
 				'$events'	=> $events,
-				'$upload'	=> t('Import'),
-				'$submit'	=> t('Submit'),
+				'$view_label'   => t('View'),
+				'$month'        => t('Month'),
+				'$week'         => t('Week'),
+				'$day'          => t('Day'),
 				'$prev'		=> t('Previous'),
 				'$next'		=> t('Next'),
 				'$today'	=> t('Today'),
diff --git a/Zotlabs/Module/Import_items.php b/Zotlabs/Module/Import_items.php
index 07b1c620c..f20cbfe7e 100644
--- a/Zotlabs/Module/Import_items.php
+++ b/Zotlabs/Module/Import_items.php
@@ -78,6 +78,8 @@ class Import_items extends \Zotlabs\Web\Controller {
 	//	logger('import: data: ' . print_r($data,true));
 	//	print_r($data);
 	
+		if(! is_array($data))
+			return;
 	
 		if(array_key_exists('compatibility',$data) && array_key_exists('database',$data['compatibility'])) {
 			$v1 = substr($data['compatibility']['database'],-4);
diff --git a/Zotlabs/Module/Starred.php b/Zotlabs/Module/Starred.php
index 73a2dc808..4f1d99ec6 100644
--- a/Zotlabs/Module/Starred.php
+++ b/Zotlabs/Module/Starred.php
@@ -30,7 +30,20 @@ class Starred extends \Zotlabs\Web\Controller {
 			intval(local_channel()),
 			intval($message_id)
 		);
-	
+
+		$r = q("select * from item where id = %d",
+				intval($message_id)
+		);
+		if($r) {
+			xchan_query($r);
+			$sync_item = fetch_post_tags($r);
+			build_sync_packet(local_channel(),[ 
+				'item' => [ 
+					encode_item($sync_item[0],true)
+				]
+			]);
+		}
+
 		header('Content-type: application/json');
 		echo json_encode(array('result' => $item_starred));
 		killme();
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php
index 6252f7a1a..55a52ea6d 100644
--- a/Zotlabs/Module/Wiki.php
+++ b/Zotlabs/Module/Wiki.php
@@ -29,6 +29,11 @@ class Wiki extends \Zotlabs\Web\Controller {
 		if(observer_prohibited(true)) {
 			return login();
 		}
+
+		if(! feature_enabled(\App::$profile_uid,'wiki')) {
+			notice( t('Not found') . EOL);
+     		return;
+ 		}
 	
 		$tab = 'wiki';
 	
diff --git a/boot.php b/boot.php
index 215f25ad2..bad3b2e5d 100755
--- a/boot.php
+++ b/boot.php
@@ -2457,6 +2457,15 @@ function check_cron_broken() {
 		set_config('system','lastcroncheck',datetime_convert());
 		return;
 	}
+	$t = get_config('system','lastcroncheck');
+	if($t === false) {
+		// This is serious. Config storage isn't working.
+		// We just set lastcroncheck. The system is horked.
+		// However don't add insult to injury by sending an email
+		// to the admin every time a page is accessed.
+		// just quietly
+		return;
+	}
 
 	if($t > datetime_convert('UTC','UTC','now - 3 days')) {
 		// Wait for 3 days before we do anything so as not to swamp the admin with messages
diff --git a/include/import.php b/include/import.php
index 982eeb138..00ecef07d 100644
--- a/include/import.php
+++ b/include/import.php
@@ -575,12 +575,20 @@ function import_items($channel,$items,$sync = false,$relocate = null) {
 			if(! $item)
 				continue;
 
+			if($relocate && $item['mid'] === $item['parent_mid']) {
+				item_url_replace($channel,$item,$relocate['url'],z_root(),$relocate['channel_address']);
+			}
+
 			$r = q("select id, edited from item where mid = '%s' and uid = %d limit 1",
 				dbesc($item['mid']),
 				intval($channel['channel_id'])
 			);
 			if($r) {
-				if($item['edited'] > $r[0]['edited']) {
+
+				// flags may have changed and we are probably relocating the post, 
+				// so force an update even if we have the same timestamp
+
+				if($item['edited'] >= $r[0]['edited']) {
 					$item['id'] = $r[0]['id'];
 					$item['uid'] = $channel['channel_id'];
 					$item_result = item_store_update($item,$allow_code,$deliver);
@@ -595,24 +603,7 @@ function import_items($channel,$items,$sync = false,$relocate = null) {
 			if($sync && $item['item_wall']) {
 				// deliver singletons if we have any
 				if($item_result && $item_result['success']) {
-					Zotlabs\Daemon\Master::Summon(array('Notifier','single_activity',$item_result['item_id']));
-				}
-			}
-			if($relocate && $item_result['item_id']) {
-				$item = $item_result['item'];
-				if($item['mid'] === $item['parent_mid']) {
-					item_url_replace($channel,$item,$relocate['url'],z_root(),$relocate['channel_address']);
-					dbesc_array($item);
-					$item_id = $item_result['item_id'];
-					unset($item['id']);
-					$str = '';
-					foreach($item as $k => $v) {
-						if($str)
-							$str .= ",";
-						$str .= " `" . $k . "` = '" . $v . "' ";
-            		}
-
-            		$r = dbq("update `item` set " . $str . " where id = " . $item_id );
+					Zotlabs\Daemon\Master::Summon( [ 'Notifier','single_activity',$item_result['item_id'] ]);
 				}
 			}
 		}
diff --git a/include/widgets.php b/include/widgets.php
index 8a7f4b69f..7fc3f1aeb 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -743,21 +743,6 @@ function widget_conversations($arr) {
 	return $o;
 }
 
-function widget_eventsmenu($arr) {
-	if (! local_channel())
-		return;
-
-	return replace_macros(get_markup_template('events_menu_side.tpl'), array(
-		'$title' => t('Events Menu'),
-		'$day' => t('Day View'),
-		'$week' => t('Week View'),
-		'$month' => t('Month View'),
-		'$export' => t('Export'),
-		'$upload' => t('Import'),
-		'$submit' => t('Submit')
-	));
-}
-
 function widget_eventstools($arr) {
 	if (! local_channel())
 		return;
diff --git a/util/hmessages.po b/util/hmessages.po
index 8fcc4a545..30a8f5329 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-24 00:02-0700\n"
+"POT-Creation-Date: 2016-07-01 00:02-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -54,8 +54,8 @@ msgid "Unknown"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:226 ../../Zotlabs/Module/Fbrowser.php:85
-#: ../../Zotlabs/Lib/Apps.php:216 ../../include/nav.php:93
-#: ../../include/conversation.php:1654
+#: ../../Zotlabs/Lib/Apps.php:216 ../../include/conversation.php:1654
+#: ../../include/nav.php:93
 msgid "Files"
 msgstr ""
 
@@ -68,16 +68,16 @@ msgid "Shared"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:306
-#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Layouts.php:184
-#: ../../Zotlabs/Module/Webpages.php:194 ../../Zotlabs/Module/Menu.php:118
+#: ../../Zotlabs/Module/Layouts.php:184 ../../Zotlabs/Module/Menu.php:118
 #: ../../Zotlabs/Module/New_channel.php:142
+#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Webpages.php:194
 msgid "Create"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:308
 #: ../../Zotlabs/Module/Cover_photo.php:357
 #: ../../Zotlabs/Module/Photos.php:825 ../../Zotlabs/Module/Photos.php:1364
-#: ../../Zotlabs/Module/Profile_photo.php:389
+#: ../../Zotlabs/Module/Profile_photo.php:388
 #: ../../Zotlabs/Module/Embedphotos.php:159 ../../include/widgets.php:1591
 msgid "Upload"
 msgstr ""
@@ -103,32 +103,31 @@ msgstr ""
 msgid "Last Modified"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:240
-#: ../../Zotlabs/Module/Editblock.php:109 ../../Zotlabs/Module/Editpost.php:84
+#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Editpost.php:84
 #: ../../Zotlabs/Module/Connections.php:290
 #: ../../Zotlabs/Module/Connections.php:310
-#: ../../Zotlabs/Module/Admin.php:2113 ../../Zotlabs/Module/Blocks.php:160
 #: ../../Zotlabs/Module/Editlayout.php:114
 #: ../../Zotlabs/Module/Editwebpage.php:146
-#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:195
-#: ../../Zotlabs/Module/Menu.php:112 ../../Zotlabs/Module/Settings.php:652
-#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Lib/Apps.php:340
+#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Menu.php:112
+#: ../../Zotlabs/Module/Admin.php:2113 ../../Zotlabs/Module/Blocks.php:160
+#: ../../Zotlabs/Module/Editblock.php:109
+#: ../../Zotlabs/Module/Settings.php:652 ../../Zotlabs/Module/Thing.php:260
+#: ../../Zotlabs/Module/Webpages.php:195 ../../Zotlabs/Lib/Apps.php:340
 #: ../../Zotlabs/Lib/ThreadItem.php:106 ../../include/page_widgets.php:9
-#: ../../include/page_widgets.php:39 ../../include/menu.php:108
-#: ../../include/channel.php:924 ../../include/channel.php:928
+#: ../../include/page_widgets.php:39 ../../include/channel.php:961
+#: ../../include/channel.php:965 ../../include/menu.php:108
 msgid "Edit"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:241
-#: ../../Zotlabs/Module/Editblock.php:134
+#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Connedit.php:578
 #: ../../Zotlabs/Module/Connections.php:263
-#: ../../Zotlabs/Module/Admin.php:1039 ../../Zotlabs/Module/Admin.php:1213
-#: ../../Zotlabs/Module/Admin.php:2114 ../../Zotlabs/Module/Blocks.php:162
 #: ../../Zotlabs/Module/Editlayout.php:137
 #: ../../Zotlabs/Module/Editwebpage.php:170 ../../Zotlabs/Module/Group.php:177
-#: ../../Zotlabs/Module/Webpages.php:197 ../../Zotlabs/Module/Photos.php:1173
-#: ../../Zotlabs/Module/Connedit.php:578 ../../Zotlabs/Module/Settings.php:653
-#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Lib/Apps.php:341
+#: ../../Zotlabs/Module/Photos.php:1173 ../../Zotlabs/Module/Admin.php:1039
+#: ../../Zotlabs/Module/Admin.php:1213 ../../Zotlabs/Module/Admin.php:2114
+#: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editblock.php:134
+#: ../../Zotlabs/Module/Settings.php:653 ../../Zotlabs/Module/Thing.php:261
+#: ../../Zotlabs/Module/Webpages.php:197 ../../Zotlabs/Lib/Apps.php:341
 #: ../../Zotlabs/Lib/ThreadItem.php:126 ../../include/conversation.php:660
 msgid "Delete"
 msgstr ""
@@ -156,8 +155,8 @@ msgid "Upload file"
 msgstr ""
 
 #: ../../Zotlabs/Web/WebServer.php:120 ../../Zotlabs/Module/Dreport.php:10
-#: ../../Zotlabs/Module/Dreport.php:49 ../../Zotlabs/Module/Group.php:72
-#: ../../Zotlabs/Module/Like.php:284 ../../Zotlabs/Module/Import_items.php:112
+#: ../../Zotlabs/Module/Dreport.php:66 ../../Zotlabs/Module/Group.php:72
+#: ../../Zotlabs/Module/Like.php:284 ../../Zotlabs/Module/Import_items.php:114
 #: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62
 #: ../../include/items.php:385
 msgid "Permission denied"
@@ -165,63 +164,63 @@ msgstr ""
 
 #: ../../Zotlabs/Web/WebServer.php:121 ../../Zotlabs/Web/Router.php:65
 #: ../../Zotlabs/Module/Achievements.php:34
-#: ../../Zotlabs/Module/Editblock.php:67 ../../Zotlabs/Module/Authtest.php:16
-#: ../../Zotlabs/Module/Chat.php:100 ../../Zotlabs/Module/Chat.php:105
-#: ../../Zotlabs/Module/Events.php:265 ../../Zotlabs/Module/Bookmarks.php:61
-#: ../../Zotlabs/Module/Item.php:211 ../../Zotlabs/Module/Item.php:219
-#: ../../Zotlabs/Module/Item.php:1070 ../../Zotlabs/Module/Editpost.php:17
-#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Connections.php:33
+#: ../../Zotlabs/Module/Connedit.php:366 ../../Zotlabs/Module/Id.php:76
+#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Events.php:265
+#: ../../Zotlabs/Module/Bookmarks.php:61 ../../Zotlabs/Module/Editpost.php:17
+#: ../../Zotlabs/Module/Page.php:35 ../../Zotlabs/Module/Page.php:91
+#: ../../Zotlabs/Module/Connections.php:33
 #: ../../Zotlabs/Module/Cover_photo.php:277
-#: ../../Zotlabs/Module/Cover_photo.php:290 ../../Zotlabs/Module/Blocks.php:73
-#: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Editlayout.php:67
+#: ../../Zotlabs/Module/Cover_photo.php:290 ../../Zotlabs/Module/Chat.php:100
+#: ../../Zotlabs/Module/Chat.php:105 ../../Zotlabs/Module/Editlayout.php:67
 #: ../../Zotlabs/Module/Editlayout.php:90
 #: ../../Zotlabs/Module/Editwebpage.php:69
 #: ../../Zotlabs/Module/Editwebpage.php:90
 #: ../../Zotlabs/Module/Editwebpage.php:105
 #: ../../Zotlabs/Module/Editwebpage.php:127 ../../Zotlabs/Module/Group.php:13
-#: ../../Zotlabs/Module/Appman.php:75 ../../Zotlabs/Module/Layouts.php:71
-#: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89
-#: ../../Zotlabs/Module/Webpages.php:74
+#: ../../Zotlabs/Module/Appman.php:75 ../../Zotlabs/Module/Pdledit.php:26
 #: ../../Zotlabs/Module/Filestorage.php:24
 #: ../../Zotlabs/Module/Filestorage.php:79
 #: ../../Zotlabs/Module/Filestorage.php:94
-#: ../../Zotlabs/Module/Filestorage.php:121 ../../Zotlabs/Module/Like.php:181
-#: ../../Zotlabs/Module/Id.php:76 ../../Zotlabs/Module/Page.php:35
-#: ../../Zotlabs/Module/Page.php:91 ../../Zotlabs/Module/Invite.php:17
-#: ../../Zotlabs/Module/Invite.php:91 ../../Zotlabs/Module/Locs.php:87
-#: ../../Zotlabs/Module/Mail.php:129 ../../Zotlabs/Module/Manage.php:10
-#: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Message.php:18
-#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Network.php:17
-#: ../../Zotlabs/Module/Block.php:26 ../../Zotlabs/Module/Block.php:76
+#: ../../Zotlabs/Module/Filestorage.php:121
+#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78
+#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Like.php:181
+#: ../../Zotlabs/Module/Profiles.php:203 ../../Zotlabs/Module/Profiles.php:601
+#: ../../Zotlabs/Module/Item.php:211 ../../Zotlabs/Module/Item.php:219
+#: ../../Zotlabs/Module/Item.php:1070 ../../Zotlabs/Module/Photos.php:75
+#: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:91
+#: ../../Zotlabs/Module/Locs.php:87 ../../Zotlabs/Module/Mail.php:129
+#: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Menu.php:78
+#: ../../Zotlabs/Module/Message.php:18 ../../Zotlabs/Module/Mood.php:116
+#: ../../Zotlabs/Module/Network.php:17 ../../Zotlabs/Module/Channel.php:105
+#: ../../Zotlabs/Module/Channel.php:226 ../../Zotlabs/Module/Channel.php:267
 #: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/New_channel.php:77
 #: ../../Zotlabs/Module/New_channel.php:104
 #: ../../Zotlabs/Module/Notifications.php:70 ../../Zotlabs/Module/Poke.php:137
-#: ../../Zotlabs/Module/Photos.php:75 ../../Zotlabs/Module/Pdledit.php:26
 #: ../../Zotlabs/Module/Profile.php:68 ../../Zotlabs/Module/Profile.php:76
-#: ../../Zotlabs/Module/Profiles.php:203 ../../Zotlabs/Module/Profiles.php:601
-#: ../../Zotlabs/Module/Profile_photo.php:264
-#: ../../Zotlabs/Module/Profile_photo.php:277
-#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Connedit.php:366
-#: ../../Zotlabs/Module/Channel.php:105 ../../Zotlabs/Module/Channel.php:226
-#: ../../Zotlabs/Module/Channel.php:267 ../../Zotlabs/Module/Register.php:77
+#: ../../Zotlabs/Module/Block.php:26 ../../Zotlabs/Module/Block.php:76
+#: ../../Zotlabs/Module/Profile_photo.php:263
+#: ../../Zotlabs/Module/Profile_photo.php:276
+#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80
+#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Editblock.php:67
+#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Register.php:77
 #: ../../Zotlabs/Module/Regmod.php:21
 #: ../../Zotlabs/Module/Service_limits.php:11
 #: ../../Zotlabs/Module/Settings.php:572 ../../Zotlabs/Module/Setup.php:215
-#: ../../Zotlabs/Module/Sharedwithme.php:11
+#: ../../Zotlabs/Module/Sharedwithme.php:11 ../../Zotlabs/Module/Thing.php:274
+#: ../../Zotlabs/Module/Thing.php:294 ../../Zotlabs/Module/Thing.php:331
 #: ../../Zotlabs/Module/Sources.php:74 ../../Zotlabs/Module/Suggest.php:30
-#: ../../Zotlabs/Module/Thing.php:274 ../../Zotlabs/Module/Thing.php:294
-#: ../../Zotlabs/Module/Thing.php:331
-#: ../../Zotlabs/Module/Viewconnections.php:25
-#: ../../Zotlabs/Module/Viewconnections.php:30
+#: ../../Zotlabs/Module/Webpages.php:74
+#: ../../Zotlabs/Module/Viewconnections.php:28
+#: ../../Zotlabs/Module/Viewconnections.php:33
 #: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Api.php:13
 #: ../../Zotlabs/Module/Api.php:18 ../../Zotlabs/Lib/Chatroom.php:137
-#: ../../include/items.php:3462 ../../include/attach.php:141
-#: ../../include/attach.php:189 ../../include/attach.php:252
-#: ../../include/attach.php:266 ../../include/attach.php:273
-#: ../../include/attach.php:338 ../../include/attach.php:352
-#: ../../include/attach.php:359 ../../include/attach.php:439
-#: ../../include/attach.php:901 ../../include/attach.php:972
-#: ../../include/attach.php:1124 ../../include/photos.php:27
+#: ../../include/items.php:3462 ../../include/photos.php:27
+#: ../../include/attach.php:141 ../../include/attach.php:189
+#: ../../include/attach.php:252 ../../include/attach.php:266
+#: ../../include/attach.php:273 ../../include/attach.php:338
+#: ../../include/attach.php:352 ../../include/attach.php:359
+#: ../../include/attach.php:439 ../../include/attach.php:901
+#: ../../include/attach.php:972 ../../include/attach.php:1124
 msgid "Permission denied."
 msgstr ""
 
@@ -229,8 +228,8 @@ msgstr ""
 msgid "Not Found"
 msgstr ""
 
-#: ../../Zotlabs/Web/Router.php:149 ../../Zotlabs/Module/Help.php:97
-#: ../../Zotlabs/Module/Display.php:118 ../../Zotlabs/Module/Page.php:94
+#: ../../Zotlabs/Web/Router.php:149 ../../Zotlabs/Module/Display.php:118
+#: ../../Zotlabs/Module/Page.php:94 ../../Zotlabs/Module/Help.php:97
 #: ../../Zotlabs/Module/Block.php:79
 msgid "Page not found."
 msgstr ""
@@ -248,12 +247,12 @@ msgid "Welcome %s. Remote authentication successful."
 msgstr ""
 
 #: ../../Zotlabs/Module/Achievements.php:15
-#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editblock.php:31
-#: ../../Zotlabs/Module/Blocks.php:33 ../../Zotlabs/Module/Editlayout.php:31
-#: ../../Zotlabs/Module/Editwebpage.php:33 ../../Zotlabs/Module/Layouts.php:31
-#: ../../Zotlabs/Module/Webpages.php:34
-#: ../../Zotlabs/Module/Filestorage.php:60 ../../Zotlabs/Module/Hcard.php:12
-#: ../../Zotlabs/Module/Profile.php:20 ../../include/channel.php:824
+#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Editlayout.php:31
+#: ../../Zotlabs/Module/Editwebpage.php:33 ../../Zotlabs/Module/Hcard.php:12
+#: ../../Zotlabs/Module/Filestorage.php:60 ../../Zotlabs/Module/Layouts.php:31
+#: ../../Zotlabs/Module/Profile.php:20 ../../Zotlabs/Module/Blocks.php:33
+#: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Webpages.php:34
+#: ../../include/channel.php:861
 msgid "Requested profile is not available."
 msgstr ""
 
@@ -269,113 +268,487 @@ msgstr ""
 msgid "Online"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
-msgid "Continue"
+#: ../../Zotlabs/Module/Connedit.php:80
+msgid "Could not access contact record."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:90
-msgid "Premium Channel Setup"
+#: ../../Zotlabs/Module/Connedit.php:104
+msgid "Could not locate selected profile."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:92
-msgid "Enable premium channel connection restrictions"
+#: ../../Zotlabs/Module/Connedit.php:227
+msgid "Connection updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:93
-msgid ""
-"Please enter your restrictions or conditions, such as paypal receipt, usage "
-"guidelines, etc."
+#: ../../Zotlabs/Module/Connedit.php:229
+msgid "Failed to update connection record."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115
+#: ../../Zotlabs/Module/Connedit.php:276
+msgid "is now connected to"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Connedit.php:660
+#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460
+#: ../../Zotlabs/Module/Events.php:469
+#: ../../Zotlabs/Module/Filestorage.php:157
+#: ../../Zotlabs/Module/Filestorage.php:165
+#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Photos.php:666
+#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
+#: ../../Zotlabs/Module/Mitem.php:158 ../../Zotlabs/Module/Mitem.php:159
+#: ../../Zotlabs/Module/Mitem.php:232 ../../Zotlabs/Module/Mitem.php:233
+#: ../../Zotlabs/Module/Admin.php:459 ../../Zotlabs/Module/Removeme.php:61
+#: ../../Zotlabs/Module/Settings.php:581 ../../Zotlabs/Module/Api.php:89
+#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
+#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:105
+#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1708
+msgid "No"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:379 ../../Zotlabs/Module/Events.php:459
+#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:469
+#: ../../Zotlabs/Module/Filestorage.php:157
+#: ../../Zotlabs/Module/Filestorage.php:165
+#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Photos.php:666
+#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
+#: ../../Zotlabs/Module/Mitem.php:158 ../../Zotlabs/Module/Mitem.php:159
+#: ../../Zotlabs/Module/Mitem.php:232 ../../Zotlabs/Module/Mitem.php:233
+#: ../../Zotlabs/Module/Admin.php:461 ../../Zotlabs/Module/Removeme.php:61
+#: ../../Zotlabs/Module/Settings.php:581 ../../Zotlabs/Module/Api.php:88
+#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
+#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:105
+#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1708
+msgid "Yes"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:411
+msgid "Could not access address book record."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:431
+msgid "Refresh failed - channel is currently unavailable."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:446 ../../Zotlabs/Module/Connedit.php:455
+#: ../../Zotlabs/Module/Connedit.php:464 ../../Zotlabs/Module/Connedit.php:473
+#: ../../Zotlabs/Module/Connedit.php:486
+msgid "Unable to set address book parameters."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:509
+msgid "Connection has been removed."
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:525 ../../Zotlabs/Lib/Apps.php:220
+#: ../../include/conversation.php:957 ../../include/nav.php:86
+msgid "View Profile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:528
+#, php-format
+msgid "View %s's profile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:532
+msgid "Refresh Permissions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:535
+msgid "Fetch updated permissions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:539
+msgid "Recent Activity"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:542
+msgid "View recent posts and comments"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:546 ../../Zotlabs/Module/Admin.php:1041
+msgid "Unblock"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:546 ../../Zotlabs/Module/Admin.php:1040
+msgid "Block"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:549
+msgid "Block (or Unblock) all communications with this connection"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:550
+msgid "This connection is blocked!"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:554
+msgid "Unignore"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:554
+#: ../../Zotlabs/Module/Connections.php:277
+#: ../../Zotlabs/Module/Notifications.php:55
+msgid "Ignore"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:557
+msgid "Ignore (or Unignore) all inbound communications from this connection"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:558
+msgid "This connection is ignored!"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:562
+msgid "Unarchive"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:562
+msgid "Archive"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:565
 msgid ""
-"This channel may require additional steps or acknowledgement of the "
-"following conditions prior to connecting:"
+"Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:96
+#: ../../Zotlabs/Module/Connedit.php:566
+msgid "This connection is archived!"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:570
+msgid "Unhide"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:570
+msgid "Hide"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:573
+msgid "Hide or Unhide this connection from your other connections"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:574
+msgid "This connection is hidden!"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:581
+msgid "Delete this connection"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:596 ../../include/widgets.php:493
+msgid "Me"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:597 ../../include/widgets.php:494
+msgid "Family"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:598 ../../Zotlabs/Module/Settings.php:342
+#: ../../Zotlabs/Module/Settings.php:346 ../../Zotlabs/Module/Settings.php:347
+#: ../../Zotlabs/Module/Settings.php:350 ../../Zotlabs/Module/Settings.php:361
+#: ../../include/selectors.php:123 ../../include/widgets.php:495
+#: ../../include/channel.php:389 ../../include/channel.php:390
+#: ../../include/channel.php:397
+msgid "Friends"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:599 ../../include/widgets.php:496
+msgid "Acquaintances"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:600
+#: ../../Zotlabs/Module/Connections.php:92
+#: ../../Zotlabs/Module/Connections.php:107 ../../include/widgets.php:497
+msgid "All"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:660
+msgid "Approve this connection"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:660
+msgid "Accept connection to allow communication"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:665
+msgid "Set Affinity"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:668
+msgid "Set Profile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:671
+msgid "Set Affinity & Profile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:704
+msgid "none"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:708 ../../include/widgets.php:614
+msgid "Connection Default Permissions"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:708 ../../include/items.php:3949
+#, php-format
+msgid "Connection: %s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:709
+msgid "Apply these permissions automatically"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:709
+msgid "Connection requests will be approved without your interaction"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:711
+msgid "This connection's primary address is"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:712
+msgid "Available locations:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:716
 msgid ""
-"Potential connections will then see the following text before proceeding:"
+"The permissions indicated on this page will be applied to all new "
+"connections."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118
+#: ../../Zotlabs/Module/Connedit.php:717
+msgid "Connection Tools"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:719
+msgid "Slide to adjust your degree of friendship"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:720 ../../Zotlabs/Module/Rate.php:159
+#: ../../include/js_strings.php:20
+msgid "Rating"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:721
+msgid "Slide to adjust your rating"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:722 ../../Zotlabs/Module/Connedit.php:727
+msgid "Optionally explain your rating"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:724
+msgid "Custom Filter"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:725
+msgid "Only import posts with this text"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:725 ../../Zotlabs/Module/Connedit.php:726
 msgid ""
-"By continuing, I certify that I have complied with any instructions provided "
-"on this page."
+"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
+"all posts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:726
+msgid "Do not import posts with this text"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:728
+msgid "This information is public!"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:733
+msgid "Connection Pending Approval"
+msgstr ""
+
+#: ../../Zotlabs/Module/Connedit.php:736
+msgid "inherited"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:98 ../../Zotlabs/Module/Chat.php:196
-#: ../../Zotlabs/Module/Chat.php:238 ../../Zotlabs/Module/Events.php:475
-#: ../../Zotlabs/Module/Events.php:672 ../../Zotlabs/Module/Import.php:551
-#: ../../Zotlabs/Module/Admin.php:492 ../../Zotlabs/Module/Admin.php:688
-#: ../../Zotlabs/Module/Admin.php:771 ../../Zotlabs/Module/Admin.php:1032
-#: ../../Zotlabs/Module/Admin.php:1211 ../../Zotlabs/Module/Admin.php:1421
-#: ../../Zotlabs/Module/Admin.php:1648 ../../Zotlabs/Module/Admin.php:1733
-#: ../../Zotlabs/Module/Admin.php:2116 ../../Zotlabs/Module/Group.php:85
-#: ../../Zotlabs/Module/Appman.php:126
+#: ../../Zotlabs/Module/Connedit.php:737 ../../Zotlabs/Module/Connect.php:98
+#: ../../Zotlabs/Module/Events.php:475 ../../Zotlabs/Module/Events.php:672
+#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Chat.php:196
+#: ../../Zotlabs/Module/Chat.php:238 ../../Zotlabs/Module/Group.php:85
+#: ../../Zotlabs/Module/Appman.php:126 ../../Zotlabs/Module/Pdledit.php:66
 #: ../../Zotlabs/Module/Filestorage.php:162
-#: ../../Zotlabs/Module/Import_items.php:120
-#: ../../Zotlabs/Module/Invite.php:146 ../../Zotlabs/Module/Locs.php:121
-#: ../../Zotlabs/Module/Mail.php:378 ../../Zotlabs/Module/Mood.php:139
-#: ../../Zotlabs/Module/Mitem.php:235 ../../Zotlabs/Module/Poke.php:186
+#: ../../Zotlabs/Module/Profiles.php:687 ../../Zotlabs/Module/Import.php:551
 #: ../../Zotlabs/Module/Photos.php:677 ../../Zotlabs/Module/Photos.php:1052
 #: ../../Zotlabs/Module/Photos.php:1092 ../../Zotlabs/Module/Photos.php:1210
-#: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Pdledit.php:66
-#: ../../Zotlabs/Module/Profiles.php:687 ../../Zotlabs/Module/Cal.php:338
-#: ../../Zotlabs/Module/Rate.php:170 ../../Zotlabs/Module/Connedit.php:737
-#: ../../Zotlabs/Module/Settings.php:590 ../../Zotlabs/Module/Settings.php:703
-#: ../../Zotlabs/Module/Settings.php:731 ../../Zotlabs/Module/Settings.php:754
-#: ../../Zotlabs/Module/Settings.php:842
+#: ../../Zotlabs/Module/Import_items.php:122
+#: ../../Zotlabs/Module/Invite.php:146 ../../Zotlabs/Module/Locs.php:121
+#: ../../Zotlabs/Module/Mail.php:378 ../../Zotlabs/Module/Mood.php:139
+#: ../../Zotlabs/Module/Mitem.php:235 ../../Zotlabs/Module/Admin.php:492
+#: ../../Zotlabs/Module/Admin.php:688 ../../Zotlabs/Module/Admin.php:771
+#: ../../Zotlabs/Module/Admin.php:1032 ../../Zotlabs/Module/Admin.php:1211
+#: ../../Zotlabs/Module/Admin.php:1421 ../../Zotlabs/Module/Admin.php:1648
+#: ../../Zotlabs/Module/Admin.php:1733 ../../Zotlabs/Module/Admin.php:2116
+#: ../../Zotlabs/Module/Poke.php:186 ../../Zotlabs/Module/Pconfig.php:107
+#: ../../Zotlabs/Module/Rate.php:170 ../../Zotlabs/Module/Settings.php:590
+#: ../../Zotlabs/Module/Settings.php:703 ../../Zotlabs/Module/Settings.php:731
+#: ../../Zotlabs/Module/Settings.php:754 ../../Zotlabs/Module/Settings.php:842
 #: ../../Zotlabs/Module/Settings.php:1034 ../../Zotlabs/Module/Setup.php:312
-#: ../../Zotlabs/Module/Setup.php:353 ../../Zotlabs/Module/Sources.php:114
-#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Thing.php:316
-#: ../../Zotlabs/Module/Thing.php:362 ../../Zotlabs/Module/Xchan.php:15
-#: ../../Zotlabs/Lib/ThreadItem.php:710 ../../include/js_strings.php:22
-#: ../../include/widgets.php:757 ../../include/widgets.php:769
+#: ../../Zotlabs/Module/Setup.php:353 ../../Zotlabs/Module/Thing.php:316
+#: ../../Zotlabs/Module/Thing.php:362 ../../Zotlabs/Module/Sources.php:114
+#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Xchan.php:15
+#: ../../Zotlabs/Lib/ThreadItem.php:710 ../../include/widgets.php:757
+#: ../../include/widgets.php:769 ../../include/js_strings.php:22
 #: ../../view/theme/redbasic/php/config.php:99
 msgid "Submit"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:106
-msgid "(No specific instructions have been provided by the channel owner.)"
+#: ../../Zotlabs/Module/Connedit.php:738
+#, php-format
+msgid ""
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:114
-msgid "Restricted or Premium Channel"
+#: ../../Zotlabs/Module/Connedit.php:740
+msgid "Their Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
-#: ../../Zotlabs/Module/Editpost.php:24 ../../Zotlabs/Module/Editlayout.php:79
-#: ../../Zotlabs/Module/Editwebpage.php:81
-msgid "Item not found"
+#: ../../Zotlabs/Module/Connedit.php:741
+msgid "My Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editblock.php:108 ../../Zotlabs/Module/Blocks.php:97
-#: ../../Zotlabs/Module/Blocks.php:155
-msgid "Block Name"
+#: ../../Zotlabs/Module/Connedit.php:743
+msgid "Individual Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editblock.php:111 ../../Zotlabs/Module/Chat.php:207
-#: ../../Zotlabs/Module/Editwebpage.php:147 ../../Zotlabs/Module/Mail.php:252
-#: ../../Zotlabs/Module/Mail.php:377 ../../include/conversation.php:1146
-msgid "Insert web link"
+#: ../../Zotlabs/Module/Connedit.php:744
+msgid ""
+"Some permissions may be inherited from your channel's <a href=\"settings"
+"\"><strong>privacy settings</strong></a>, which have higher priority than "
+"individual settings. You can <strong>not</strong> change those settings here."
 msgstr ""
 
-#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1243
-msgid "Title (optional)"
+#: ../../Zotlabs/Module/Connedit.php:745
+msgid ""
+"Some permissions may be inherited from your channel's <a href=\"settings"
+"\"><strong>privacy settings</strong></a>, which have higher priority than "
+"individual settings. You can change those settings here but they wont have "
+"any impact unless the inherited setting changes."
 msgstr ""
 
-#: ../../Zotlabs/Module/Editblock.php:133
-msgid "Edit Block"
+#: ../../Zotlabs/Module/Connedit.php:746
+msgid "Last update:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Display.php:17
+#: ../../Zotlabs/Module/Display.php:17 ../../Zotlabs/Module/Directory.php:63
 #: ../../Zotlabs/Module/Photos.php:522 ../../Zotlabs/Module/Ratings.php:86
 #: ../../Zotlabs/Module/Search.php:17
-#: ../../Zotlabs/Module/Viewconnections.php:20
+#: ../../Zotlabs/Module/Viewconnections.php:23
 msgid "Public access denied."
 msgstr ""
 
+#: ../../Zotlabs/Module/Display.php:40 ../../Zotlabs/Module/Filestorage.php:33
+#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1255
+#: ../../Zotlabs/Module/Admin.php:1561 ../../Zotlabs/Module/Thing.php:89
+#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3383
+msgid "Item not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:13
+msgid "First Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:14
+msgid "Last Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:15
+msgid "Nickname"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:16
+msgid "Full Name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18
+#: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1047
+#: ../../include/network.php:2203 ../../boot.php:1706
+msgid "Email"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:19 ../../Zotlabs/Module/Id.php:20
+#: ../../Zotlabs/Module/Id.php:21 ../../Zotlabs/Lib/Apps.php:237
+msgid "Profile Photo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:22
+msgid "Profile Photo 16px"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:23
+msgid "Profile Photo 32px"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:24
+msgid "Profile Photo 48px"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:25
+msgid "Profile Photo 64px"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:26
+msgid "Profile Photo 80px"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:27
+msgid "Profile Photo 128px"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:28
+msgid "Timezone"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:731
+msgid "Homepage URL"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:30 ../../Zotlabs/Lib/Apps.php:235
+msgid "Language"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:31
+msgid "Birth Year"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:32
+msgid "Birth Month"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:33
+msgid "Birth Day"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:34
+msgid "Birthdate"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:35 ../../Zotlabs/Module/Profiles.php:454
+msgid "Gender"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:108 ../../include/selectors.php:49
+#: ../../include/selectors.php:66
+msgid "Male"
+msgstr ""
+
+#: ../../Zotlabs/Module/Id.php:110 ../../include/selectors.php:49
+#: ../../include/selectors.php:66
+msgid "Female"
+msgstr ""
+
+#: ../../Zotlabs/Module/Follow.php:34
+msgid "Channel added."
+msgstr ""
+
 #: ../../Zotlabs/Module/Directory.php:243
 #, php-format
 msgid "%d rating"
@@ -395,13 +768,13 @@ msgstr ""
 msgid "Homepage: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:306 ../../include/channel.php:1171
+#: ../../Zotlabs/Module/Directory.php:306 ../../include/channel.php:1208
 msgid "Age:"
 msgstr ""
 
 #: ../../Zotlabs/Module/Directory.php:311 ../../include/bb2diaspora.php:507
 #: ../../include/event.php:52 ../../include/event.php:84
-#: ../../include/channel.php:1014
+#: ../../include/channel.php:1051
 msgid "Location:"
 msgstr ""
 
@@ -409,18 +782,18 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:322 ../../include/channel.php:1187
+#: ../../Zotlabs/Module/Directory.php:322 ../../include/channel.php:1224
 msgid "Hometown:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1195
+#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1232
 msgid "About:"
 msgstr ""
 
 #: ../../Zotlabs/Module/Directory.php:325 ../../Zotlabs/Module/Match.php:68
 #: ../../Zotlabs/Module/Suggest.php:56 ../../include/connections.php:78
-#: ../../include/conversation.php:959 ../../include/channel.php:999
-#: ../../include/widgets.php:147 ../../include/widgets.php:184
+#: ../../include/conversation.php:959 ../../include/widgets.php:147
+#: ../../include/widgets.php:184 ../../include/channel.php:1036
 msgid "Connect"
 msgstr ""
 
@@ -496,89 +869,47 @@ msgstr ""
 msgid "No entries (some entries may be hidden)."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:25 ../../Zotlabs/Module/Wiki.php:20
-#: ../../Zotlabs/Module/Channel.php:29
-msgid "You must be logged in to see this page."
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:181
-msgid "Room not found"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:197
-msgid "Leave Room"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:198
-msgid "Delete Room"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:199
-msgid "I am away right now"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:200
-msgid "I am online"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:202
-msgid "Bookmark this room"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:205
-#: ../../Zotlabs/Module/Mail.php:314 ../../include/conversation.php:1181
-msgid "Please enter a link URL:"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:258
-#: ../../Zotlabs/Module/Mail.php:383 ../../Zotlabs/Lib/ThreadItem.php:722
-#: ../../include/conversation.php:1271
-msgid "Encrypt text"
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:218
-msgid "Feature disabled."
-msgstr ""
-
-#: ../../Zotlabs/Module/Chat.php:232
-msgid "New Chatroom"
+#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
+msgid "Continue"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:233
-msgid "Chatroom name"
+#: ../../Zotlabs/Module/Connect.php:90
+msgid "Premium Channel Setup"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:234
-msgid "Expiration of chats (minutes)"
+#: ../../Zotlabs/Module/Connect.php:92
+msgid "Enable premium channel connection restrictions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:235 ../../Zotlabs/Module/Filestorage.php:153
-#: ../../Zotlabs/Module/Photos.php:671 ../../Zotlabs/Module/Photos.php:1045
-#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:359
-#: ../../include/acl_selectors.php:283
-msgid "Permissions"
+#: ../../Zotlabs/Module/Connect.php:93
+msgid ""
+"Please enter your restrictions or conditions, such as paypal receipt, usage "
+"guidelines, etc."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:246
-#, php-format
-msgid "%1$s's Chatrooms"
+#: ../../Zotlabs/Module/Connect.php:95 ../../Zotlabs/Module/Connect.php:115
+msgid ""
+"This channel may require additional steps or acknowledgement of the "
+"following conditions prior to connecting:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:251
-msgid "No chatrooms available"
+#: ../../Zotlabs/Module/Connect.php:96
+msgid ""
+"Potential connections will then see the following text before proceeding:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:252 ../../Zotlabs/Module/Manage.php:143
-#: ../../Zotlabs/Module/Profiles.php:778
-msgid "Create New"
+#: ../../Zotlabs/Module/Connect.php:97 ../../Zotlabs/Module/Connect.php:118
+msgid ""
+"By continuing, I certify that I have complied with any instructions provided "
+"on this page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:255
-msgid "Expiration"
+#: ../../Zotlabs/Module/Connect.php:106
+msgid "(No specific instructions have been provided by the channel owner.)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:256
-msgid "min"
+#: ../../Zotlabs/Module/Connect.php:114
+msgid "Restricted or Premium Channel"
 msgstr ""
 
 #: ../../Zotlabs/Module/Events.php:26
@@ -607,8 +938,8 @@ msgid "Event not found."
 msgstr ""
 
 #: ../../Zotlabs/Module/Events.php:254 ../../Zotlabs/Module/Like.php:373
-#: ../../Zotlabs/Module/Tagger.php:51 ../../include/event.php:949
-#: ../../include/text.php:1920 ../../include/conversation.php:123
+#: ../../Zotlabs/Module/Tagger.php:51 ../../include/conversation.php:123
+#: ../../include/event.php:949 ../../include/text.php:1920
 msgid "event"
 msgstr ""
 
@@ -659,38 +990,6 @@ msgstr ""
 msgid "Finish date and time"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460
-#: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Admin.php:459
-#: ../../Zotlabs/Module/Filestorage.php:157
-#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Menu.php:100
-#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Mitem.php:158
-#: ../../Zotlabs/Module/Mitem.php:159 ../../Zotlabs/Module/Mitem.php:232
-#: ../../Zotlabs/Module/Mitem.php:233 ../../Zotlabs/Module/Photos.php:666
-#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Connedit.php:379
-#: ../../Zotlabs/Module/Connedit.php:660 ../../Zotlabs/Module/Removeme.php:61
-#: ../../Zotlabs/Module/Settings.php:581 ../../Zotlabs/Module/Api.php:89
-#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
-#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:105
-#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1708
-msgid "No"
-msgstr ""
-
-#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:460
-#: ../../Zotlabs/Module/Events.php:469 ../../Zotlabs/Module/Admin.php:461
-#: ../../Zotlabs/Module/Filestorage.php:157
-#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Menu.php:100
-#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Mitem.php:158
-#: ../../Zotlabs/Module/Mitem.php:159 ../../Zotlabs/Module/Mitem.php:232
-#: ../../Zotlabs/Module/Mitem.php:233 ../../Zotlabs/Module/Photos.php:666
-#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Connedit.php:379
-#: ../../Zotlabs/Module/Removeme.php:61 ../../Zotlabs/Module/Settings.php:581
-#: ../../Zotlabs/Module/Api.php:88 ../../include/dir_fns.php:143
-#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145
-#: ../../view/theme/redbasic/php/config.php:105
-#: ../../view/theme/redbasic/php/config.php:130 ../../boot.php:1708
-msgid "Yes"
-msgstr ""
-
 #: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:461
 msgid "Adjust for viewer timezone"
 msgstr ""
@@ -714,8 +1013,8 @@ msgstr ""
 msgid "Edit Location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:464 ../../Zotlabs/Module/Locs.php:117
-#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:698
+#: ../../Zotlabs/Module/Events.php:464 ../../Zotlabs/Module/Profiles.php:477
+#: ../../Zotlabs/Module/Profiles.php:698 ../../Zotlabs/Module/Locs.php:117
 #: ../../Zotlabs/Module/Pubsites.php:41 ../../include/js_strings.php:25
 msgid "Location"
 msgstr ""
@@ -724,9 +1023,9 @@ msgstr ""
 msgid "Share this event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Webpages.php:202
-#: ../../Zotlabs/Module/Photos.php:1093 ../../Zotlabs/Lib/ThreadItem.php:719
-#: ../../include/page_widgets.php:43 ../../include/conversation.php:1198
+#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Photos.php:1093
+#: ../../Zotlabs/Module/Webpages.php:202 ../../Zotlabs/Lib/ThreadItem.php:719
+#: ../../include/conversation.php:1198 ../../include/page_widgets.php:43
 msgid "Preview"
 msgstr ""
 
@@ -768,14 +1067,14 @@ msgid "Create Event"
 msgstr ""
 
 #: ../../Zotlabs/Module/Events.php:666 ../../Zotlabs/Module/Events.php:673
-#: ../../Zotlabs/Module/Photos.php:949 ../../Zotlabs/Module/Cal.php:332
-#: ../../Zotlabs/Module/Cal.php:339
+#: ../../Zotlabs/Module/Cal.php:332 ../../Zotlabs/Module/Cal.php:339
+#: ../../Zotlabs/Module/Photos.php:949
 msgid "Previous"
 msgstr ""
 
 #: ../../Zotlabs/Module/Events.php:667 ../../Zotlabs/Module/Events.php:674
-#: ../../Zotlabs/Module/Photos.php:958 ../../Zotlabs/Module/Cal.php:333
-#: ../../Zotlabs/Module/Cal.php:340 ../../Zotlabs/Module/Setup.php:267
+#: ../../Zotlabs/Module/Cal.php:333 ../../Zotlabs/Module/Cal.php:340
+#: ../../Zotlabs/Module/Photos.php:958 ../../Zotlabs/Module/Setup.php:267
 msgid "Next"
 msgstr ""
 
@@ -813,38 +1112,10 @@ msgstr ""
 msgid "My Connections Bookmarks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:179
-msgid "Unable to locate original post."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:428
-msgid "Empty post discarded."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:468
-msgid "Executable content type not permitted to this channel."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:848
-msgid "Duplicate post suppressed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:983
-msgid "System error. Post not saved."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:1241
-msgid "Unable to obtain post information from database."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:1248
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:1255
-#, php-format
-msgid "You have reached your limit of %1$.0f webpages."
+#: ../../Zotlabs/Module/Editpost.php:24 ../../Zotlabs/Module/Editlayout.php:79
+#: ../../Zotlabs/Module/Editwebpage.php:81
+#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95
+msgid "Item not found"
 msgstr ""
 
 #: ../../Zotlabs/Module/Editpost.php:35
@@ -856,112 +1127,36 @@ msgid "Edit post"
 msgstr ""
 
 #: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:221
-#: ../../include/nav.php:92 ../../include/conversation.php:1647
+#: ../../include/conversation.php:1647 ../../include/nav.php:92
 msgid "Photos"
 msgstr ""
 
 #: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
-#: ../../Zotlabs/Module/Admin.php:1406 ../../Zotlabs/Module/Wiki.php:145
-#: ../../Zotlabs/Module/Settings.php:591 ../../Zotlabs/Module/Settings.php:617
-#: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138
-#: ../../include/conversation.php:1235 ../../include/conversation.php:1274
+#: ../../Zotlabs/Module/Admin.php:1406 ../../Zotlabs/Module/Settings.php:591
+#: ../../Zotlabs/Module/Settings.php:617 ../../Zotlabs/Module/Tagrm.php:15
+#: ../../Zotlabs/Module/Tagrm.php:138 ../../Zotlabs/Module/Wiki.php:166
+#: ../../Zotlabs/Module/Wiki.php:202 ../../include/conversation.php:1235
+#: ../../include/conversation.php:1274
 msgid "Cancel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:32
-#, php-format
-msgid "Your service plan only allows %d channels."
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:70 ../../Zotlabs/Module/Import_items.php:42
-msgid "Nothing to import."
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:94 ../../Zotlabs/Module/Import_items.php:66
-msgid "Unable to download data from old server"
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:100
-#: ../../Zotlabs/Module/Import_items.php:72
-msgid "Imported file is empty."
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:122
-#: ../../Zotlabs/Module/Import_items.php:86
-#, php-format
-msgid "Warning: Database versions differ by %1$d updates."
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:152 ../../include/import.php:86
-msgid "Cloned channel not found. Import failed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:162
-msgid "No channel. Import failed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:511
-#: ../../include/Import/import_diaspora.php:142
-msgid "Import completed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:533
-msgid "You must be logged in to use this feature."
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:538
-msgid "Import Channel"
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:539
-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."
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:540
-#: ../../Zotlabs/Module/Import_items.php:119
-msgid "File to Upload"
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:541
-msgid "Or provide the old server/hub details"
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:542
-msgid "Your old identity address (xyz@example.com)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:543
-msgid "Your old login email address"
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:544
-msgid "Your old login password"
-msgstr ""
-
-#: ../../Zotlabs/Module/Import.php:545
-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 ""
-
-#: ../../Zotlabs/Module/Import.php:546
-msgid "Make this hub my primary location"
+#: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31
+msgid "Invalid item."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:547
-msgid ""
-"Import existing posts if possible (experimental - limited by available memory"
+#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Cal.php:62
+#: ../../Zotlabs/Module/Block.php:43 ../../Zotlabs/Module/Wall_upload.php:33
+msgid "Channel not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:548
+#: ../../Zotlabs/Module/Page.php:131
 msgid ""
-"This process may take several minutes to complete. Please submit the form "
-"only once and leave this page open until finished."
+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
+"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, "
+"quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
+"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
+"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
+"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
 msgstr ""
 
 #: ../../Zotlabs/Module/Filer.php:52
@@ -979,18 +1174,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: ../../Zotlabs/Module/Common.php:14
-msgid "No channel."
-msgstr ""
-
-#: ../../Zotlabs/Module/Common.php:43
-msgid "Common connections"
-msgstr ""
-
-#: ../../Zotlabs/Module/Common.php:48
-msgid "No connections in common."
-msgstr ""
-
 #: ../../Zotlabs/Module/Connections.php:56
 #: ../../Zotlabs/Module/Connections.php:161
 #: ../../Zotlabs/Module/Connections.php:242
@@ -1021,12 +1204,6 @@ msgstr ""
 msgid "New"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:92
-#: ../../Zotlabs/Module/Connections.php:107
-#: ../../Zotlabs/Module/Connedit.php:600 ../../include/widgets.php:497
-msgid "All"
-msgstr ""
-
 #: ../../Zotlabs/Module/Connections.php:138
 msgid "New Connections"
 msgstr ""
@@ -1106,25 +1283,19 @@ msgstr ""
 msgid "Ignore connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:277
-#: ../../Zotlabs/Module/Notifications.php:55
-#: ../../Zotlabs/Module/Connedit.php:554
-msgid "Ignore"
-msgstr ""
-
 #: ../../Zotlabs/Module/Connections.php:278
 msgid "Recent activity"
 msgstr ""
 
 #: ../../Zotlabs/Module/Connections.php:302 ../../Zotlabs/Lib/Apps.php:208
-#: ../../include/nav.php:186 ../../include/text.php:851
+#: ../../include/text.php:851 ../../include/nav.php:188
 msgid "Connections"
 msgstr ""
 
 #: ../../Zotlabs/Module/Connections.php:306 ../../Zotlabs/Module/Search.php:44
 #: ../../Zotlabs/Lib/Apps.php:229 ../../include/acl_selectors.php:276
-#: ../../include/nav.php:165 ../../include/text.php:921
-#: ../../include/text.php:933
+#: ../../include/text.php:921 ../../include/text.php:933
+#: ../../include/nav.php:167
 msgid "Search"
 msgstr ""
 
@@ -1147,22 +1318,22 @@ msgid "Cover Photos"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:154
-#: ../../Zotlabs/Module/Profile_photo.php:136
+#: ../../Zotlabs/Module/Profile_photo.php:135
 msgid "Image resize failed."
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:168
-#: ../../Zotlabs/Module/Profile_photo.php:195 ../../include/photos.php:148
+#: ../../Zotlabs/Module/Profile_photo.php:194 ../../include/photos.php:148
 msgid "Unable to process image"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:192
-#: ../../Zotlabs/Module/Profile_photo.php:222
+#: ../../Zotlabs/Module/Profile_photo.php:221
 msgid "Image upload failed."
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:210
-#: ../../Zotlabs/Module/Profile_photo.php:241
+#: ../../Zotlabs/Module/Profile_photo.php:240
 msgid "Unable to process image."
 msgstr ""
 
@@ -1189,24 +1360,24 @@ msgstr ""
 msgid "%1$s updated their %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1650
+#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1687
 msgid "cover photo"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:303
 #: ../../Zotlabs/Module/Cover_photo.php:318
-#: ../../Zotlabs/Module/Profile_photo.php:299
-#: ../../Zotlabs/Module/Profile_photo.php:340
+#: ../../Zotlabs/Module/Profile_photo.php:298
+#: ../../Zotlabs/Module/Profile_photo.php:339
 msgid "Photo not available."
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:354
-#: ../../Zotlabs/Module/Profile_photo.php:386
+#: ../../Zotlabs/Module/Profile_photo.php:385
 msgid "Upload File:"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:355
-#: ../../Zotlabs/Module/Profile_photo.php:387
+#: ../../Zotlabs/Module/Profile_photo.php:386
 msgid "Select a profile:"
 msgstr ""
 
@@ -1215,1650 +1386,1287 @@ msgid "Upload Cover Photo"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:395
+#: ../../Zotlabs/Module/Profile_photo.php:394
 #: ../../Zotlabs/Module/Settings.php:985
 msgid "or"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:395
+#: ../../Zotlabs/Module/Profile_photo.php:394
 msgid "skip this step"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:395
+#: ../../Zotlabs/Module/Profile_photo.php:394
 msgid "select a photo from your photo albums"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:377
-#: ../../Zotlabs/Module/Profile_photo.php:414
+#: ../../Zotlabs/Module/Profile_photo.php:413
 msgid "Crop Image"
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:378
-#: ../../Zotlabs/Module/Profile_photo.php:415
+#: ../../Zotlabs/Module/Profile_photo.php:414
 msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 
 #: ../../Zotlabs/Module/Cover_photo.php:380
-#: ../../Zotlabs/Module/Profile_photo.php:417
+#: ../../Zotlabs/Module/Profile_photo.php:416
 msgid "Done Editing"
 msgstr ""
 
-#: ../../Zotlabs/Module/Follow.php:34
-msgid "Channel added."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:77
-msgid "Theme settings updated."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1255
-#: ../../Zotlabs/Module/Admin.php:1561 ../../Zotlabs/Module/Display.php:40
-#: ../../Zotlabs/Module/Filestorage.php:33 ../../Zotlabs/Module/Thing.php:89
-#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3383
-msgid "Item not found."
+#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:192
+msgid "webpage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:197
-msgid "# Accounts"
+#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:198
+msgid "block"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:198
-msgid "# blocked accounts"
+#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:195
+msgid "layout"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:199
-msgid "# expired accounts"
+#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:201
+msgid "menu"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:200
-msgid "# expiring accounts"
+#: ../../Zotlabs/Module/Impel.php:187
+#, php-format
+msgid "%s element installed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:211
-msgid "# Channels"
+#: ../../Zotlabs/Module/Impel.php:190
+#, php-format
+msgid "%s element installation failed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:212
-msgid "# primary"
+#: ../../Zotlabs/Module/Cal.php:69
+msgid "Permissions denied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:213
-msgid "# clones"
+#: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49
+msgid "This site is not a directory server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:219
-msgid "Message queues"
+#: ../../Zotlabs/Module/Dirsearch.php:33
+msgid "This directory server requires an access token"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:236
-msgid "Your software should be updated"
+#: ../../Zotlabs/Module/Chat.php:25 ../../Zotlabs/Module/Channel.php:29
+#: ../../Zotlabs/Module/Wiki.php:20
+msgid "You must be logged in to see this page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:241 ../../Zotlabs/Module/Admin.php:490
-#: ../../Zotlabs/Module/Admin.php:711 ../../Zotlabs/Module/Admin.php:755
-#: ../../Zotlabs/Module/Admin.php:1030 ../../Zotlabs/Module/Admin.php:1209
-#: ../../Zotlabs/Module/Admin.php:1329 ../../Zotlabs/Module/Admin.php:1419
-#: ../../Zotlabs/Module/Admin.php:1612 ../../Zotlabs/Module/Admin.php:1646
-#: ../../Zotlabs/Module/Admin.php:1731
-msgid "Administration"
+#: ../../Zotlabs/Module/Chat.php:181
+msgid "Room not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:242
-msgid "Summary"
+#: ../../Zotlabs/Module/Chat.php:197
+msgid "Leave Room"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:245
-msgid "Registered accounts"
+#: ../../Zotlabs/Module/Chat.php:198
+msgid "Delete Room"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:246 ../../Zotlabs/Module/Admin.php:715
-msgid "Pending registrations"
+#: ../../Zotlabs/Module/Chat.php:199
+msgid "I am away right now"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:247
-msgid "Registered channels"
+#: ../../Zotlabs/Module/Chat.php:200
+msgid "I am online"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:248 ../../Zotlabs/Module/Admin.php:716
-msgid "Active plugins"
+#: ../../Zotlabs/Module/Chat.php:202
+msgid "Bookmark this room"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:249
-msgid "Version"
+#: ../../Zotlabs/Module/Chat.php:205 ../../Zotlabs/Module/Mail.php:205
+#: ../../Zotlabs/Module/Mail.php:314 ../../include/conversation.php:1181
+msgid "Please enter a link URL:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:250
-msgid "Repository version (master)"
+#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Module/Mail.php:258
+#: ../../Zotlabs/Module/Mail.php:383 ../../Zotlabs/Lib/ThreadItem.php:722
+#: ../../include/conversation.php:1271
+msgid "Encrypt text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:251
-msgid "Repository version (dev)"
+#: ../../Zotlabs/Module/Chat.php:207 ../../Zotlabs/Module/Editwebpage.php:147
+#: ../../Zotlabs/Module/Mail.php:252 ../../Zotlabs/Module/Mail.php:377
+#: ../../Zotlabs/Module/Editblock.php:111 ../../include/conversation.php:1146
+msgid "Insert web link"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:373
-msgid "Site settings updated."
+#: ../../Zotlabs/Module/Chat.php:218
+msgid "Feature disabled."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2821
-msgid "Default"
+#: ../../Zotlabs/Module/Chat.php:232
+msgid "New Chatroom"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:410 ../../Zotlabs/Module/Settings.php:798
-msgid "mobile"
+#: ../../Zotlabs/Module/Chat.php:233
+msgid "Chatroom name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:412
-msgid "experimental"
+#: ../../Zotlabs/Module/Chat.php:234
+msgid "Expiration of chats (minutes)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:414
-msgid "unsupported"
+#: ../../Zotlabs/Module/Chat.php:235 ../../Zotlabs/Module/Filestorage.php:153
+#: ../../Zotlabs/Module/Photos.php:671 ../../Zotlabs/Module/Photos.php:1045
+#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:359
+#: ../../include/acl_selectors.php:283
+msgid "Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:460
-msgid "Yes - with approval"
+#: ../../Zotlabs/Module/Chat.php:246
+#, php-format
+msgid "%1$s's Chatrooms"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:466
-msgid "My site is not a public server"
+#: ../../Zotlabs/Module/Chat.php:251
+msgid "No chatrooms available"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:467
-msgid "My site has paid access only"
+#: ../../Zotlabs/Module/Chat.php:252 ../../Zotlabs/Module/Profiles.php:778
+#: ../../Zotlabs/Module/Manage.php:143
+msgid "Create New"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:468
-msgid "My site has free access only"
+#: ../../Zotlabs/Module/Chat.php:255
+msgid "Expiration"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:469
-msgid "My site offers free accounts with optional paid upgrades"
+#: ../../Zotlabs/Module/Chat.php:256
+msgid "min"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1455
-msgid "Site"
+#: ../../Zotlabs/Module/Dreport.php:44
+msgid "Invalid message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:493 ../../Zotlabs/Module/Register.php:245
-msgid "Registration"
+#: ../../Zotlabs/Module/Dreport.php:76
+msgid "no results"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:494
-msgid "File upload"
+#: ../../Zotlabs/Module/Dreport.php:91
+msgid "channel sync processed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:495
-msgid "Policies"
+#: ../../Zotlabs/Module/Dreport.php:95
+msgid "queued"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:496 ../../include/contact_widgets.php:16
-msgid "Advanced"
+#: ../../Zotlabs/Module/Dreport.php:99
+msgid "posted"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:500
-msgid "Site name"
+#: ../../Zotlabs/Module/Dreport.php:103
+msgid "accepted for delivery"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:501
-msgid "Banner/Logo"
+#: ../../Zotlabs/Module/Dreport.php:107
+msgid "updated"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:502
-msgid "Administrator Information"
+#: ../../Zotlabs/Module/Dreport.php:110
+msgid "update ignored"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:502
-msgid ""
-"Contact information for site administrators.  Displayed on siteinfo page.  "
-"BBCode can be used here"
+#: ../../Zotlabs/Module/Dreport.php:113
+msgid "permission denied"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:503
-msgid "System language"
+#: ../../Zotlabs/Module/Dreport.php:117
+msgid "recipient not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:504
-msgid "System theme"
+#: ../../Zotlabs/Module/Dreport.php:120
+msgid "mail recalled"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:504
-msgid ""
-"Default system theme - may be over-ridden by user profiles - <a href='#' "
-"id='cnftheme'>change theme settings</a>"
+#: ../../Zotlabs/Module/Dreport.php:123
+msgid "duplicate mail received"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:505
-msgid "Mobile system theme"
+#: ../../Zotlabs/Module/Dreport.php:126
+msgid "mail delivered"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:505
-msgid "Theme for mobile devices"
+#: ../../Zotlabs/Module/Dreport.php:146
+#, php-format
+msgid "Delivery report for %1$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:507
-msgid "Allow Feeds as Connections"
+#: ../../Zotlabs/Module/Dreport.php:149
+msgid "Redeliver"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:507
-msgid "(Heavy system resource usage)"
+#: ../../Zotlabs/Module/Editlayout.php:127
+#: ../../Zotlabs/Module/Layouts.php:128 ../../Zotlabs/Module/Layouts.php:188
+msgid "Layout Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:508
-msgid "Maximum image size"
+#: ../../Zotlabs/Module/Editlayout.php:128
+#: ../../Zotlabs/Module/Layouts.php:131
+msgid "Layout Description (Optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:508
-msgid ""
-"Maximum size in bytes of uploaded images. Default is 0, which means no "
-"limits."
+#: ../../Zotlabs/Module/Editlayout.php:136
+msgid "Edit Layout"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:509
-msgid "Does this site allow new member registration?"
+#: ../../Zotlabs/Module/Editwebpage.php:143
+msgid "Page link"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:510
-msgid "Invitation only"
+#: ../../Zotlabs/Module/Editwebpage.php:169
+msgid "Edit Webpage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:510
-msgid ""
-"Only allow new member registrations with an invitation code. Above register "
-"policy must be set to Yes."
+#: ../../Zotlabs/Module/Group.php:24
+msgid "Privacy group created."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:511
-msgid "Which best describes the types of account offered by this hub?"
+#: ../../Zotlabs/Module/Group.php:30
+msgid "Could not create privacy group."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:512
-msgid "Register text"
+#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
+#: ../../include/items.php:3916
+msgid "Privacy group not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:512
-msgid "Will be displayed prominently on the registration page."
+#: ../../Zotlabs/Module/Group.php:58
+msgid "Privacy group updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:513
-msgid "Site homepage to show visitors (default: login box)"
+#: ../../Zotlabs/Module/Group.php:90
+msgid "Create a group of channels."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:513
-msgid ""
-"example: 'public' to show public stream, 'page/sys/home' to show a system "
-"webpage called 'home' or 'include:home.html' to include a file."
+#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184
+msgid "Privacy group name: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:514
-msgid "Preserve site homepage URL"
+#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187
+msgid "Members are visible to other channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:514
-msgid ""
-"Present the site homepage in a frame at the original location instead of "
-"redirecting"
+#: ../../Zotlabs/Module/Group.php:111
+msgid "Privacy group removed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:515
-msgid "Accounts abandoned after x days"
+#: ../../Zotlabs/Module/Group.php:113
+msgid "Unable to remove privacy group."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:515
-msgid ""
-"Will not waste system resources polling external sites for abandonded "
-"accounts. Enter 0 for no time limit."
+#: ../../Zotlabs/Module/Group.php:183
+msgid "Privacy group editor"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:516
-msgid "Allowed friend domains"
+#: ../../Zotlabs/Module/Group.php:197
+msgid "Members"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:516
-msgid ""
-"Comma separated list of domains which are allowed to establish friendships "
-"with this site. Wildcards are accepted. Empty to allow any domains"
+#: ../../Zotlabs/Module/Group.php:199
+msgid "All Connected Channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:517
-msgid "Allowed email domains"
+#: ../../Zotlabs/Module/Group.php:231
+msgid "Click on a channel to add or remove."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:517
-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"
+#: ../../Zotlabs/Module/Appman.php:37 ../../Zotlabs/Module/Appman.php:53
+msgid "App installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:518
-msgid "Not allowed email domains"
+#: ../../Zotlabs/Module/Appman.php:46
+msgid "Malformed app."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:518
-msgid ""
-"Comma separated list of domains which are not allowed in email addresses for "
-"registrations to this site. Wildcards are accepted. Empty to allow any "
-"domains, unless allowed domains have been defined."
+#: ../../Zotlabs/Module/Appman.php:104
+msgid "Embed code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:519
-msgid "Verify Email Addresses"
+#: ../../Zotlabs/Module/Appman.php:110 ../../include/widgets.php:107
+msgid "Edit App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:519
-msgid ""
-"Check to verify email addresses used in account registration (recommended)."
+#: ../../Zotlabs/Module/Appman.php:110
+msgid "Create App"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:520
-msgid "Force publish"
+#: ../../Zotlabs/Module/Appman.php:115
+msgid "Name of app"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:520
-msgid ""
-"Check to force all profiles on this site to be listed in the site directory."
+#: ../../Zotlabs/Module/Appman.php:116
+msgid "Location (URL) of app"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:521
-msgid "Import Public Streams"
+#: ../../Zotlabs/Module/Appman.php:118
+msgid "Photo icon URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:521
-msgid ""
-"Import and allow access to public content pulled from other sites. Warning: "
-"this content is unmoderated."
+#: ../../Zotlabs/Module/Appman.php:118
+msgid "80 x 80 pixels - optional"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:522
-msgid "Login on Homepage"
+#: ../../Zotlabs/Module/Appman.php:119
+msgid "Categories (optional, comma separated list)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:522
-msgid ""
-"Present a login box to visitors on the home page if no other content has "
-"been configured."
+#: ../../Zotlabs/Module/Appman.php:120
+msgid "Version ID"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:523
-msgid "Enable context help"
+#: ../../Zotlabs/Module/Appman.php:121
+msgid "Price of app"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:523
-msgid ""
-"Display contextual help for the current page when the help button is pressed."
+#: ../../Zotlabs/Module/Appman.php:122
+msgid "Location (URL) to purchase app"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:525
-msgid "Directory Server URL"
+#: ../../Zotlabs/Module/Help.php:26
+msgid "Documentation Search"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:525
-msgid "Default directory server"
+#: ../../Zotlabs/Module/Help.php:67 ../../Zotlabs/Module/Help.php:73
+#: ../../Zotlabs/Module/Help.php:79
+msgid "Help:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:527
-msgid "Proxy user"
+#: ../../Zotlabs/Module/Help.php:85 ../../Zotlabs/Module/Help.php:90
+#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Lib/Apps.php:224
+#: ../../include/nav.php:161
+msgid "Help"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:528
-msgid "Proxy URL"
+#: ../../Zotlabs/Module/Help.php:120
+msgid "$Projectname Documentation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:529
-msgid "Network timeout"
+#: ../../Zotlabs/Module/Attach.php:13
+msgid "Item not available."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:529
-msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
+#: ../../Zotlabs/Module/Pdledit.php:18
+msgid "Layout updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:530
-msgid "Delivery interval"
+#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Pdledit.php:61
+msgid "Edit System Page Description"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:530
-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."
+#: ../../Zotlabs/Module/Pdledit.php:56
+msgid "Layout not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:531
-msgid "Deliveries per process"
+#: ../../Zotlabs/Module/Pdledit.php:62
+msgid "Module Name:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:531
-msgid ""
-"Number of deliveries to attempt in a single operating system process. Adjust "
-"if necessary to tune system performance. Recommend: 1-5."
+#: ../../Zotlabs/Module/Pdledit.php:63
+msgid "Layout Help"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:532
-msgid "Poll interval"
+#: ../../Zotlabs/Module/Ffsapi.php:12
+msgid "Share content from Firefox to $Projectname"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:532
-msgid ""
-"Delay background polling processes by this many seconds to reduce system "
-"load. If 0, use delivery interval."
+#: ../../Zotlabs/Module/Ffsapi.php:15
+msgid "Activate the Firefox $Projectname provider"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:533
-msgid "Maximum Load Average"
+#: ../../Zotlabs/Module/Acl.php:227
+msgid "network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:533
-msgid ""
-"Maximum system load before delivery and poll processes are deferred - "
-"default 50."
+#: ../../Zotlabs/Module/Acl.php:237
+msgid "RSS"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:534
-msgid "Expiration period in days for imported (grid/network) content"
+#: ../../Zotlabs/Module/Filestorage.php:88
+msgid "Permission Denied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:534
-msgid "0 for no expiration of imported content"
+#: ../../Zotlabs/Module/Filestorage.php:104
+msgid "File not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678
-#: ../../Zotlabs/Module/Settings.php:722
-msgid "Off"
+#: ../../Zotlabs/Module/Filestorage.php:147
+msgid "Edit file permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678
-#: ../../Zotlabs/Module/Settings.php:722
-msgid "On"
+#: ../../Zotlabs/Module/Filestorage.php:156
+msgid "Set/edit permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:678
-#, php-format
-msgid "Lock feature %s"
+#: ../../Zotlabs/Module/Filestorage.php:157
+msgid "Include all files and sub folders"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:686
-msgid "Manage Additional Features"
+#: ../../Zotlabs/Module/Filestorage.php:158
+msgid "Return to file list"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:703
-msgid "No server found"
+#: ../../Zotlabs/Module/Filestorage.php:160
+msgid "Copy/paste this code to attach file to a post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:710 ../../Zotlabs/Module/Admin.php:1046
-msgid "ID"
+#: ../../Zotlabs/Module/Filestorage.php:161
+msgid "Copy/paste this URL to link file from a web page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:710
-msgid "for channel"
+#: ../../Zotlabs/Module/Filestorage.php:163
+msgid "Share this file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:710
-msgid "on server"
+#: ../../Zotlabs/Module/Filestorage.php:164
+msgid "Show URL to this file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:712
-msgid "Server"
+#: ../../Zotlabs/Module/Filestorage.php:165
+msgid "Notify your contacts about this file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:746
-msgid ""
-"By default, unfiltered HTML is allowed in embedded media. This is inherently "
-"insecure."
+#: ../../Zotlabs/Module/Layouts.php:183 ../../include/text.php:2244
+msgid "Layouts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:749
-msgid ""
-"The recommended setting is to only allow unfiltered HTML from the following "
-"sites:"
+#: ../../Zotlabs/Module/Layouts.php:185
+msgid "Comanche page description language help"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:750
-msgid ""
-"https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/"
-"<br />https://vimeo.com/<br />https://soundcloud.com/<br />"
+#: ../../Zotlabs/Module/Layouts.php:189
+msgid "Layout Description"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:751
-msgid ""
-"All other embedded content will be filtered, <strong>unless</strong> "
-"embedded content from that site is explicitly blocked."
+#: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Menu.php:114
+#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Webpages.php:206
+#: ../../include/page_widgets.php:47
+msgid "Created"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:756 ../../include/widgets.php:1458
-msgid "Security"
+#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Menu.php:115
+#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Webpages.php:207
+#: ../../include/page_widgets.php:48
+msgid "Edited"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:758
-msgid "Block public"
+#: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Photos.php:1072
+#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Webpages.php:196
+#: ../../include/conversation.php:1219
+msgid "Share"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:758
-msgid ""
-"Check to block public access to all otherwise public personal pages on this "
-"site unless you are currently authenticated."
+#: ../../Zotlabs/Module/Layouts.php:194
+msgid "Download PDL file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:759
-msgid "Set \"Transport Security\" HTTP header"
+#: ../../Zotlabs/Module/Layouts.php:197 ../../Zotlabs/Module/Pubsites.php:47
+#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Webpages.php:201
+#: ../../include/page_widgets.php:42
+msgid "View"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:760
-msgid "Set \"Content Security Policy\" HTTP header"
+#: ../../Zotlabs/Module/Like.php:19
+msgid "Like/Dislike"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:761
-msgid "Allow communications only from these sites"
+#: ../../Zotlabs/Module/Like.php:24
+msgid "This action is restricted to members."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:761
+#: ../../Zotlabs/Module/Like.php:25
 msgid ""
-"One site per line. Leave empty to allow communication from anywhere by "
-"default"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:762
-msgid "Block communications from these sites"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:763
-msgid "Allow communications only from these channels"
+"Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a href="
+"\"register\">register as a new $Projectname member</a> to continue."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:763
-msgid ""
-"One channel (hash) per line. Leave empty to allow from any channel by default"
+#: ../../Zotlabs/Module/Like.php:105 ../../Zotlabs/Module/Like.php:131
+#: ../../Zotlabs/Module/Like.php:169
+msgid "Invalid request."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:764
-msgid "Block communications from these channels"
+#: ../../Zotlabs/Module/Like.php:117 ../../include/conversation.php:126
+msgid "channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:765
-msgid "Only allow embeds from secure (SSL) websites and links."
+#: ../../Zotlabs/Module/Like.php:146
+msgid "thing"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:766
-msgid "Allow unfiltered embedded HTML content only from these domains"
+#: ../../Zotlabs/Module/Like.php:192
+msgid "Channel unavailable."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:766
-msgid "One site per line. By default embedded content is filtered."
+#: ../../Zotlabs/Module/Like.php:240
+msgid "Previous action reversed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:767
-msgid "Block embedded HTML from these domains"
+#: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87
+#: ../../Zotlabs/Module/Tagger.php:47 ../../include/conversation.php:120
+#: ../../include/text.php:1917
+msgid "photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:785
-msgid "Update has been marked successful"
+#: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87
+#: ../../include/conversation.php:148 ../../include/text.php:1923
+msgid "status"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:795
+#: ../../Zotlabs/Module/Like.php:420 ../../include/conversation.php:164
 #, php-format
-msgid "Executing %s failed. Check system logs."
+msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:798
+#: ../../Zotlabs/Module/Like.php:422 ../../include/conversation.php:167
 #, php-format
-msgid "Update %s was successfully applied."
+msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:802
+#: ../../Zotlabs/Module/Like.php:424
 #, php-format
-msgid "Update %s did not return a status. Unknown if it succeeded."
+msgid "%1$s agrees with %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:805
+#: ../../Zotlabs/Module/Like.php:426
 #, php-format
-msgid "Update function %s could not be found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:821
-msgid "No failed updates."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:825
-msgid "Failed Updates"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:827
-msgid "Mark success (if update was manually applied)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:828
-msgid "Attempt to execute this update step automatically"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:859
-msgid "Queue Statistics"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:860
-msgid "Total Entries"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:861
-msgid "Priority"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:862
-msgid "Destination URL"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:863
-msgid "Mark hub permanently offline"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:864
-msgid "Empty queue for this hub"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:865
-msgid "Last known contact"
+msgid "%1$s doesn't agree with %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:901
-#, php-format
-msgid "%s account blocked/unblocked"
-msgid_plural "%s account blocked/unblocked"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Admin.php:908
+#: ../../Zotlabs/Module/Like.php:428
 #, php-format
-msgid "%s account deleted"
-msgid_plural "%s accounts deleted"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Admin.php:944
-msgid "Account not found"
+msgid "%1$s abstains from a decision on %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:955
+#: ../../Zotlabs/Module/Like.php:430
 #, php-format
-msgid "Account '%s' deleted"
+msgid "%1$s is attending %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:963
+#: ../../Zotlabs/Module/Like.php:432
 #, php-format
-msgid "Account '%s' blocked"
+msgid "%1$s is not attending %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:971
+#: ../../Zotlabs/Module/Like.php:434
 #, php-format
-msgid "Account '%s' unblocked"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1031 ../../Zotlabs/Module/Admin.php:1044
-#: ../../include/widgets.php:1456
-msgid "Accounts"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1033 ../../Zotlabs/Module/Admin.php:1212
-msgid "select all"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1034
-msgid "Registrations waiting for confirm"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1035
-msgid "Request date"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1047
-#: ../../Zotlabs/Module/Id.php:17 ../../Zotlabs/Module/Id.php:18
-#: ../../include/network.php:2184 ../../boot.php:1706
-msgid "Email"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1036
-msgid "No registrations."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1038
-msgid "Deny"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1040 ../../Zotlabs/Module/Connedit.php:546
-msgid "Block"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1041 ../../Zotlabs/Module/Connedit.php:546
-msgid "Unblock"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1048 ../../include/group.php:267
-msgid "All Channels"
+msgid "%1$s may attend %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1049
-msgid "Register date"
+#: ../../Zotlabs/Module/Like.php:537
+msgid "Action completed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1050
-msgid "Last login"
+#: ../../Zotlabs/Module/Like.php:538
+msgid "Thank you."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1051
-msgid "Expires"
+#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:189
+#: ../../Zotlabs/Module/Profiles.php:246 ../../Zotlabs/Module/Profiles.php:625
+msgid "Profile not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1052
-msgid "Service Class"
+#: ../../Zotlabs/Module/Profiles.php:44
+msgid "Profile deleted."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1054
-msgid ""
-"Selected accounts will be deleted!\\n\\nEverything these accounts had posted "
-"on this site will be permanently deleted!\\n\\nAre you sure?"
+#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:104
+msgid "Profile-"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1055
-msgid ""
-"The account {0} will be deleted!\\n\\nEverything this account has posted on "
-"this site will be permanently deleted!\\n\\nAre you sure?"
+#: ../../Zotlabs/Module/Profiles.php:89 ../../Zotlabs/Module/Profiles.php:132
+msgid "New profile created."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1091
-#, php-format
-msgid "%s channel censored/uncensored"
-msgid_plural "%s channels censored/uncensored"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Admin.php:1100
-#, php-format
-msgid "%s channel code allowed/disallowed"
-msgid_plural "%s channels code allowed/disallowed"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Admin.php:1106
-#, php-format
-msgid "%s channel deleted"
-msgid_plural "%s channels deleted"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Admin.php:1126
-msgid "Channel not found"
+#: ../../Zotlabs/Module/Profiles.php:110
+msgid "Profile unavailable to clone."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1136
-#, php-format
-msgid "Channel '%s' deleted"
+#: ../../Zotlabs/Module/Profiles.php:151
+msgid "Profile unavailable to export."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1148
-#, php-format
-msgid "Channel '%s' censored"
+#: ../../Zotlabs/Module/Profiles.php:256
+msgid "Profile Name is required."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1148
-#, php-format
-msgid "Channel '%s' uncensored"
+#: ../../Zotlabs/Module/Profiles.php:427
+msgid "Marital Status"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1159
-#, php-format
-msgid "Channel '%s' code allowed"
+#: ../../Zotlabs/Module/Profiles.php:431
+msgid "Romantic Partner"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1159
-#, php-format
-msgid "Channel '%s' code disallowed"
+#: ../../Zotlabs/Module/Profiles.php:435 ../../Zotlabs/Module/Profiles.php:736
+msgid "Likes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1210 ../../include/widgets.php:1457
-msgid "Channels"
+#: ../../Zotlabs/Module/Profiles.php:439 ../../Zotlabs/Module/Profiles.php:737
+msgid "Dislikes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1214
-msgid "Censor"
+#: ../../Zotlabs/Module/Profiles.php:443 ../../Zotlabs/Module/Profiles.php:744
+msgid "Work/Employment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1215
-msgid "Uncensor"
+#: ../../Zotlabs/Module/Profiles.php:446
+msgid "Religion"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1216
-msgid "Allow Code"
+#: ../../Zotlabs/Module/Profiles.php:450
+msgid "Political Views"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1217
-msgid "Disallow Code"
+#: ../../Zotlabs/Module/Profiles.php:458
+msgid "Sexual Preference"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1218 ../../include/conversation.php:1626
-msgid "Channel"
+#: ../../Zotlabs/Module/Profiles.php:462
+msgid "Homepage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1222
-msgid "UID"
+#: ../../Zotlabs/Module/Profiles.php:466
+msgid "Interests"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1224 ../../Zotlabs/Module/Locs.php:118
-#: ../../Zotlabs/Module/Profiles.php:470
+#: ../../Zotlabs/Module/Profiles.php:470 ../../Zotlabs/Module/Locs.php:118
+#: ../../Zotlabs/Module/Admin.php:1224
 msgid "Address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1226
-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 ""
-
-#: ../../Zotlabs/Module/Admin.php:1227
-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 ""
-
-#: ../../Zotlabs/Module/Admin.php:1284
-#, php-format
-msgid "Plugin %s disabled."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1288
-#, php-format
-msgid "Plugin %s enabled."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1298 ../../Zotlabs/Module/Admin.php:1585
-msgid "Disable"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1301 ../../Zotlabs/Module/Admin.php:1587
-msgid "Enable"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1330 ../../Zotlabs/Module/Admin.php:1420
-#: ../../include/widgets.php:1460
-msgid "Plugins"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1331 ../../Zotlabs/Module/Admin.php:1614
-msgid "Toggle"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1332 ../../Zotlabs/Module/Admin.php:1615
-#: ../../Zotlabs/Lib/Apps.php:215 ../../include/nav.php:208
-#: ../../include/widgets.php:638
-msgid "Settings"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1339 ../../Zotlabs/Module/Admin.php:1624
-msgid "Author: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1340 ../../Zotlabs/Module/Admin.php:1625
-msgid "Maintainer: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1341
-msgid "Minimum project version: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1342
-msgid "Maximum project version: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1343
-msgid "Minimum PHP version: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1344
-msgid "Requires: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1345 ../../Zotlabs/Module/Admin.php:1425
-msgid "Disabled - version incompatibility"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1394
-msgid "Enter the public git repository URL of the plugin repo."
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1395
-msgid "Plugin repo git URL"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1396
-msgid "Custom repo name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1396
-msgid "(optional)"
+#: ../../Zotlabs/Module/Profiles.php:560
+msgid "Profile updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1397
-msgid "Download Plugin Repo"
+#: ../../Zotlabs/Module/Profiles.php:644
+msgid "Hide your connections list from viewers of this profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1404
-msgid "Install new repo"
+#: ../../Zotlabs/Module/Profiles.php:686
+msgid "Edit Profile Details"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1405 ../../Zotlabs/Lib/Apps.php:333
-msgid "Install"
+#: ../../Zotlabs/Module/Profiles.php:688
+msgid "View this profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1427
-msgid "Manage Repos"
+#: ../../Zotlabs/Module/Profiles.php:689 ../../Zotlabs/Module/Profiles.php:771
+#: ../../include/channel.php:983
+msgid "Edit visibility"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1428
-msgid "Installed Plugin Repositories"
+#: ../../Zotlabs/Module/Profiles.php:690
+msgid "Profile Tools"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1429
-msgid "Install a New Plugin Repository"
+#: ../../Zotlabs/Module/Profiles.php:691
+msgid "Change cover photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1435 ../../Zotlabs/Module/Settings.php:77
-#: ../../Zotlabs/Module/Settings.php:616 ../../Zotlabs/Lib/Apps.php:333
-msgid "Update"
+#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:954
+msgid "Change profile photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1436
-msgid "Switch branch"
+#: ../../Zotlabs/Module/Profiles.php:693
+msgid "Create a new profile using these settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1437 ../../Zotlabs/Module/Photos.php:998
-#: ../../Zotlabs/Module/Tagrm.php:137
-msgid "Remove"
+#: ../../Zotlabs/Module/Profiles.php:694
+msgid "Clone this profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1550
-msgid "No themes found."
+#: ../../Zotlabs/Module/Profiles.php:695
+msgid "Delete this profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1606
-msgid "Screenshot"
+#: ../../Zotlabs/Module/Profiles.php:696
+msgid "Add profile things"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1613 ../../Zotlabs/Module/Admin.php:1647
-#: ../../include/widgets.php:1461
-msgid "Themes"
+#: ../../Zotlabs/Module/Profiles.php:697 ../../include/conversation.php:1541
+#: ../../include/widgets.php:105
+msgid "Personal"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1652
-msgid "[Experimental]"
+#: ../../Zotlabs/Module/Profiles.php:699
+msgid "Relation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1653
-msgid "[Unsupported]"
+#: ../../Zotlabs/Module/Profiles.php:700 ../../include/datetime.php:48
+msgid "Miscellaneous"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1677
-msgid "Log settings updated."
+#: ../../Zotlabs/Module/Profiles.php:702
+msgid "Import profile from file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1732 ../../include/widgets.php:1482
-#: ../../include/widgets.php:1492
-msgid "Logs"
+#: ../../Zotlabs/Module/Profiles.php:703
+msgid "Export profile to file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1734
-msgid "Clear"
+#: ../../Zotlabs/Module/Profiles.php:704
+msgid "Your gender"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1740
-msgid "Debugging"
+#: ../../Zotlabs/Module/Profiles.php:705
+msgid "Marital status"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1741
-msgid "Log file"
+#: ../../Zotlabs/Module/Profiles.php:706
+msgid "Sexual preference"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1741
-msgid ""
-"Must be writable by web server. Relative to your top-level webserver "
-"directory."
+#: ../../Zotlabs/Module/Profiles.php:709
+msgid "Profile name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1742
-msgid "Log level"
+#: ../../Zotlabs/Module/Profiles.php:711
+msgid "This is your default profile."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2028
-msgid "New Profile Field"
+#: ../../Zotlabs/Module/Profiles.php:713
+msgid "Your full name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2029 ../../Zotlabs/Module/Admin.php:2049
-msgid "Field nickname"
+#: ../../Zotlabs/Module/Profiles.php:714
+msgid "Title/Description"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2029 ../../Zotlabs/Module/Admin.php:2049
-msgid "System name of field"
+#: ../../Zotlabs/Module/Profiles.php:717
+msgid "Street address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2030 ../../Zotlabs/Module/Admin.php:2050
-msgid "Input type"
+#: ../../Zotlabs/Module/Profiles.php:718
+msgid "Locality/City"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2031 ../../Zotlabs/Module/Admin.php:2051
-msgid "Field Name"
+#: ../../Zotlabs/Module/Profiles.php:719
+msgid "Region/State"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2031 ../../Zotlabs/Module/Admin.php:2051
-msgid "Label on profile pages"
+#: ../../Zotlabs/Module/Profiles.php:720
+msgid "Postal/Zip code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2032 ../../Zotlabs/Module/Admin.php:2052
-msgid "Help text"
+#: ../../Zotlabs/Module/Profiles.php:721
+msgid "Country"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2032 ../../Zotlabs/Module/Admin.php:2052
-msgid "Additional info (optional)"
+#: ../../Zotlabs/Module/Profiles.php:726
+msgid "Who (if applicable)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2042
-msgid "Field definition not found"
+#: ../../Zotlabs/Module/Profiles.php:726
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2048
-msgid "Edit Profile Field"
+#: ../../Zotlabs/Module/Profiles.php:727
+msgid "Since (date)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2106 ../../include/widgets.php:1463
-msgid "Profile Fields"
+#: ../../Zotlabs/Module/Profiles.php:730
+msgid "Tell us about yourself"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2107
-msgid "Basic Profile Fields"
+#: ../../Zotlabs/Module/Profiles.php:732
+msgid "Hometown"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2108
-msgid "Advanced Profile Fields"
+#: ../../Zotlabs/Module/Profiles.php:733
+msgid "Political views"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2108
-msgid "(In addition to basic fields)"
+#: ../../Zotlabs/Module/Profiles.php:734
+msgid "Religious views"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2110
-msgid "All available fields"
+#: ../../Zotlabs/Module/Profiles.php:735
+msgid "Keywords used in directory listings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2111
-msgid "Custom Fields"
+#: ../../Zotlabs/Module/Profiles.php:735
+msgid "Example: fishing photography software"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2115
-msgid "Create Custom Field"
+#: ../../Zotlabs/Module/Profiles.php:738
+msgid "Musical interests"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49
-msgid "This site is not a directory server"
+#: ../../Zotlabs/Module/Profiles.php:739
+msgid "Books, literature"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dirsearch.php:33
-msgid "This directory server requires an access token"
+#: ../../Zotlabs/Module/Profiles.php:740
+msgid "Television"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2242
-msgid "Blocks"
+#: ../../Zotlabs/Module/Profiles.php:741
+msgid "Film/Dance/Culture/Entertainment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:156
-msgid "Block Title"
+#: ../../Zotlabs/Module/Profiles.php:742
+msgid "Hobbies/Interests"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Layouts.php:190
-#: ../../Zotlabs/Module/Webpages.php:206 ../../Zotlabs/Module/Menu.php:114
-#: ../../include/page_widgets.php:47
-msgid "Created"
+#: ../../Zotlabs/Module/Profiles.php:743
+msgid "Love/Romance"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:191
-#: ../../Zotlabs/Module/Webpages.php:207 ../../Zotlabs/Module/Menu.php:115
-#: ../../include/page_widgets.php:48
-msgid "Edited"
+#: ../../Zotlabs/Module/Profiles.php:745
+msgid "School/Education"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Layouts.php:193
-#: ../../Zotlabs/Module/Webpages.php:196 ../../Zotlabs/Module/Photos.php:1072
-#: ../../include/conversation.php:1219
-msgid "Share"
+#: ../../Zotlabs/Module/Profiles.php:746
+msgid "Contact information and social networks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Layouts.php:197
-#: ../../Zotlabs/Module/Webpages.php:201 ../../Zotlabs/Module/Pubsites.php:47
-#: ../../include/page_widgets.php:42
-msgid "View"
+#: ../../Zotlabs/Module/Profiles.php:747
+msgid "My other channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:27
-msgid "Invalid message"
+#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:979
+msgid "Profile Image"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:59
-msgid "no results"
+#: ../../Zotlabs/Module/Profiles.php:777 ../../include/channel.php:961
+#: ../../include/nav.php:88
+msgid "Edit Profiles"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:64
+#: ../../Zotlabs/Module/Import.php:32
 #, php-format
-msgid "Delivery report for %1$s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:78
-msgid "channel sync processed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:82
-msgid "queued"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:86
-msgid "posted"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:90
-msgid "accepted for delivery"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:94
-msgid "updated"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:97
-msgid "update ignored"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:100
-msgid "permission denied"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:104
-msgid "recipient not found"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:107
-msgid "mail recalled"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:110
-msgid "duplicate mail received"
-msgstr ""
-
-#: ../../Zotlabs/Module/Dreport.php:113
-msgid "mail delivered"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editlayout.php:127
-#: ../../Zotlabs/Module/Layouts.php:128 ../../Zotlabs/Module/Layouts.php:188
-msgid "Layout Name"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editlayout.php:128
-#: ../../Zotlabs/Module/Layouts.php:131
-msgid "Layout Description (Optional)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editlayout.php:136
-msgid "Edit Layout"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editwebpage.php:143
-msgid "Page link"
-msgstr ""
-
-#: ../../Zotlabs/Module/Editwebpage.php:169
-msgid "Edit Webpage"
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:24
-msgid "Privacy group created."
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:30
-msgid "Could not create privacy group."
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
-#: ../../include/items.php:3916
-msgid "Privacy group not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:58
-msgid "Privacy group updated."
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:90
-msgid "Create a group of channels."
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184
-msgid "Privacy group name: "
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187
-msgid "Members are visible to other channels"
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:111
-msgid "Privacy group removed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:113
-msgid "Unable to remove privacy group."
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:183
-msgid "Privacy group editor"
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:197
-msgid "Members"
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:199
-msgid "All Connected Channels"
-msgstr ""
-
-#: ../../Zotlabs/Module/Group.php:231
-msgid "Click on a channel to add or remove."
+msgid "Your service plan only allows %d channels."
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:37 ../../Zotlabs/Module/Appman.php:53
-msgid "App installed."
+#: ../../Zotlabs/Module/Import.php:70 ../../Zotlabs/Module/Import_items.php:42
+msgid "Nothing to import."
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:46
-msgid "Malformed app."
+#: ../../Zotlabs/Module/Import.php:94 ../../Zotlabs/Module/Import_items.php:66
+msgid "Unable to download data from old server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:104
-msgid "Embed code"
+#: ../../Zotlabs/Module/Import.php:100
+#: ../../Zotlabs/Module/Import_items.php:72
+msgid "Imported file is empty."
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:110 ../../include/widgets.php:107
-msgid "Edit App"
+#: ../../Zotlabs/Module/Import.php:122
+#: ../../Zotlabs/Module/Import_items.php:88
+#, php-format
+msgid "Warning: Database versions differ by %1$d updates."
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:110
-msgid "Create App"
+#: ../../Zotlabs/Module/Import.php:152 ../../include/import.php:86
+msgid "Cloned channel not found. Import failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:115
-msgid "Name of app"
+#: ../../Zotlabs/Module/Import.php:162
+msgid "No channel. Import failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:116
-msgid "Location (URL) of app"
+#: ../../Zotlabs/Module/Import.php:511
+#: ../../include/Import/import_diaspora.php:142
+msgid "Import completed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:118
-msgid "Photo icon URL"
+#: ../../Zotlabs/Module/Import.php:533
+msgid "You must be logged in to use this feature."
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:118
-msgid "80 x 80 pixels - optional"
+#: ../../Zotlabs/Module/Import.php:538
+msgid "Import Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:119
-msgid "Categories (optional, comma separated list)"
+#: ../../Zotlabs/Module/Import.php:539
+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."
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:120
-msgid "Version ID"
+#: ../../Zotlabs/Module/Import.php:540
+#: ../../Zotlabs/Module/Import_items.php:121
+msgid "File to Upload"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:121
-msgid "Price of app"
+#: ../../Zotlabs/Module/Import.php:541
+msgid "Or provide the old server/hub details"
 msgstr ""
 
-#: ../../Zotlabs/Module/Appman.php:122
-msgid "Location (URL) to purchase app"
+#: ../../Zotlabs/Module/Import.php:542
+msgid "Your old identity address (xyz@example.com)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:26
-msgid "Documentation Search"
+#: ../../Zotlabs/Module/Import.php:543
+msgid "Your old login email address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:67 ../../Zotlabs/Module/Help.php:73
-#: ../../Zotlabs/Module/Help.php:79
-msgid "Help:"
+#: ../../Zotlabs/Module/Import.php:544
+msgid "Your old login password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Help.php:85 ../../Zotlabs/Module/Help.php:90
-#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Lib/Apps.php:224
-#: ../../include/nav.php:159
-msgid "Help"
+#: ../../Zotlabs/Module/Import.php:545
+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 ""
 
-#: ../../Zotlabs/Module/Help.php:120
-msgid "$Projectname Documentation"
+#: ../../Zotlabs/Module/Import.php:546
+msgid "Make this hub my primary location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Attach.php:13
-msgid "Item not available."
+#: ../../Zotlabs/Module/Import.php:547
+msgid ""
+"Import existing posts if possible (experimental - limited by available memory"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:183 ../../include/text.php:2244
-msgid "Layouts"
+#: ../../Zotlabs/Module/Import.php:548
+msgid ""
+"This process may take several minutes to complete. Please submit the form "
+"only once and leave this page open until finished."
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:185
-msgid "Comanche page description language help"
+#: ../../Zotlabs/Module/Home.php:61 ../../Zotlabs/Module/Home.php:69
+#: ../../Zotlabs/Module/Siteinfo.php:48
+msgid "$Projectname"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:189
-msgid "Layout Description"
+#: ../../Zotlabs/Module/Home.php:79
+#, php-format
+msgid "Welcome to %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:194
-msgid "Download PDL file"
+#: ../../Zotlabs/Module/Item.php:179
+msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../Zotlabs/Module/Ffsapi.php:12
-msgid "Share content from Firefox to $Projectname"
+#: ../../Zotlabs/Module/Item.php:428
+msgid "Empty post discarded."
 msgstr ""
 
-#: ../../Zotlabs/Module/Ffsapi.php:15
-msgid "Activate the Firefox $Projectname provider"
+#: ../../Zotlabs/Module/Item.php:468
+msgid "Executable content type not permitted to this channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:192 ../../Zotlabs/Lib/Apps.php:217
-#: ../../include/nav.php:106 ../../include/conversation.php:1700
-msgid "Webpages"
+#: ../../Zotlabs/Module/Item.php:848
+msgid "Duplicate post suppressed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:203 ../../include/page_widgets.php:44
-msgid "Actions"
+#: ../../Zotlabs/Module/Item.php:983
+msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:204 ../../include/page_widgets.php:45
-msgid "Page Link"
+#: ../../Zotlabs/Module/Item.php:1241
+msgid "Unable to obtain post information from database."
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:205
-msgid "Page Title"
+#: ../../Zotlabs/Module/Item.php:1248
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:88
-msgid "Permission Denied."
+#: ../../Zotlabs/Module/Item.php:1255
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:104
-msgid "File not found."
+#: ../../Zotlabs/Module/Photos.php:84
+msgid "Page owner information could not be retrieved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:147
-msgid "Edit file permissions"
+#: ../../Zotlabs/Module/Photos.php:99 ../../Zotlabs/Module/Photos.php:743
+#: ../../Zotlabs/Module/Profile_photo.php:115
+#: ../../Zotlabs/Module/Profile_photo.php:210
+#: ../../Zotlabs/Module/Profile_photo.php:309
+#: ../../include/photo/photo_driver.php:718
+msgid "Profile Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:156
-msgid "Set/edit permissions"
+#: ../../Zotlabs/Module/Photos.php:105 ../../Zotlabs/Module/Photos.php:149
+msgid "Album not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:157
-msgid "Include all files and sub folders"
+#: ../../Zotlabs/Module/Photos.php:132
+msgid "Delete Album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:158
-msgid "Return to file list"
+#: ../../Zotlabs/Module/Photos.php:153
+msgid ""
+"Multiple storage folders exist with this album name, but within different "
+"directories. Please remove the desired folder or folders using the Files "
+"manager"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:160
-msgid "Copy/paste this code to attach file to a post"
+#: ../../Zotlabs/Module/Photos.php:210 ../../Zotlabs/Module/Photos.php:1053
+msgid "Delete Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:161
-msgid "Copy/paste this URL to link file from a web page"
+#: ../../Zotlabs/Module/Photos.php:533
+msgid "No photos selected"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:163
-msgid "Share this file"
+#: ../../Zotlabs/Module/Photos.php:582
+msgid "Access to this item is restricted."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:164
-msgid "Show URL to this file"
+#: ../../Zotlabs/Module/Photos.php:621
+#, php-format
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr ""
 
-#: ../../Zotlabs/Module/Filestorage.php:165
-msgid "Notify your contacts about this file"
+#: ../../Zotlabs/Module/Photos.php:624
+#, php-format
+msgid "%1$.2f MB photo storage used."
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:192
-msgid "webpage"
+#: ../../Zotlabs/Module/Photos.php:660
+msgid "Upload Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:198
-msgid "block"
+#: ../../Zotlabs/Module/Photos.php:664
+msgid "Enter an album name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:195
-msgid "layout"
+#: ../../Zotlabs/Module/Photos.php:665
+msgid "or select an existing album (doubleclick)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:201
-msgid "menu"
+#: ../../Zotlabs/Module/Photos.php:666
+msgid "Create a status post for this upload"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:187
-#, php-format
-msgid "%s element installed"
+#: ../../Zotlabs/Module/Photos.php:667
+msgid "Caption (optional):"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:190
-#, php-format
-msgid "%s element installation failed"
+#: ../../Zotlabs/Module/Photos.php:668
+msgid "Description (optional):"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:19
-msgid "Like/Dislike"
+#: ../../Zotlabs/Module/Photos.php:695
+msgid "Album name could not be decoded"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:24
-msgid "This action is restricted to members."
+#: ../../Zotlabs/Module/Photos.php:743
+msgid "Contact Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:25
-msgid ""
-"Please <a href=\"rmagic\">login with your $Projectname ID</a> or <a href="
-"\"register\">register as a new $Projectname member</a> to continue."
+#: ../../Zotlabs/Module/Photos.php:766
+msgid "Show Newest First"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:105 ../../Zotlabs/Module/Like.php:131
-#: ../../Zotlabs/Module/Like.php:169
-msgid "Invalid request."
+#: ../../Zotlabs/Module/Photos.php:768
+msgid "Show Oldest First"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:117 ../../include/conversation.php:126
-msgid "channel"
+#: ../../Zotlabs/Module/Photos.php:792 ../../Zotlabs/Module/Photos.php:1331
+#: ../../Zotlabs/Module/Embedphotos.php:141 ../../include/widgets.php:1572
+msgid "View Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:146
-msgid "thing"
+#: ../../Zotlabs/Module/Photos.php:823
+#: ../../Zotlabs/Module/Embedphotos.php:157 ../../include/widgets.php:1589
+msgid "Edit Album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:192
-msgid "Channel unavailable."
+#: ../../Zotlabs/Module/Photos.php:870
+msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:240
-msgid "Previous action reversed."
+#: ../../Zotlabs/Module/Photos.php:872
+msgid "Photo not available"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87
-#: ../../Zotlabs/Module/Tagger.php:47 ../../include/text.php:1917
-#: ../../include/conversation.php:120
-msgid "photo"
+#: ../../Zotlabs/Module/Photos.php:930
+msgid "Use as profile photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:371 ../../Zotlabs/Module/Subthread.php:87
-#: ../../include/text.php:1923 ../../include/conversation.php:148
-msgid "status"
+#: ../../Zotlabs/Module/Photos.php:931
+msgid "Use as cover photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:420 ../../include/conversation.php:164
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
+#: ../../Zotlabs/Module/Photos.php:938
+msgid "Private Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:422 ../../include/conversation.php:167
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
+#: ../../Zotlabs/Module/Photos.php:953
+msgid "View Full Size"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:424
-#, php-format
-msgid "%1$s agrees with %2$s's %3$s"
+#: ../../Zotlabs/Module/Photos.php:998 ../../Zotlabs/Module/Admin.php:1437
+#: ../../Zotlabs/Module/Tagrm.php:137
+msgid "Remove"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:426
-#, php-format
-msgid "%1$s doesn't agree with %2$s's %3$s"
+#: ../../Zotlabs/Module/Photos.php:1032
+msgid "Edit photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:428
-#, php-format
-msgid "%1$s abstains from a decision on %2$s's %3$s"
+#: ../../Zotlabs/Module/Photos.php:1034
+msgid "Rotate CW (right)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:430
-#, php-format
-msgid "%1$s is attending %2$s's %3$s"
+#: ../../Zotlabs/Module/Photos.php:1035
+msgid "Rotate CCW (left)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:432
-#, php-format
-msgid "%1$s is not attending %2$s's %3$s"
+#: ../../Zotlabs/Module/Photos.php:1038
+msgid "Enter a new album name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:434
-#, php-format
-msgid "%1$s may attend %2$s's %3$s"
+#: ../../Zotlabs/Module/Photos.php:1039
+msgid "or select an existing one (doubleclick)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:537
-msgid "Action completed."
+#: ../../Zotlabs/Module/Photos.php:1042
+msgid "Caption"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:538
-msgid "Thank you."
+#: ../../Zotlabs/Module/Photos.php:1044
+msgid "Add a Tag"
 msgstr ""
 
-#: ../../Zotlabs/Module/Home.php:61 ../../Zotlabs/Module/Home.php:69
-#: ../../Zotlabs/Module/Siteinfo.php:48
-msgid "$Projectname"
+#: ../../Zotlabs/Module/Photos.php:1048
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
 msgstr ""
 
-#: ../../Zotlabs/Module/Home.php:79
-#, php-format
-msgid "Welcome to %s"
+#: ../../Zotlabs/Module/Photos.php:1051
+msgid "Flag as adult in album view"
 msgstr ""
 
-#: ../../Zotlabs/Module/Id.php:13
-msgid "First Name"
+#: ../../Zotlabs/Module/Photos.php:1070 ../../Zotlabs/Lib/ThreadItem.php:261
+msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Id.php:14
-msgid "Last Name"
+#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Lib/ThreadItem.php:262
+msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Id.php:15
-msgid "Nickname"
+#: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Lib/ThreadItem.php:397
+#: ../../include/conversation.php:743
+msgid "Please wait"
 msgstr ""
 
-#: ../../Zotlabs/Module/Id.php:16
-msgid "Full Name"
+#: ../../Zotlabs/Module/Photos.php:1089 ../../Zotlabs/Module/Photos.php:1207
+#: ../../Zotlabs/Lib/ThreadItem.php:707
+msgid "This is you"
 msgstr ""
 
-#: ../../Zotlabs/Module/Id.php:19 ../../Zotlabs/Module/Id.php:20
-#: ../../Zotlabs/Module/Id.php:21 ../../Zotlabs/Lib/Apps.php:237
-msgid "Profile Photo"
+#: ../../Zotlabs/Module/Photos.php:1091 ../../Zotlabs/Module/Photos.php:1209
+#: ../../Zotlabs/Lib/ThreadItem.php:709 ../../include/js_strings.php:6
+msgid "Comment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Id.php:22
-msgid "Profile Photo 16px"
+#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:577
+msgctxt "title"
+msgid "Likes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Id.php:23
-msgid "Profile Photo 32px"
+#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:577
+msgctxt "title"
+msgid "Dislikes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Id.php:24
-msgid "Profile Photo 48px"
+#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Agree"
 msgstr ""
 
-#: ../../Zotlabs/Module/Id.php:25
-msgid "Profile Photo 64px"
+#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Disagree"
 msgstr ""
 
-#: ../../Zotlabs/Module/Id.php:26
-msgid "Profile Photo 80px"
+#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Abstain"
 msgstr ""
 
-#: ../../Zotlabs/Module/Id.php:27
-msgid "Profile Photo 128px"
+#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Attending"
 msgstr ""
 
-#: ../../Zotlabs/Module/Id.php:28
-msgid "Timezone"
+#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Not attending"
 msgstr ""
 
-#: ../../Zotlabs/Module/Id.php:29 ../../Zotlabs/Module/Profiles.php:731
-msgid "Homepage URL"
+#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Might attend"
 msgstr ""
 
-#: ../../Zotlabs/Module/Id.php:30 ../../Zotlabs/Lib/Apps.php:235
-msgid "Language"
+#: ../../Zotlabs/Module/Photos.php:1126 ../../Zotlabs/Module/Photos.php:1138
+#: ../../Zotlabs/Lib/ThreadItem.php:181 ../../Zotlabs/Lib/ThreadItem.php:193
+#: ../../include/conversation.php:1738
+msgid "View all"
 msgstr ""
 
-#: ../../Zotlabs/Module/Id.php:31
-msgid "Birth Year"
-msgstr ""
+#: ../../Zotlabs/Module/Photos.php:1130 ../../Zotlabs/Lib/ThreadItem.php:185
+#: ../../include/conversation.php:1762 ../../include/taxonomy.php:403
+#: ../../include/channel.php:1183
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../Zotlabs/Module/Id.php:32
-msgid "Birth Month"
-msgstr ""
+#: ../../Zotlabs/Module/Photos.php:1135 ../../Zotlabs/Lib/ThreadItem.php:190
+#: ../../include/conversation.php:1765
+msgctxt "noun"
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../Zotlabs/Module/Id.php:33
-msgid "Birth Day"
+#: ../../Zotlabs/Module/Photos.php:1235
+msgid "Photo Tools"
 msgstr ""
 
-#: ../../Zotlabs/Module/Id.php:34
-msgid "Birthdate"
+#: ../../Zotlabs/Module/Photos.php:1244
+msgid "In This Photo:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Id.php:35 ../../Zotlabs/Module/Profiles.php:454
-msgid "Gender"
+#: ../../Zotlabs/Module/Photos.php:1249
+msgid "Map"
 msgstr ""
 
-#: ../../Zotlabs/Module/Id.php:108 ../../include/selectors.php:49
-#: ../../include/selectors.php:66
-msgid "Male"
+#: ../../Zotlabs/Module/Photos.php:1257 ../../Zotlabs/Lib/ThreadItem.php:386
+msgctxt "noun"
+msgid "Likes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Id.php:110 ../../include/selectors.php:49
-#: ../../include/selectors.php:66
-msgid "Female"
+#: ../../Zotlabs/Module/Photos.php:1258 ../../Zotlabs/Lib/ThreadItem.php:387
+msgctxt "noun"
+msgid "Dislikes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31
-msgid "Invalid item."
+#: ../../Zotlabs/Module/Photos.php:1263 ../../Zotlabs/Lib/ThreadItem.php:392
+#: ../../include/acl_selectors.php:285
+msgid "Close"
 msgstr ""
 
-#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Block.php:43
-#: ../../Zotlabs/Module/Cal.php:62 ../../Zotlabs/Module/Wall_upload.php:33
-msgid "Channel not found."
+#: ../../Zotlabs/Module/Photos.php:1337
+msgid "View Album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Page.php:131
-msgid ""
-"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod "
-"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, "
-"quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo "
-"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse "
-"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat "
-"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+#: ../../Zotlabs/Module/Photos.php:1348 ../../Zotlabs/Module/Photos.php:1361
+#: ../../Zotlabs/Module/Photos.php:1362
+msgid "Recent Photos"
 msgstr ""
 
 #: ../../Zotlabs/Module/Lockview.php:61
@@ -2869,15 +2677,15 @@ msgstr ""
 msgid "Visible to:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import_items.php:102
+#: ../../Zotlabs/Module/Import_items.php:104
 msgid "Import completed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import_items.php:117
+#: ../../Zotlabs/Module/Import_items.php:119
 msgid "Import Items"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import_items.php:118
+#: ../../Zotlabs/Module/Import_items.php:120
 msgid "Use this form to import existing posts and content from an export file."
 msgstr ""
 
@@ -3114,7 +2922,7 @@ msgid "Create a new channel"
 msgstr ""
 
 #: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:213
-#: ../../include/nav.php:206
+#: ../../include/nav.php:208
 msgid "Channel Manager"
 msgstr ""
 
@@ -3386,6 +3194,18 @@ msgstr ""
 msgid "No matches"
 msgstr ""
 
+#: ../../Zotlabs/Module/Channel.php:41
+msgid "Posts and comments"
+msgstr ""
+
+#: ../../Zotlabs/Module/Channel.php:42
+msgid "Only posts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Channel.php:102
+msgid "Insufficient permissions.  Request redirected to profile page."
+msgstr ""
+
 #: ../../Zotlabs/Module/Mitem.php:52
 msgid "Unable to create element."
 msgstr ""
@@ -3503,1174 +3323,1397 @@ msgstr ""
 msgid "Link text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:75 ../../Zotlabs/Lib/Apps.php:218
-msgid "Wiki"
+#: ../../Zotlabs/Module/Admin.php:77
+msgid "Theme settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:76
-msgid "Sandbox"
+#: ../../Zotlabs/Module/Admin.php:197
+msgid "# Accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:143
-msgid "Revision Comparison"
+#: ../../Zotlabs/Module/Admin.php:198
+msgid "# blocked accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:144
-msgid "Revert"
+#: ../../Zotlabs/Module/Admin.php:199
+msgid "# expired accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:166
-msgid "Enter the name of your new wiki:"
+#: ../../Zotlabs/Module/Admin.php:200
+msgid "# expiring accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:167
-msgid "Enter the name of the new page:"
+#: ../../Zotlabs/Module/Admin.php:211
+msgid "# Channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:168
-msgid "Enter the new name:"
+#: ../../Zotlabs/Module/Admin.php:212
+msgid "# primary"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:128
-#: ../../Zotlabs/Module/Register.php:231
-msgid "Name or caption"
+#: ../../Zotlabs/Module/Admin.php:213
+msgid "# clones"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:128
-#: ../../Zotlabs/Module/Register.php:231
+#: ../../Zotlabs/Module/Admin.php:219
+msgid "Message queues"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:236
+msgid "Your software should be updated"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:241 ../../Zotlabs/Module/Admin.php:490
+#: ../../Zotlabs/Module/Admin.php:711 ../../Zotlabs/Module/Admin.php:755
+#: ../../Zotlabs/Module/Admin.php:1030 ../../Zotlabs/Module/Admin.php:1209
+#: ../../Zotlabs/Module/Admin.php:1329 ../../Zotlabs/Module/Admin.php:1419
+#: ../../Zotlabs/Module/Admin.php:1612 ../../Zotlabs/Module/Admin.php:1646
+#: ../../Zotlabs/Module/Admin.php:1731
+msgid "Administration"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:242
+msgid "Summary"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:245
+msgid "Registered accounts"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:246 ../../Zotlabs/Module/Admin.php:715
+msgid "Pending registrations"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:247
+msgid "Registered channels"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:248 ../../Zotlabs/Module/Admin.php:716
+msgid "Active plugins"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:249
+msgid "Version"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:250
+msgid "Repository version (master)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:251
+msgid "Repository version (dev)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:373
+msgid "Site settings updated."
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2821
+msgid "Default"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:410 ../../Zotlabs/Module/Settings.php:798
+msgid "mobile"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:412
+msgid "experimental"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:414
+msgid "unsupported"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:460
+msgid "Yes - with approval"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:466
+msgid "My site is not a public server"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:467
+msgid "My site has paid access only"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:468
+msgid "My site has free access only"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:469
+msgid "My site offers free accounts with optional paid upgrades"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1455
+msgid "Site"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:493 ../../Zotlabs/Module/Register.php:245
+msgid "Registration"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:494
+msgid "File upload"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:495
+msgid "Policies"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:496 ../../include/contact_widgets.php:16
+msgid "Advanced"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:500
+msgid "Site name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:501
+msgid "Banner/Logo"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:502
+msgid "Administrator Information"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:502
 msgid ""
-"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation "
-"Group\""
+"Contact information for site administrators.  Displayed on siteinfo page.  "
+"BBCode can be used here"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:130
-#: ../../Zotlabs/Module/Register.php:233
-msgid "Choose a short nickname"
+#: ../../Zotlabs/Module/Admin.php:503
+msgid "System language"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:130
-#: ../../Zotlabs/Module/Register.php:233
-#, php-format
+#: ../../Zotlabs/Module/Admin.php:504
+msgid "System theme"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:504
 msgid ""
-"Your nickname will be used to create an easy to remember channel address e."
-"g. nickname%s"
+"Default system theme - may be over-ridden by user profiles - <a href='#' "
+"id='cnftheme'>change theme settings</a>"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:235
-msgid "Channel role and privacy"
+#: ../../Zotlabs/Module/Admin.php:505
+msgid "Mobile system theme"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:235
-msgid "Select a channel role with your privacy requirements."
+#: ../../Zotlabs/Module/Admin.php:505
+msgid "Theme for mobile devices"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:235
-msgid "Read more about roles"
+#: ../../Zotlabs/Module/Admin.php:507
+msgid "Allow Feeds as Connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:135
-msgid "Create Channel"
+#: ../../Zotlabs/Module/Admin.php:507
+msgid "(Heavy system resource usage)"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:136
-msgid ""
-"A channel is your identity on this network. It can represent a person, a "
-"blog, or a forum to name a few. Channels can make connections with other "
-"channels to share information with highly detailed permissions."
+#: ../../Zotlabs/Module/Admin.php:508
+msgid "Maximum image size"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:137
+#: ../../Zotlabs/Module/Admin.php:508
 msgid ""
-"or <a href=\"import\">import an existing channel</a> from another location."
+"Maximum size in bytes of uploaded images. Default is 0, which means no "
+"limits."
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:265
-msgid "sent you a private message"
+#: ../../Zotlabs/Module/Admin.php:509
+msgid "Does this site allow new member registration?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:313
-msgid "added your channel"
+#: ../../Zotlabs/Module/Admin.php:510
+msgid "Invitation only"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:323
-msgid "g A l F d"
+#: ../../Zotlabs/Module/Admin.php:510
+msgid ""
+"Only allow new member registrations with an invitation code. Above register "
+"policy must be set to Yes."
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:346
-msgid "[today]"
+#: ../../Zotlabs/Module/Admin.php:511
+msgid "Which best describes the types of account offered by this hub?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:355
-msgid "posted an event"
+#: ../../Zotlabs/Module/Admin.php:512
+msgid "Register text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Notifications.php:30
-msgid "Invalid request identifier."
+#: ../../Zotlabs/Module/Admin.php:512
+msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Notifications.php:39
-msgid "Discard"
+#: ../../Zotlabs/Module/Admin.php:513
+msgid "Site homepage to show visitors (default: login box)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Notifications.php:103 ../../include/nav.php:191
-msgid "Mark all system notifications seen"
+#: ../../Zotlabs/Module/Admin.php:513
+msgid ""
+"example: 'public' to show public stream, 'page/sys/home' to show a system "
+"webpage called 'home' or 'include:home.html' to include a file."
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:227
-#: ../../include/conversation.php:963
-msgid "Poke"
+#: ../../Zotlabs/Module/Admin.php:514
+msgid "Preserve site homepage URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:169
-msgid "Poke somebody"
+#: ../../Zotlabs/Module/Admin.php:514
+msgid ""
+"Present the site homepage in a frame at the original location instead of "
+"redirecting"
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:172
-msgid "Poke/Prod"
+#: ../../Zotlabs/Module/Admin.php:515
+msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:173
-msgid "Poke, prod or do other things to somebody"
+#: ../../Zotlabs/Module/Admin.php:515
+msgid ""
+"Will not waste system resources polling external sites for abandonded "
+"accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:180
-msgid "Recipient"
+#: ../../Zotlabs/Module/Admin.php:516
+msgid "Allowed friend domains"
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:181
-msgid "Choose what you wish to do to recipient"
+#: ../../Zotlabs/Module/Admin.php:516
+msgid ""
+"Comma separated list of domains which are allowed to establish friendships "
+"with this site. Wildcards are accepted. Empty to allow any domains"
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185
-msgid "Make this post private"
+#: ../../Zotlabs/Module/Admin.php:517
+msgid "Allowed email domains"
 msgstr ""
 
-#: ../../Zotlabs/Module/Oexchange.php:27
-msgid "Unable to find your hub."
+#: ../../Zotlabs/Module/Admin.php:517
+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 ""
 
-#: ../../Zotlabs/Module/Oexchange.php:41
-msgid "Post successful."
+#: ../../Zotlabs/Module/Admin.php:518
+msgid "Not allowed email domains"
 msgstr ""
 
-#: ../../Zotlabs/Module/Openid.php:30
-msgid "OpenID protocol error. No ID returned."
+#: ../../Zotlabs/Module/Admin.php:518
+msgid ""
+"Comma separated list of domains which are not allowed in email addresses for "
+"registrations to this site. Wildcards are accepted. Empty to allow any "
+"domains, unless allowed domains have been defined."
 msgstr ""
 
-#: ../../Zotlabs/Module/Openid.php:193 ../../include/auth.php:226
-msgid "Login failed."
+#: ../../Zotlabs/Module/Admin.php:519
+msgid "Verify Email Addresses"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:84
-msgid "Page owner information could not be retrieved."
+#: ../../Zotlabs/Module/Admin.php:519
+msgid ""
+"Check to verify email addresses used in account registration (recommended)."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:99 ../../Zotlabs/Module/Photos.php:743
-#: ../../Zotlabs/Module/Profile_photo.php:116
-#: ../../Zotlabs/Module/Profile_photo.php:211
-#: ../../Zotlabs/Module/Profile_photo.php:310
-#: ../../include/photo/photo_driver.php:718
-msgid "Profile Photos"
+#: ../../Zotlabs/Module/Admin.php:520
+msgid "Force publish"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:105 ../../Zotlabs/Module/Photos.php:149
-msgid "Album not found."
+#: ../../Zotlabs/Module/Admin.php:520
+msgid ""
+"Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:132
-msgid "Delete Album"
+#: ../../Zotlabs/Module/Admin.php:521
+msgid "Import Public Streams"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:153
+#: ../../Zotlabs/Module/Admin.php:521
 msgid ""
-"Multiple storage folders exist with this album name, but within different "
-"directories. Please remove the desired folder or folders using the Files "
-"manager"
+"Import and allow access to public content pulled from other sites. Warning: "
+"this content is unmoderated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:210 ../../Zotlabs/Module/Photos.php:1053
-msgid "Delete Photo"
+#: ../../Zotlabs/Module/Admin.php:522
+msgid "Login on Homepage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:533
-msgid "No photos selected"
+#: ../../Zotlabs/Module/Admin.php:522
+msgid ""
+"Present a login box to visitors on the home page if no other content has "
+"been configured."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:582
-msgid "Access to this item is restricted."
+#: ../../Zotlabs/Module/Admin.php:523
+msgid "Enable context help"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:621
-#, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
+#: ../../Zotlabs/Module/Admin.php:523
+msgid ""
+"Display contextual help for the current page when the help button is pressed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:624
-#, php-format
-msgid "%1$.2f MB photo storage used."
+#: ../../Zotlabs/Module/Admin.php:525
+msgid "Directory Server URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:660
-msgid "Upload Photos"
+#: ../../Zotlabs/Module/Admin.php:525
+msgid "Default directory server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:664
-msgid "Enter an album name"
+#: ../../Zotlabs/Module/Admin.php:527
+msgid "Proxy user"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:665
-msgid "or select an existing album (doubleclick)"
+#: ../../Zotlabs/Module/Admin.php:528
+msgid "Proxy URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:666
-msgid "Create a status post for this upload"
+#: ../../Zotlabs/Module/Admin.php:529
+msgid "Network timeout"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:667
-msgid "Caption (optional):"
+#: ../../Zotlabs/Module/Admin.php:529
+msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:668
-msgid "Description (optional):"
+#: ../../Zotlabs/Module/Admin.php:530
+msgid "Delivery interval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:695
-msgid "Album name could not be decoded"
+#: ../../Zotlabs/Module/Admin.php:530
+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 ""
 
-#: ../../Zotlabs/Module/Photos.php:743
-msgid "Contact Photos"
+#: ../../Zotlabs/Module/Admin.php:531
+msgid "Deliveries per process"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:766
-msgid "Show Newest First"
+#: ../../Zotlabs/Module/Admin.php:531
+msgid ""
+"Number of deliveries to attempt in a single operating system process. Adjust "
+"if necessary to tune system performance. Recommend: 1-5."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:768
-msgid "Show Oldest First"
+#: ../../Zotlabs/Module/Admin.php:532
+msgid "Poll interval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:792 ../../Zotlabs/Module/Photos.php:1331
-#: ../../Zotlabs/Module/Embedphotos.php:141 ../../include/widgets.php:1572
-msgid "View Photo"
+#: ../../Zotlabs/Module/Admin.php:532
+msgid ""
+"Delay background polling processes by this many seconds to reduce system "
+"load. If 0, use delivery interval."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:823
-#: ../../Zotlabs/Module/Embedphotos.php:157 ../../include/widgets.php:1589
-msgid "Edit Album"
+#: ../../Zotlabs/Module/Admin.php:533
+msgid "Maximum Load Average"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:870
-msgid "Permission denied. Access to this item may be restricted."
+#: ../../Zotlabs/Module/Admin.php:533
+msgid ""
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:872
-msgid "Photo not available"
+#: ../../Zotlabs/Module/Admin.php:534
+msgid "Expiration period in days for imported (grid/network) content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:930
-msgid "Use as profile photo"
+#: ../../Zotlabs/Module/Admin.php:534
+msgid "0 for no expiration of imported content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:931
-msgid "Use as cover photo"
+#: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678
+#: ../../Zotlabs/Module/Settings.php:722
+msgid "Off"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:938
-msgid "Private Photo"
+#: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678
+#: ../../Zotlabs/Module/Settings.php:722
+msgid "On"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:953
-msgid "View Full Size"
+#: ../../Zotlabs/Module/Admin.php:678
+#, php-format
+msgid "Lock feature %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1032
-msgid "Edit photo"
+#: ../../Zotlabs/Module/Admin.php:686
+msgid "Manage Additional Features"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1034
-msgid "Rotate CW (right)"
+#: ../../Zotlabs/Module/Admin.php:703
+msgid "No server found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1035
-msgid "Rotate CCW (left)"
+#: ../../Zotlabs/Module/Admin.php:710 ../../Zotlabs/Module/Admin.php:1046
+msgid "ID"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1038
-msgid "Enter a new album name"
+#: ../../Zotlabs/Module/Admin.php:710
+msgid "for channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1039
-msgid "or select an existing one (doubleclick)"
+#: ../../Zotlabs/Module/Admin.php:710
+msgid "on server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1042
-msgid "Caption"
+#: ../../Zotlabs/Module/Admin.php:712
+msgid "Server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1044
-msgid "Add a Tag"
+#: ../../Zotlabs/Module/Admin.php:746
+msgid ""
+"By default, unfiltered HTML is allowed in embedded media. This is inherently "
+"insecure."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1048
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+#: ../../Zotlabs/Module/Admin.php:749
+msgid ""
+"The recommended setting is to only allow unfiltered HTML from the following "
+"sites:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1051
-msgid "Flag as adult in album view"
+#: ../../Zotlabs/Module/Admin.php:750
+msgid ""
+"https://youtube.com/<br />https://www.youtube.com/<br />https://youtu.be/"
+"<br />https://vimeo.com/<br />https://soundcloud.com/<br />"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1070 ../../Zotlabs/Lib/ThreadItem.php:261
-msgid "I like this (toggle)"
+#: ../../Zotlabs/Module/Admin.php:751
+msgid ""
+"All other embedded content will be filtered, <strong>unless</strong> "
+"embedded content from that site is explicitly blocked."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Lib/ThreadItem.php:262
-msgid "I don't like this (toggle)"
+#: ../../Zotlabs/Module/Admin.php:756 ../../include/widgets.php:1458
+msgid "Security"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Lib/ThreadItem.php:397
-#: ../../include/conversation.php:743
-msgid "Please wait"
+#: ../../Zotlabs/Module/Admin.php:758
+msgid "Block public"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1089 ../../Zotlabs/Module/Photos.php:1207
-#: ../../Zotlabs/Lib/ThreadItem.php:707
-msgid "This is you"
+#: ../../Zotlabs/Module/Admin.php:758
+msgid ""
+"Check to block public access to all otherwise public personal pages on this "
+"site unless you are currently authenticated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1091 ../../Zotlabs/Module/Photos.php:1209
-#: ../../Zotlabs/Lib/ThreadItem.php:709 ../../include/js_strings.php:6
-msgid "Comment"
+#: ../../Zotlabs/Module/Admin.php:759
+msgid "Set \"Transport Security\" HTTP header"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:577
-msgctxt "title"
-msgid "Likes"
+#: ../../Zotlabs/Module/Admin.php:760
+msgid "Set \"Content Security Policy\" HTTP header"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1107 ../../include/conversation.php:577
-msgctxt "title"
-msgid "Dislikes"
+#: ../../Zotlabs/Module/Admin.php:761
+msgid "Allow communications only from these sites"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:578
-msgctxt "title"
-msgid "Agree"
+#: ../../Zotlabs/Module/Admin.php:761
+msgid ""
+"One site per line. Leave empty to allow communication from anywhere by "
+"default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:578
-msgctxt "title"
-msgid "Disagree"
+#: ../../Zotlabs/Module/Admin.php:762
+msgid "Block communications from these sites"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:578
-msgctxt "title"
-msgid "Abstain"
+#: ../../Zotlabs/Module/Admin.php:763
+msgid "Allow communications only from these channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:579
-msgctxt "title"
-msgid "Attending"
+#: ../../Zotlabs/Module/Admin.php:763
+msgid ""
+"One channel (hash) per line. Leave empty to allow from any channel by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:579
-msgctxt "title"
-msgid "Not attending"
+#: ../../Zotlabs/Module/Admin.php:764
+msgid "Block communications from these channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:579
-msgctxt "title"
-msgid "Might attend"
+#: ../../Zotlabs/Module/Admin.php:765
+msgid "Only allow embeds from secure (SSL) websites and links."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1126 ../../Zotlabs/Module/Photos.php:1138
-#: ../../Zotlabs/Lib/ThreadItem.php:181 ../../Zotlabs/Lib/ThreadItem.php:193
-#: ../../include/conversation.php:1732
-msgid "View all"
+#: ../../Zotlabs/Module/Admin.php:766
+msgid "Allow unfiltered embedded HTML content only from these domains"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1130 ../../Zotlabs/Lib/ThreadItem.php:185
-#: ../../include/taxonomy.php:403 ../../include/conversation.php:1756
-#: ../../include/channel.php:1146
-msgctxt "noun"
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../Zotlabs/Module/Admin.php:766
+msgid "One site per line. By default embedded content is filtered."
+msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1135 ../../Zotlabs/Lib/ThreadItem.php:190
-#: ../../include/conversation.php:1759
-msgctxt "noun"
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../Zotlabs/Module/Admin.php:767
+msgid "Block embedded HTML from these domains"
+msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1235
-msgid "Photo Tools"
+#: ../../Zotlabs/Module/Admin.php:785
+msgid "Update has been marked successful"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1244
-msgid "In This Photo:"
+#: ../../Zotlabs/Module/Admin.php:795
+#, php-format
+msgid "Executing %s failed. Check system logs."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1249
-msgid "Map"
+#: ../../Zotlabs/Module/Admin.php:798
+#, php-format
+msgid "Update %s was successfully applied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1257 ../../Zotlabs/Lib/ThreadItem.php:386
-msgctxt "noun"
-msgid "Likes"
+#: ../../Zotlabs/Module/Admin.php:802
+#, php-format
+msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1258 ../../Zotlabs/Lib/ThreadItem.php:387
-msgctxt "noun"
-msgid "Dislikes"
+#: ../../Zotlabs/Module/Admin.php:805
+#, php-format
+msgid "Update function %s could not be found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1263 ../../Zotlabs/Lib/ThreadItem.php:392
-#: ../../include/acl_selectors.php:285
-msgid "Close"
+#: ../../Zotlabs/Module/Admin.php:821
+msgid "No failed updates."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1337
-msgid "View Album"
+#: ../../Zotlabs/Module/Admin.php:825
+msgid "Failed Updates"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1348 ../../Zotlabs/Module/Photos.php:1361
-#: ../../Zotlabs/Module/Photos.php:1362
-msgid "Recent Photos"
+#: ../../Zotlabs/Module/Admin.php:827
+msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
-msgid "This setting requires special processing and editing has been blocked."
+#: ../../Zotlabs/Module/Admin.php:828
+msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pconfig.php:48
-msgid "Configuration Editor"
+#: ../../Zotlabs/Module/Admin.php:859
+msgid "Queue Statistics"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pconfig.php:49
-msgid ""
-"Warning: Changing some settings could render your channel inoperable. Please "
-"leave this page unless you are comfortable with and knowledgeable about how "
-"to correctly use this feature."
+#: ../../Zotlabs/Module/Admin.php:860
+msgid "Total Entries"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:18
-msgid "Layout updated."
+#: ../../Zotlabs/Module/Admin.php:861
+msgid "Priority"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Pdledit.php:61
-msgid "Edit System Page Description"
+#: ../../Zotlabs/Module/Admin.php:862
+msgid "Destination URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:56
-msgid "Layout not found."
+#: ../../Zotlabs/Module/Admin.php:863
+msgid "Mark hub permanently offline"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:62
-msgid "Module Name:"
+#: ../../Zotlabs/Module/Admin.php:864
+msgid "Empty queue for this hub"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pdledit.php:63
-msgid "Layout Help"
+#: ../../Zotlabs/Module/Admin.php:865
+msgid "Last known contact"
 msgstr ""
 
-#: ../../Zotlabs/Module/Probe.php:30 ../../Zotlabs/Module/Probe.php:34
+#: ../../Zotlabs/Module/Admin.php:901
 #, php-format
-msgid "Fetching URL returns error: %1$s"
+msgid "%s account blocked/unblocked"
+msgid_plural "%s account blocked/unblocked"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Admin.php:908
+#, php-format
+msgid "%s account deleted"
+msgid_plural "%s accounts deleted"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Admin.php:944
+msgid "Account not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:189
-#: ../../Zotlabs/Module/Profiles.php:246 ../../Zotlabs/Module/Profiles.php:625
-msgid "Profile not found."
+#: ../../Zotlabs/Module/Admin.php:955
+#, php-format
+msgid "Account '%s' deleted"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:44
-msgid "Profile deleted."
+#: ../../Zotlabs/Module/Admin.php:963
+#, php-format
+msgid "Account '%s' blocked"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:104
-msgid "Profile-"
+#: ../../Zotlabs/Module/Admin.php:971
+#, php-format
+msgid "Account '%s' unblocked"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:89 ../../Zotlabs/Module/Profiles.php:132
-msgid "New profile created."
+#: ../../Zotlabs/Module/Admin.php:1031 ../../Zotlabs/Module/Admin.php:1044
+#: ../../include/widgets.php:1456
+msgid "Accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:110
-msgid "Profile unavailable to clone."
+#: ../../Zotlabs/Module/Admin.php:1033 ../../Zotlabs/Module/Admin.php:1212
+msgid "select all"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:151
-msgid "Profile unavailable to export."
+#: ../../Zotlabs/Module/Admin.php:1034
+msgid "Registrations waiting for confirm"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:256
-msgid "Profile Name is required."
+#: ../../Zotlabs/Module/Admin.php:1035
+msgid "Request date"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:427
-msgid "Marital Status"
+#: ../../Zotlabs/Module/Admin.php:1036
+msgid "No registrations."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:431
-msgid "Romantic Partner"
+#: ../../Zotlabs/Module/Admin.php:1038
+msgid "Deny"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:435 ../../Zotlabs/Module/Profiles.php:736
-msgid "Likes"
+#: ../../Zotlabs/Module/Admin.php:1048 ../../include/group.php:267
+msgid "All Channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:439 ../../Zotlabs/Module/Profiles.php:737
-msgid "Dislikes"
+#: ../../Zotlabs/Module/Admin.php:1049
+msgid "Register date"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:443 ../../Zotlabs/Module/Profiles.php:744
-msgid "Work/Employment"
+#: ../../Zotlabs/Module/Admin.php:1050
+msgid "Last login"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:446
-msgid "Religion"
+#: ../../Zotlabs/Module/Admin.php:1051
+msgid "Expires"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:450
-msgid "Political Views"
+#: ../../Zotlabs/Module/Admin.php:1052
+msgid "Service Class"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:458
-msgid "Sexual Preference"
+#: ../../Zotlabs/Module/Admin.php:1054
+msgid ""
+"Selected accounts will be deleted!\\n\\nEverything these accounts had posted "
+"on this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:462
-msgid "Homepage"
+#: ../../Zotlabs/Module/Admin.php:1055
+msgid ""
+"The account {0} will be deleted!\\n\\nEverything this account has posted on "
+"this site will be permanently deleted!\\n\\nAre you sure?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:466
-msgid "Interests"
+#: ../../Zotlabs/Module/Admin.php:1091
+#, php-format
+msgid "%s channel censored/uncensored"
+msgid_plural "%s channels censored/uncensored"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Admin.php:1100
+#, php-format
+msgid "%s channel code allowed/disallowed"
+msgid_plural "%s channels code allowed/disallowed"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Admin.php:1106
+#, php-format
+msgid "%s channel deleted"
+msgid_plural "%s channels deleted"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Admin.php:1126
+msgid "Channel not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:560
-msgid "Profile updated."
+#: ../../Zotlabs/Module/Admin.php:1136
+#, php-format
+msgid "Channel '%s' deleted"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:644
-msgid "Hide your connections list from viewers of this profile"
+#: ../../Zotlabs/Module/Admin.php:1148
+#, php-format
+msgid "Channel '%s' censored"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:686
-msgid "Edit Profile Details"
+#: ../../Zotlabs/Module/Admin.php:1148
+#, php-format
+msgid "Channel '%s' uncensored"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:688
-msgid "View this profile"
+#: ../../Zotlabs/Module/Admin.php:1159
+#, php-format
+msgid "Channel '%s' code allowed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:689 ../../Zotlabs/Module/Profiles.php:771
-#: ../../include/channel.php:946
-msgid "Edit visibility"
+#: ../../Zotlabs/Module/Admin.php:1159
+#, php-format
+msgid "Channel '%s' code disallowed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:690
-msgid "Profile Tools"
+#: ../../Zotlabs/Module/Admin.php:1210 ../../include/widgets.php:1457
+msgid "Channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:691
-msgid "Change cover photo"
+#: ../../Zotlabs/Module/Admin.php:1214
+msgid "Censor"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:917
-msgid "Change profile photo"
+#: ../../Zotlabs/Module/Admin.php:1215
+msgid "Uncensor"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:693
-msgid "Create a new profile using these settings"
+#: ../../Zotlabs/Module/Admin.php:1216
+msgid "Allow Code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:694
-msgid "Clone this profile"
+#: ../../Zotlabs/Module/Admin.php:1217
+msgid "Disallow Code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:695
-msgid "Delete this profile"
+#: ../../Zotlabs/Module/Admin.php:1218 ../../include/conversation.php:1626
+msgid "Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:696
-msgid "Add profile things"
+#: ../../Zotlabs/Module/Admin.php:1222
+msgid "UID"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:697 ../../include/conversation.php:1541
-#: ../../include/widgets.php:105
-msgid "Personal"
+#: ../../Zotlabs/Module/Admin.php:1226
+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 ""
 
-#: ../../Zotlabs/Module/Profiles.php:699
-msgid "Relation"
+#: ../../Zotlabs/Module/Admin.php:1227
+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 ""
 
-#: ../../Zotlabs/Module/Profiles.php:700 ../../include/datetime.php:48
-msgid "Miscellaneous"
+#: ../../Zotlabs/Module/Admin.php:1284
+#, php-format
+msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:702
-msgid "Import profile from file"
+#: ../../Zotlabs/Module/Admin.php:1288
+#, php-format
+msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:703
-msgid "Export profile to file"
+#: ../../Zotlabs/Module/Admin.php:1298 ../../Zotlabs/Module/Admin.php:1585
+msgid "Disable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:704
-msgid "Your gender"
+#: ../../Zotlabs/Module/Admin.php:1301 ../../Zotlabs/Module/Admin.php:1587
+msgid "Enable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:705
-msgid "Marital status"
+#: ../../Zotlabs/Module/Admin.php:1330 ../../Zotlabs/Module/Admin.php:1420
+#: ../../include/widgets.php:1460
+msgid "Plugins"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:706
-msgid "Sexual preference"
+#: ../../Zotlabs/Module/Admin.php:1331 ../../Zotlabs/Module/Admin.php:1614
+msgid "Toggle"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:709
-msgid "Profile name"
+#: ../../Zotlabs/Module/Admin.php:1332 ../../Zotlabs/Module/Admin.php:1615
+#: ../../Zotlabs/Lib/Apps.php:215 ../../include/widgets.php:638
+#: ../../include/nav.php:210
+msgid "Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:711
-msgid "This is your default profile."
+#: ../../Zotlabs/Module/Admin.php:1339 ../../Zotlabs/Module/Admin.php:1624
+msgid "Author: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:713
-msgid "Your full name"
+#: ../../Zotlabs/Module/Admin.php:1340 ../../Zotlabs/Module/Admin.php:1625
+msgid "Maintainer: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:714
-msgid "Title/Description"
+#: ../../Zotlabs/Module/Admin.php:1341
+msgid "Minimum project version: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:717
-msgid "Street address"
+#: ../../Zotlabs/Module/Admin.php:1342
+msgid "Maximum project version: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:718
-msgid "Locality/City"
+#: ../../Zotlabs/Module/Admin.php:1343
+msgid "Minimum PHP version: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:719
-msgid "Region/State"
+#: ../../Zotlabs/Module/Admin.php:1344
+msgid "Requires: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:720
-msgid "Postal/Zip code"
+#: ../../Zotlabs/Module/Admin.php:1345 ../../Zotlabs/Module/Admin.php:1425
+msgid "Disabled - version incompatibility"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:721
-msgid "Country"
+#: ../../Zotlabs/Module/Admin.php:1394
+msgid "Enter the public git repository URL of the plugin repo."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:726
-msgid "Who (if applicable)"
+#: ../../Zotlabs/Module/Admin.php:1395
+msgid "Plugin repo git URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:726
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+#: ../../Zotlabs/Module/Admin.php:1396
+msgid "Custom repo name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:727
-msgid "Since (date)"
+#: ../../Zotlabs/Module/Admin.php:1396
+msgid "(optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:730
-msgid "Tell us about yourself"
+#: ../../Zotlabs/Module/Admin.php:1397
+msgid "Download Plugin Repo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:732
-msgid "Hometown"
+#: ../../Zotlabs/Module/Admin.php:1404
+msgid "Install new repo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:733
-msgid "Political views"
+#: ../../Zotlabs/Module/Admin.php:1405 ../../Zotlabs/Lib/Apps.php:333
+msgid "Install"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:734
-msgid "Religious views"
+#: ../../Zotlabs/Module/Admin.php:1427
+msgid "Manage Repos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:735
-msgid "Keywords used in directory listings"
+#: ../../Zotlabs/Module/Admin.php:1428
+msgid "Installed Plugin Repositories"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:735
-msgid "Example: fishing photography software"
+#: ../../Zotlabs/Module/Admin.php:1429
+msgid "Install a New Plugin Repository"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:738
-msgid "Musical interests"
+#: ../../Zotlabs/Module/Admin.php:1435 ../../Zotlabs/Module/Settings.php:77
+#: ../../Zotlabs/Module/Settings.php:616 ../../Zotlabs/Lib/Apps.php:333
+msgid "Update"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:739
-msgid "Books, literature"
+#: ../../Zotlabs/Module/Admin.php:1436
+msgid "Switch branch"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:740
-msgid "Television"
+#: ../../Zotlabs/Module/Admin.php:1550
+msgid "No themes found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:741
-msgid "Film/Dance/Culture/Entertainment"
+#: ../../Zotlabs/Module/Admin.php:1606
+msgid "Screenshot"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:742
-msgid "Hobbies/Interests"
+#: ../../Zotlabs/Module/Admin.php:1613 ../../Zotlabs/Module/Admin.php:1647
+#: ../../include/widgets.php:1461
+msgid "Themes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:743
-msgid "Love/Romance"
+#: ../../Zotlabs/Module/Admin.php:1652
+msgid "[Experimental]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:745
-msgid "School/Education"
+#: ../../Zotlabs/Module/Admin.php:1653
+msgid "[Unsupported]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:746
-msgid "Contact information and social networks"
+#: ../../Zotlabs/Module/Admin.php:1677
+msgid "Log settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:747
-msgid "My other channels"
+#: ../../Zotlabs/Module/Admin.php:1732 ../../include/widgets.php:1482
+#: ../../include/widgets.php:1492
+msgid "Logs"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:942
-msgid "Profile Image"
+#: ../../Zotlabs/Module/Admin.php:1734
+msgid "Clear"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:777 ../../include/nav.php:88
-#: ../../include/channel.php:924
-msgid "Edit Profiles"
+#: ../../Zotlabs/Module/Admin.php:1740
+msgid "Debugging"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
-msgid "Invalid profile identifier."
+#: ../../Zotlabs/Module/Admin.php:1741
+msgid "Log file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:115
-msgid "Profile Visibility Editor"
+#: ../../Zotlabs/Module/Admin.php:1741
+msgid ""
+"Must be writable by web server. Relative to your top-level webserver "
+"directory."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1238
-msgid "Profile"
+#: ../../Zotlabs/Module/Admin.php:1742
+msgid "Log level"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:119
-msgid "Click on a contact to add or remove."
+#: ../../Zotlabs/Module/Admin.php:2028
+msgid "New Profile Field"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:128
-msgid "Visible To"
+#: ../../Zotlabs/Module/Admin.php:2029 ../../Zotlabs/Module/Admin.php:2049
+msgid "Field nickname"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1343
-msgid "Public Hubs"
+#: ../../Zotlabs/Module/Admin.php:2029 ../../Zotlabs/Module/Admin.php:2049
+msgid "System name of field"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:25
-msgid ""
-"The listed hubs allow public registration for the $Projectname network. All "
-"hubs in the network are interlinked so membership on any of them conveys "
-"membership in the network as a whole. Some hubs may require subscription or "
-"provide tiered service plans. The hub itself <strong>may</strong> provide "
-"additional details."
+#: ../../Zotlabs/Module/Admin.php:2030 ../../Zotlabs/Module/Admin.php:2050
+msgid "Input type"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Hub URL"
+#: ../../Zotlabs/Module/Admin.php:2031 ../../Zotlabs/Module/Admin.php:2051
+msgid "Field Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Access Type"
+#: ../../Zotlabs/Module/Admin.php:2031 ../../Zotlabs/Module/Admin.php:2051
+msgid "Label on profile pages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Registration Policy"
+#: ../../Zotlabs/Module/Admin.php:2032 ../../Zotlabs/Module/Admin.php:2052
+msgid "Help text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Stats"
+#: ../../Zotlabs/Module/Admin.php:2032 ../../Zotlabs/Module/Admin.php:2052
+msgid "Additional info (optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Software"
+#: ../../Zotlabs/Module/Admin.php:2042
+msgid "Field definition not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:31 ../../Zotlabs/Module/Ratings.php:103
-#: ../../include/conversation.php:962
-msgid "Ratings"
+#: ../../Zotlabs/Module/Admin.php:2048
+msgid "Edit Profile Field"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:38
-msgid "Rate"
+#: ../../Zotlabs/Module/Admin.php:2106 ../../include/widgets.php:1463
+msgid "Profile Fields"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:185
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
+#: ../../Zotlabs/Module/Admin.php:2107
+msgid "Basic Profile Fields"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:388
-msgid "Upload Profile Photo"
+#: ../../Zotlabs/Module/Admin.php:2108
+msgid "Advanced Profile Fields"
 msgstr ""
 
-#: ../../Zotlabs/Module/Acl.php:227
-msgid "network"
+#: ../../Zotlabs/Module/Admin.php:2108
+msgid "(In addition to basic fields)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Acl.php:237
-msgid "RSS"
+#: ../../Zotlabs/Module/Admin.php:2110
+msgid "All available fields"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:69
-msgid "Permissions denied."
+#: ../../Zotlabs/Module/Admin.php:2111
+msgid "Custom Fields"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rate.php:159 ../../Zotlabs/Module/Connedit.php:720
-#: ../../include/js_strings.php:20
-msgid "Rating"
+#: ../../Zotlabs/Module/Admin.php:2115
+msgid "Create Custom Field"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rate.php:160
-msgid "Website:"
+#: ../../Zotlabs/Module/New_channel.php:128
+#: ../../Zotlabs/Module/Register.php:231
+msgid "Name or caption"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rate.php:163
+#: ../../Zotlabs/Module/New_channel.php:128
+#: ../../Zotlabs/Module/Register.php:231
+msgid ""
+"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation "
+"Group\""
+msgstr ""
+
+#: ../../Zotlabs/Module/New_channel.php:130
+#: ../../Zotlabs/Module/Register.php:233
+msgid "Choose a short nickname"
+msgstr ""
+
+#: ../../Zotlabs/Module/New_channel.php:130
+#: ../../Zotlabs/Module/Register.php:233
 #, php-format
-msgid "Remote Channel [%s] (not yet known on this site)"
+msgid ""
+"Your nickname will be used to create an easy to remember channel address e."
+"g. nickname%s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rate.php:164
-msgid "Rating (this information is public)"
+#: ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/Register.php:235
+msgid "Channel role and privacy"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rate.php:165
-msgid "Optionally explain your rating (this information is public)"
+#: ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/Register.php:235
+msgid "Select a channel role with your privacy requirements."
 msgstr ""
 
-#: ../../Zotlabs/Module/Ratings.php:73
-msgid "No ratings"
+#: ../../Zotlabs/Module/New_channel.php:132
+#: ../../Zotlabs/Module/Register.php:235
+msgid "Read more about roles"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ratings.php:104
-msgid "Rating: "
+#: ../../Zotlabs/Module/New_channel.php:135
+msgid "Create Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ratings.php:105
-msgid "Website: "
+#: ../../Zotlabs/Module/New_channel.php:136
+msgid ""
+"A channel is your identity on this network. It can represent a person, a "
+"blog, or a forum to name a few. Channels can make connections with other "
+"channels to share information with highly detailed permissions."
 msgstr ""
 
-#: ../../Zotlabs/Module/Ratings.php:107
-msgid "Description: "
+#: ../../Zotlabs/Module/New_channel.php:137
+msgid ""
+"or <a href=\"import\">import an existing channel</a> from another location."
 msgstr ""
 
-#: ../../Zotlabs/Module/Apps.php:47 ../../include/nav.php:163
-#: ../../include/widgets.php:102
-msgid "Apps"
+#: ../../Zotlabs/Module/Ping.php:265
+msgid "sent you a private message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:80
-msgid "Could not access contact record."
+#: ../../Zotlabs/Module/Ping.php:313
+msgid "added your channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:104
-msgid "Could not locate selected profile."
+#: ../../Zotlabs/Module/Ping.php:323
+msgid "g A l F d"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:227
-msgid "Connection updated."
+#: ../../Zotlabs/Module/Ping.php:346
+msgid "[today]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:229
-msgid "Failed to update connection record."
+#: ../../Zotlabs/Module/Ping.php:355
+msgid "posted an event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:276
-msgid "is now connected to"
+#: ../../Zotlabs/Module/Notifications.php:30
+msgid "Invalid request identifier."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:411
-msgid "Could not access address book record."
+#: ../../Zotlabs/Module/Notifications.php:39
+msgid "Discard"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:431
-msgid "Refresh failed - channel is currently unavailable."
+#: ../../Zotlabs/Module/Notifications.php:103 ../../include/nav.php:193
+msgid "Mark all system notifications seen"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:446 ../../Zotlabs/Module/Connedit.php:455
-#: ../../Zotlabs/Module/Connedit.php:464 ../../Zotlabs/Module/Connedit.php:473
-#: ../../Zotlabs/Module/Connedit.php:486
-msgid "Unable to set address book parameters."
+#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:227
+#: ../../include/conversation.php:963
+msgid "Poke"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:509
-msgid "Connection has been removed."
+#: ../../Zotlabs/Module/Poke.php:169
+msgid "Poke somebody"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:525 ../../Zotlabs/Lib/Apps.php:220
-#: ../../include/nav.php:86 ../../include/conversation.php:957
-msgid "View Profile"
+#: ../../Zotlabs/Module/Poke.php:172
+msgid "Poke/Prod"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:528
-#, php-format
-msgid "View %s's profile"
+#: ../../Zotlabs/Module/Poke.php:173
+msgid "Poke, prod or do other things to somebody"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:532
-msgid "Refresh Permissions"
+#: ../../Zotlabs/Module/Poke.php:180
+msgid "Recipient"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:535
-msgid "Fetch updated permissions"
+#: ../../Zotlabs/Module/Poke.php:181
+msgid "Choose what you wish to do to recipient"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:539
-msgid "Recent Activity"
+#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185
+msgid "Make this post private"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:542
-msgid "View recent posts and comments"
+#: ../../Zotlabs/Module/Oexchange.php:27
+msgid "Unable to find your hub."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:549
-msgid "Block (or Unblock) all communications with this connection"
+#: ../../Zotlabs/Module/Oexchange.php:41
+msgid "Post successful."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:550
-msgid "This connection is blocked!"
+#: ../../Zotlabs/Module/Openid.php:30
+msgid "OpenID protocol error. No ID returned."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:554
-msgid "Unignore"
+#: ../../Zotlabs/Module/Openid.php:193 ../../include/auth.php:226
+msgid "Login failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:557
-msgid "Ignore (or Unignore) all inbound communications from this connection"
+#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
+msgid "Invalid profile identifier."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:558
-msgid "This connection is ignored!"
+#: ../../Zotlabs/Module/Profperm.php:115
+msgid "Profile Visibility Editor"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:562
-msgid "Unarchive"
+#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1275
+msgid "Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:562
-msgid "Archive"
+#: ../../Zotlabs/Module/Profperm.php:119
+msgid "Click on a contact to add or remove."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:565
-msgid ""
-"Archive (or Unarchive) this connection - mark channel dead but keep content"
+#: ../../Zotlabs/Module/Profperm.php:128
+msgid "Visible To"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:566
-msgid "This connection is archived!"
+#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
+msgid "This setting requires special processing and editing has been blocked."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:570
-msgid "Unhide"
+#: ../../Zotlabs/Module/Pconfig.php:48
+msgid "Configuration Editor"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:570
-msgid "Hide"
+#: ../../Zotlabs/Module/Pconfig.php:49
+msgid ""
+"Warning: Changing some settings could render your channel inoperable. Please "
+"leave this page unless you are comfortable with and knowledgeable about how "
+"to correctly use this feature."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:573
-msgid "Hide or Unhide this connection from your other connections"
+#: ../../Zotlabs/Module/Probe.php:30 ../../Zotlabs/Module/Probe.php:34
+#, php-format
+msgid "Fetching URL returns error: %1$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:574
-msgid "This connection is hidden!"
+#: ../../Zotlabs/Module/Siteinfo.php:19
+#, php-format
+msgid "Version %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:581
-msgid "Delete this connection"
+#: ../../Zotlabs/Module/Siteinfo.php:34
+msgid "Installed plugins/addons/apps:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:596 ../../include/widgets.php:493
-msgid "Me"
+#: ../../Zotlabs/Module/Siteinfo.php:36
+msgid "No installed plugins/addons/apps"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:597 ../../include/widgets.php:494
-msgid "Family"
+#: ../../Zotlabs/Module/Siteinfo.php:49
+msgid ""
+"This is a hub of $Projectname - a global cooperative network of "
+"decentralized privacy enhanced websites."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:598 ../../Zotlabs/Module/Settings.php:342
-#: ../../Zotlabs/Module/Settings.php:346 ../../Zotlabs/Module/Settings.php:347
-#: ../../Zotlabs/Module/Settings.php:350 ../../Zotlabs/Module/Settings.php:361
-#: ../../include/selectors.php:123 ../../include/channel.php:389
-#: ../../include/channel.php:390 ../../include/channel.php:397
-#: ../../include/widgets.php:495
-msgid "Friends"
+#: ../../Zotlabs/Module/Siteinfo.php:51
+msgid "Tag: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:599 ../../include/widgets.php:496
-msgid "Acquaintances"
+#: ../../Zotlabs/Module/Siteinfo.php:53
+msgid "Last background fetch: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:660
-msgid "Approve this connection"
+#: ../../Zotlabs/Module/Siteinfo.php:55
+msgid "Current load average: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:660
-msgid "Accept connection to allow communication"
+#: ../../Zotlabs/Module/Siteinfo.php:58
+msgid "Running at web location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:665
-msgid "Set Affinity"
+#: ../../Zotlabs/Module/Siteinfo.php:59
+msgid ""
+"Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more "
+"about $Projectname."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:668
-msgid "Set Profile"
+#: ../../Zotlabs/Module/Siteinfo.php:60
+msgid "Bug reports and issues: please visit"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:671
-msgid "Set Affinity & Profile"
+#: ../../Zotlabs/Module/Siteinfo.php:62
+msgid "$projectname issues"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:704
-msgid "none"
+#: ../../Zotlabs/Module/Siteinfo.php:63
+msgid ""
+"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:708 ../../include/widgets.php:614
-msgid "Connection Default Permissions"
+#: ../../Zotlabs/Module/Siteinfo.php:65
+msgid "Site Administrators"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:708 ../../include/items.php:3949
-#, php-format
-msgid "Connection: %s"
+#: ../../Zotlabs/Module/Rmagic.php:44
+msgid ""
+"We encountered a problem while logging in with the OpenID you provided. "
+"Please check the correct spelling of the ID."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:709
-msgid "Apply these permissions automatically"
+#: ../../Zotlabs/Module/Rmagic.php:44
+msgid "The error message was:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:709
-msgid "Connection requests will be approved without your interaction"
+#: ../../Zotlabs/Module/Rmagic.php:48
+msgid "Authentication failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:711
-msgid "This connection's primary address is"
+#: ../../Zotlabs/Module/Rmagic.php:88
+msgid "Remote Authentication"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:712
-msgid "Available locations:"
+#: ../../Zotlabs/Module/Rmagic.php:89
+msgid "Enter your channel address (e.g. channel@example.com)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:716
+#: ../../Zotlabs/Module/Rmagic.php:90
+msgid "Authenticate"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1343
+msgid "Public Hubs"
+msgstr ""
+
+#: ../../Zotlabs/Module/Pubsites.php:25
 msgid ""
-"The permissions indicated on this page will be applied to all new "
-"connections."
+"The listed hubs allow public registration for the $Projectname network. All "
+"hubs in the network are interlinked so membership on any of them conveys "
+"membership in the network as a whole. Some hubs may require subscription or "
+"provide tiered service plans. The hub itself <strong>may</strong> provide "
+"additional details."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:717
-msgid "Connection Tools"
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Hub URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:719
-msgid "Slide to adjust your degree of friendship"
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Access Type"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:721
-msgid "Slide to adjust your rating"
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Registration Policy"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:722 ../../Zotlabs/Module/Connedit.php:727
-msgid "Optionally explain your rating"
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Stats"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:724
-msgid "Custom Filter"
+#: ../../Zotlabs/Module/Pubsites.php:31
+msgid "Software"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:725
-msgid "Only import posts with this text"
+#: ../../Zotlabs/Module/Pubsites.php:31 ../../Zotlabs/Module/Ratings.php:103
+#: ../../include/conversation.php:962
+msgid "Ratings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:725 ../../Zotlabs/Module/Connedit.php:726
+#: ../../Zotlabs/Module/Pubsites.php:38
+msgid "Rate"
+msgstr ""
+
+#: ../../Zotlabs/Module/Profile_photo.php:184
 msgid ""
-"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
-"all posts"
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:726
-msgid "Do not import posts with this text"
+#: ../../Zotlabs/Module/Profile_photo.php:387
+msgid "Upload Profile Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:728
-msgid "This information is public!"
+#: ../../Zotlabs/Module/Blocks.php:97 ../../Zotlabs/Module/Blocks.php:155
+#: ../../Zotlabs/Module/Editblock.php:108
+msgid "Block Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:733
-msgid "Connection Pending Approval"
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2242
+msgid "Blocks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:736
-msgid "inherited"
+#: ../../Zotlabs/Module/Blocks.php:156
+msgid "Block Title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:738
+#: ../../Zotlabs/Module/Rate.php:160
+msgid "Website:"
+msgstr ""
+
+#: ../../Zotlabs/Module/Rate.php:163
 #, php-format
-msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
+msgid "Remote Channel [%s] (not yet known on this site)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:740
-msgid "Their Settings"
+#: ../../Zotlabs/Module/Rate.php:164
+msgid "Rating (this information is public)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:741
-msgid "My Settings"
+#: ../../Zotlabs/Module/Rate.php:165
+msgid "Optionally explain your rating (this information is public)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:743
-msgid "Individual Permissions"
+#: ../../Zotlabs/Module/Ratings.php:73
+msgid "No ratings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:744
-msgid ""
-"Some permissions may be inherited from your channel's <a href=\"settings"
-"\"><strong>privacy settings</strong></a>, which have higher priority than "
-"individual settings. You can <strong>not</strong> change those settings here."
+#: ../../Zotlabs/Module/Ratings.php:104
+msgid "Rating: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:745
-msgid ""
-"Some permissions may be inherited from your channel's <a href=\"settings"
-"\"><strong>privacy settings</strong></a>, which have higher priority than "
-"individual settings. You can change those settings here but they wont have "
-"any impact unless the inherited setting changes."
+#: ../../Zotlabs/Module/Ratings.php:105
+msgid "Website: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:746
-msgid "Last update:"
+#: ../../Zotlabs/Module/Ratings.php:107
+msgid "Description: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:41
-msgid "Posts and comments"
+#: ../../Zotlabs/Module/Apps.php:47 ../../include/widgets.php:102
+#: ../../include/nav.php:165
+msgid "Apps"
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:42
-msgid "Only posts"
+#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1243
+msgid "Title (optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:102
-msgid "Insufficient permissions.  Request redirected to profile page."
+#: ../../Zotlabs/Module/Editblock.php:133
+msgid "Edit Block"
+msgstr ""
+
+#: ../../Zotlabs/Module/Common.php:14
+msgid "No channel."
+msgstr ""
+
+#: ../../Zotlabs/Module/Common.php:43
+msgid "Common connections"
+msgstr ""
+
+#: ../../Zotlabs/Module/Common.php:48
+msgid "No connections in common."
 msgstr ""
 
 #: ../../Zotlabs/Module/Rbmark.php:94
@@ -4775,13 +4818,15 @@ msgstr ""
 msgid "Membership on this site is by invitation only."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:147
+#: ../../Zotlabs/Module/Register.php:262 ../../include/nav.php:149
 #: ../../boot.php:1686
 msgid "Register"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:262
-msgid "Proceed to create your first channel"
+#: ../../Zotlabs/Module/Register.php:263
+msgid ""
+"This site may require email verification after submitting this form. If you "
+"are returned to a login page, please check your email for instructions."
 msgstr ""
 
 #: ../../Zotlabs/Module/Regmod.php:15
@@ -4864,30 +4909,62 @@ msgstr ""
 msgid "Remove Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:44
+#: ../../Zotlabs/Module/Uexport.php:55 ../../Zotlabs/Module/Uexport.php:56
+msgid "Export Channel"
+msgstr ""
+
+#: ../../Zotlabs/Module/Uexport.php:57
 msgid ""
-"We encountered a problem while logging in with the OpenID you provided. "
-"Please check the correct spelling of the ID."
+"Export your basic channel information to a file.  This acts as a backup of "
+"your connections, permissions, profile and basic data, which can be used to "
+"import your data to a new server hub, but does not contain your content."
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:44
-msgid "The error message was:"
+#: ../../Zotlabs/Module/Uexport.php:58
+msgid "Export Content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:48
-msgid "Authentication failed."
+#: ../../Zotlabs/Module/Uexport.php:59
+msgid ""
+"Export your channel information and recent content to a JSON backup that can "
+"be restored or imported to another server hub. This backs up all of your "
+"connections, permissions, profile data and several months of posts. This "
+"file may be VERY large.  Please be patient - it may take several minutes for "
+"this download to begin."
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:88
-msgid "Remote Authentication"
+#: ../../Zotlabs/Module/Uexport.php:60
+msgid "Export your posts from a given year."
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:89
-msgid "Enter your channel address (e.g. channel@example.com)"
+#: ../../Zotlabs/Module/Uexport.php:62
+msgid ""
+"You may also export your posts and conversations for a particular year or "
+"month. Adjust the date in your browser location bar to select other dates. "
+"If the export fails (possibly due to memory exhaustion on your server hub), "
+"please try again selecting a more limited date range."
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:90
-msgid "Authenticate"
+#: ../../Zotlabs/Module/Uexport.php:63
+#, php-format
+msgid ""
+"To select all posts for a given year, such as this year, visit <a href=\"%1$s"
+"\">%2$s</a>"
+msgstr ""
+
+#: ../../Zotlabs/Module/Uexport.php:64
+#, php-format
+msgid ""
+"To select all posts for a given month, such as January of this year, visit "
+"<a href=\"%1$s\">%2$s</a>"
+msgstr ""
+
+#: ../../Zotlabs/Module/Uexport.php:65
+#, php-format
+msgid ""
+"These content files may be imported or restored by visiting <a href=\"%1$s\">"
+"%2$s</a> on any site containing your channel. For best results please import "
+"or restore these in date order (oldest first)."
 msgstr ""
 
 #: ../../Zotlabs/Module/Search.php:216
@@ -5203,7 +5280,7 @@ msgstr ""
 msgid "Basic Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1040 ../../include/channel.php:1128
+#: ../../Zotlabs/Module/Settings.php:1040 ../../include/channel.php:1165
 msgid "Full Name:"
 msgstr ""
 
@@ -5538,7 +5615,7 @@ msgid ""
 msgstr ""
 
 #: ../../Zotlabs/Module/Setup.php:204 ../../Zotlabs/Module/Setup.php:266
-#: ../../Zotlabs/Module/Setup.php:721
+#: ../../Zotlabs/Module/Setup.php:727
 msgid "Please see the file \"install/INSTALL.txt\"."
 msgstr ""
 
@@ -5855,8 +5932,9 @@ msgstr ""
 
 #: ../../Zotlabs/Module/Setup.php:599
 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"
+"This software 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 ""
 
 #: ../../Zotlabs/Module/Setup.php:603
@@ -5901,35 +5979,43 @@ msgid ""
 msgstr ""
 
 #: ../../Zotlabs/Module/Setup.php:643
+msgid ""
+"If you are confident that the certificate is valid and signed by a trusted "
+"authority, check to see if you have failed to install an intermediate cert. "
+"These are not normally required by browsers, but are required for server-to-"
+"server communications."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:646
 msgid "SSL certificate validation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:649
+#: ../../Zotlabs/Module/Setup.php:652
 msgid ""
 "Url rewrite in .htaccess is not working. Check your server configuration."
 "Test: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:652
+#: ../../Zotlabs/Module/Setup.php:655
 msgid "Url rewrite is working"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:661
+#: ../../Zotlabs/Module/Setup.php:664
 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 ""
 
-#: ../../Zotlabs/Module/Setup.php:685
+#: ../../Zotlabs/Module/Setup.php:688
 msgid "Errors encountered creating database tables."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:719
+#: ../../Zotlabs/Module/Setup.php:725
 msgid "<h1>What next</h1>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:720
+#: ../../Zotlabs/Module/Setup.php:726
 msgid ""
 "IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
@@ -5950,62 +6036,61 @@ msgstr ""
 msgid "Remove this file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:19
-#, php-format
-msgid "Version %s"
+#: ../../Zotlabs/Module/Thing.php:114
+msgid "Thing updated"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:34
-msgid "Installed plugins/addons/apps:"
+#: ../../Zotlabs/Module/Thing.php:166
+msgid "Object store: failed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:36
-msgid "No installed plugins/addons/apps"
+#: ../../Zotlabs/Module/Thing.php:170
+msgid "Thing added"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:49
-msgid ""
-"This is a hub of $Projectname - a global cooperative network of "
-"decentralized privacy enhanced websites."
+#: ../../Zotlabs/Module/Thing.php:196
+#, php-format
+msgid "OBJ: %1$s %2$s %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:51
-msgid "Tag: "
+#: ../../Zotlabs/Module/Thing.php:259
+msgid "Show Thing"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:53
-msgid "Last background fetch: "
+#: ../../Zotlabs/Module/Thing.php:266
+msgid "item not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:55
-msgid "Current load average: "
+#: ../../Zotlabs/Module/Thing.php:299
+msgid "Edit Thing"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:58
-msgid "Running at web location"
+#: ../../Zotlabs/Module/Thing.php:301 ../../Zotlabs/Module/Thing.php:351
+msgid "Select a profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:59
-msgid ""
-"Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more "
-"about $Projectname."
+#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:354
+msgid "Post an activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:60
-msgid "Bug reports and issues: please visit"
+#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:354
+msgid "Only sends to viewers of the applicable profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:62
-msgid "$projectname issues"
+#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:356
+msgid "Name of thing e.g. something"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:63
-msgid ""
-"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"
+#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:357
+msgid "URL of thing (optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:65
-msgid "Site Administrators"
+#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:358
+msgid "URL for photo of thing (optional)"
+msgstr ""
+
+#: ../../Zotlabs/Module/Thing.php:349
+msgid "Add Thing to your Profile"
 msgstr ""
 
 #: ../../Zotlabs/Module/Sources.php:37
@@ -6024,7 +6109,7 @@ msgstr ""
 msgid "*"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:96 ../../include/features.php:71
+#: ../../Zotlabs/Module/Sources.php:96 ../../include/features.php:72
 #: ../../include/widgets.php:630
 msgid "Channel Sources"
 msgstr ""
@@ -6105,8 +6190,8 @@ msgstr ""
 msgid "post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Tagger.php:57 ../../include/text.php:1925
-#: ../../include/conversation.php:150
+#: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:150
+#: ../../include/text.php:1925
 msgid "comment"
 msgstr ""
 
@@ -6127,131 +6212,110 @@ msgstr ""
 msgid "Select a tag to remove: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:114
-msgid "Thing updated"
-msgstr ""
-
-#: ../../Zotlabs/Module/Thing.php:166
-msgid "Object store: failed"
+#: ../../Zotlabs/Module/Webpages.php:192 ../../Zotlabs/Lib/Apps.php:217
+#: ../../include/conversation.php:1700 ../../include/nav.php:106
+msgid "Webpages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:170
-msgid "Thing added"
+#: ../../Zotlabs/Module/Webpages.php:203 ../../include/page_widgets.php:44
+msgid "Actions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:196
-#, php-format
-msgid "OBJ: %1$s %2$s %3$s"
+#: ../../Zotlabs/Module/Webpages.php:204 ../../include/page_widgets.php:45
+msgid "Page Link"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:259
-msgid "Show Thing"
+#: ../../Zotlabs/Module/Webpages.php:205
+msgid "Page Title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:266
-msgid "item not found."
+#: ../../Zotlabs/Module/Wiki.php:34
+msgid "Not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:299
-msgid "Edit Thing"
+#: ../../Zotlabs/Module/Wiki.php:92 ../../Zotlabs/Lib/Apps.php:218
+#: ../../include/conversation.php:1710 ../../include/conversation.php:1713
+#: ../../include/features.php:55 ../../include/nav.php:108
+msgid "Wiki"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:301 ../../Zotlabs/Module/Thing.php:351
-msgid "Select a profile"
+#: ../../Zotlabs/Module/Wiki.php:93
+msgid "Sandbox"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:354
-msgid "Post an activity"
+#: ../../Zotlabs/Module/Wiki.php:95
+msgid ""
+"\"# Wiki Sandbox\\n\\nContent you **edit** and **preview** here *will not be "
+"saved*.\""
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:354
-msgid "Only sends to viewers of the applicable profile"
+#: ../../Zotlabs/Module/Wiki.php:164
+msgid "Revision Comparison"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:356
-msgid "Name of thing e.g. something"
+#: ../../Zotlabs/Module/Wiki.php:165
+msgid "Revert"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:357
-msgid "URL of thing (optional)"
+#: ../../Zotlabs/Module/Wiki.php:192
+msgid "Enter the name of your new wiki:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:358
-msgid "URL for photo of thing (optional)"
+#: ../../Zotlabs/Module/Wiki.php:193
+msgid "Enter the name of the new page:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:349
-msgid "Add Thing to your Profile"
+#: ../../Zotlabs/Module/Wiki.php:194
+msgid "Enter the new name:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:55 ../../Zotlabs/Module/Uexport.php:56
-msgid "Export Channel"
+#: ../../Zotlabs/Module/Wiki.php:200 ../../include/conversation.php:1150
+msgid "Embed image from photo albums"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:57
-msgid ""
-"Export your basic channel information to a file.  This acts as a backup of "
-"your connections, permissions, profile and basic data, which can be used to "
-"import your data to a new server hub, but does not contain your content."
+#: ../../Zotlabs/Module/Wiki.php:201 ../../include/conversation.php:1234
+msgid "Embed an image from your albums"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:58
-msgid "Export Content"
+#: ../../Zotlabs/Module/Wiki.php:203 ../../include/conversation.php:1236
+#: ../../include/conversation.php:1273
+msgid "OK"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:59
-msgid ""
-"Export your channel information and recent content to a JSON backup that can "
-"be restored or imported to another server hub. This backs up all of your "
-"connections, permissions, profile data and several months of posts. This "
-"file may be VERY large.  Please be patient - it may take several minutes for "
-"this download to begin."
+#: ../../Zotlabs/Module/Wiki.php:204 ../../include/conversation.php:1186
+msgid "Choose images to embed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:60
-msgid "Export your posts from a given year."
+#: ../../Zotlabs/Module/Wiki.php:205 ../../include/conversation.php:1187
+msgid "Choose an album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:62
-msgid ""
-"You may also export your posts and conversations for a particular year or "
-"month. Adjust the date in your browser location bar to select other dates. "
-"If the export fails (possibly due to memory exhaustion on your server hub), "
-"please try again selecting a more limited date range."
+#: ../../Zotlabs/Module/Wiki.php:206 ../../include/conversation.php:1188
+msgid "Choose a different album..."
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:63
-#, php-format
-msgid ""
-"To select all posts for a given year, such as this year, visit <a href=\"%1$s"
-"\">%2$s</a>"
+#: ../../Zotlabs/Module/Wiki.php:207 ../../include/conversation.php:1189
+msgid "Error getting album list"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:64
-#, php-format
-msgid ""
-"To select all posts for a given month, such as January of this year, visit "
-"<a href=\"%1$s\">%2$s</a>"
+#: ../../Zotlabs/Module/Wiki.php:208 ../../include/conversation.php:1190
+msgid "Error getting photo link"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:65
-#, php-format
-msgid ""
-"These content files may be imported or restored by visiting <a href=\"%1$s\">"
-"%2$s</a> on any site containing your channel. For best results please import "
-"or restore these in date order (oldest first)."
+#: ../../Zotlabs/Module/Wiki.php:209 ../../include/conversation.php:1191
+msgid "Error getting album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Viewconnections.php:62
+#: ../../Zotlabs/Module/Viewconnections.php:65
 msgid "No connections."
 msgstr ""
 
-#: ../../Zotlabs/Module/Viewconnections.php:75
+#: ../../Zotlabs/Module/Viewconnections.php:78
 #, php-format
 msgid "Visit %s's profile [%s]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Viewconnections.php:104
+#: ../../Zotlabs/Module/Viewconnections.php:107
 msgid "View Connections"
 msgstr ""
 
@@ -6285,6 +6349,230 @@ msgstr ""
 msgid "Lookup xchan beginning with (or webbie): "
 msgstr ""
 
+#: ../../Zotlabs/Lib/Chatroom.php:27
+msgid "Missing room name"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Chatroom.php:36
+msgid "Duplicate room name"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Chatroom.php:86 ../../Zotlabs/Lib/Chatroom.php:94
+msgid "Invalid room specifier."
+msgstr ""
+
+#: ../../Zotlabs/Lib/Chatroom.php:126
+msgid "Room not found."
+msgstr ""
+
+#: ../../Zotlabs/Lib/Chatroom.php:147
+msgid "Room is full"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1882
+msgid "$Projectname Notification"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:61 ../../include/network.php:1883
+msgid "$projectname"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1885
+msgid "Thank You,"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1887
+#, php-format
+msgid "%s Administrator"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:100
+#, php-format
+msgid "%s <!item_type!>"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:104
+#, php-format
+msgid "[Hubzilla:Notify] New mail received at %s"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:106
+#, php-format
+msgid "%1$s, %2$s sent you a new private message at %3$s."
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:107
+#, php-format
+msgid "%1$s sent you %2$s."
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:107
+msgid "a private message"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:108
+#, php-format
+msgid "Please visit %s to view and/or reply to your private messages."
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:164
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:172
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:181
+#, php-format
+msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:192
+#, php-format
+msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:193
+#, php-format
+msgid "%1$s, %2$s commented on an item/conversation you have been following."
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:196 ../../Zotlabs/Lib/Enotify.php:211
+#: ../../Zotlabs/Lib/Enotify.php:237 ../../Zotlabs/Lib/Enotify.php:255
+#: ../../Zotlabs/Lib/Enotify.php:269
+#, php-format
+msgid "Please visit %s to view and/or reply to the conversation."
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:202
+#, php-format
+msgid "[Hubzilla:Notify] %s posted to your profile wall"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:204
+#, php-format
+msgid "%1$s, %2$s posted to your profile wall at %3$s"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:206
+#, php-format
+msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:230
+#, php-format
+msgid "[Hubzilla:Notify] %s tagged you"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:231
+#, php-format
+msgid "%1$s, %2$s tagged you at %3$s"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:232
+#, php-format
+msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:244
+#, php-format
+msgid "[Hubzilla:Notify] %1$s poked you"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:245
+#, php-format
+msgid "%1$s, %2$s poked you at %3$s"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:246
+#, php-format
+msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:262
+#, php-format
+msgid "[Hubzilla:Notify] %s tagged your post"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:263
+#, php-format
+msgid "%1$s, %2$s tagged your post at %3$s"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:264
+#, php-format
+msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:276
+msgid "[Hubzilla:Notify] Introduction received"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:277
+#, php-format
+msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:278
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:282 ../../Zotlabs/Lib/Enotify.php:301
+#, php-format
+msgid "You may visit their profile at %s"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:284
+#, php-format
+msgid "Please visit %s to approve or reject the connection request."
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:291
+msgid "[Hubzilla:Notify] Friend suggestion received"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:292
+#, php-format
+msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:293
+#, php-format
+msgid ""
+"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s."
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:299
+msgid "Name:"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:300
+msgid "Photo:"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:303
+#, php-format
+msgid "Please visit %s to approve or reject the suggestion."
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:518
+msgid "[Hubzilla:Notify]"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:667
+msgid "created a new post"
+msgstr ""
+
+#: ../../Zotlabs/Lib/Enotify.php:668
+#, php-format
+msgid "commented on %s's post"
+msgstr ""
+
 #: ../../Zotlabs/Lib/Apps.php:204
 msgid "Site Admin"
 msgstr ""
@@ -6309,33 +6597,33 @@ msgstr ""
 msgid "Remote Diagnostics"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:211 ../../include/features.php:89
+#: ../../Zotlabs/Lib/Apps.php:211 ../../include/features.php:90
 msgid "Suggest Channels"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:212 ../../include/nav.php:110
+#: ../../Zotlabs/Lib/Apps.php:212 ../../include/nav.php:112
 #: ../../boot.php:1704
 msgid "Login"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:214 ../../include/nav.php:179
+#: ../../Zotlabs/Lib/Apps.php:214 ../../include/nav.php:181
 msgid "Grid"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:219 ../../include/nav.php:182
+#: ../../Zotlabs/Lib/Apps.php:219 ../../include/nav.php:184
 msgid "Channel Home"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:222 ../../include/nav.php:201
-#: ../../include/conversation.php:1664 ../../include/conversation.php:1667
+#: ../../Zotlabs/Lib/Apps.php:222 ../../include/conversation.php:1664
+#: ../../include/conversation.php:1667 ../../include/nav.php:203
 msgid "Events"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:223 ../../include/nav.php:167
+#: ../../Zotlabs/Lib/Apps.php:223 ../../include/nav.php:169
 msgid "Directory"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:225 ../../include/nav.php:193
+#: ../../Zotlabs/Lib/Apps.php:225 ../../include/nav.php:195
 msgid "Mail"
 msgstr ""
 
@@ -6371,26 +6659,6 @@ msgstr ""
 msgid "Purchase"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Chatroom.php:27
-msgid "Missing room name"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Chatroom.php:36
-msgid "Duplicate room name"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Chatroom.php:86 ../../Zotlabs/Lib/Chatroom.php:94
-msgid "Invalid room specifier."
-msgstr ""
-
-#: ../../Zotlabs/Lib/Chatroom.php:126
-msgid "Room not found."
-msgstr ""
-
-#: ../../Zotlabs/Lib/Chatroom.php:147
-msgid "Room is full"
-msgstr ""
-
 #: ../../Zotlabs/Lib/ThreadItem.php:95 ../../include/conversation.php:667
 msgid "Private Message"
 msgstr ""
@@ -6531,7 +6799,8 @@ msgid "Mark all seen"
 msgstr ""
 
 #: ../../Zotlabs/Lib/ThreadItem.php:421 ../../include/js_strings.php:7
-msgid "[+] show all"
+#, php-format
+msgid "%s show all"
 msgstr ""
 
 #: ../../Zotlabs/Lib/ThreadItem.php:711 ../../include/conversation.php:1226
@@ -6566,363 +6835,373 @@ msgstr ""
 msgid "Video"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1863
-msgid "$Projectname Notification"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Enotify.php:61 ../../include/network.php:1864
-msgid "$projectname"
-msgstr ""
-
-#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1866
-msgid "Thank You,"
+#: ../../include/Import/import_diaspora.php:16
+msgid "No username found in import file."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1868
-#, php-format
-msgid "%s Administrator"
+#: ../../include/Import/import_diaspora.php:41 ../../include/import.php:50
+msgid "Unable to create a unique channel address. Import failed."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:100
+#: ../../include/dba/dba_driver.php:171
 #, php-format
-msgid "%s <!item_type!>"
+msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:104
-#, php-format
-msgid "[Hubzilla:Notify] New mail received at %s"
+#: ../../include/acl_selectors.php:232
+#: ../../include/PermissionDescription.php:31
+msgid "Visible to your default audience"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:106
-#, php-format
-msgid "%1$s, %2$s sent you a new private message at %3$s."
+#: ../../include/acl_selectors.php:268
+#: ../../include/PermissionDescription.php:115
+msgid "Only me"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:107
-#, php-format
-msgid "%1$s sent you %2$s."
+#: ../../include/acl_selectors.php:271
+msgid "Who can see this?"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:107
-msgid "a private message"
+#: ../../include/acl_selectors.php:272
+msgid "Custom selection"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:108
-#, php-format
-msgid "Please visit %s to view and/or reply to your private messages."
+#: ../../include/acl_selectors.php:273
+msgid ""
+"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit "
+"the scope of \"Show\"."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:164
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]"
+#: ../../include/acl_selectors.php:274
+msgid "Show"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:172
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]"
+#: ../../include/acl_selectors.php:275
+msgid "Don't show"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:181
-#, php-format
-msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]"
+#: ../../include/acl_selectors.php:281
+msgid "Other networks and post services"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:192
+#: ../../include/acl_selectors.php:311
 #, php-format
-msgid "[Hubzilla:Notify] Comment to conversation #%1$d by %2$s"
+msgid ""
+"Post permissions %s cannot be changed %s after a post is shared.</br />These "
+"permissions set who is allowed to view the post."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:193
-#, php-format
-msgid "%1$s, %2$s commented on an item/conversation you have been following."
+#: ../../include/bb2diaspora.php:398
+msgid "Attachments:"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:196 ../../Zotlabs/Lib/Enotify.php:211
-#: ../../Zotlabs/Lib/Enotify.php:237 ../../Zotlabs/Lib/Enotify.php:255
-#: ../../Zotlabs/Lib/Enotify.php:269
-#, php-format
-msgid "Please visit %s to view and/or reply to the conversation."
+#: ../../include/bb2diaspora.php:485 ../../include/event.php:22
+#: ../../include/event.php:69
+msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:202
-#, php-format
-msgid "[Hubzilla:Notify] %s posted to your profile wall"
+#: ../../include/bb2diaspora.php:487
+msgid "$Projectname event notification:"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:204
-#, php-format
-msgid "%1$s, %2$s posted to your profile wall at %3$s"
+#: ../../include/bb2diaspora.php:491 ../../include/event.php:30
+#: ../../include/event.php:73
+msgid "Starts:"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:206
-#, php-format
-msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]"
+#: ../../include/bb2diaspora.php:499 ../../include/event.php:40
+#: ../../include/event.php:77
+msgid "Finishes:"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:230
-#, php-format
-msgid "[Hubzilla:Notify] %s tagged you"
+#: ../../include/connections.php:95
+msgid "New window"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:231
-#, php-format
-msgid "%1$s, %2$s tagged you at %3$s"
+#: ../../include/connections.php:96
+msgid "Open the selected location in a different window or browser tab"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:232
+#: ../../include/connections.php:214
 #, php-format
-msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]."
+msgid "User '%s' deleted"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:244
+#: ../../include/conversation.php:204
 #, php-format
-msgid "[Hubzilla:Notify] %1$s poked you"
+msgid "%1$s is now connected with %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:245
+#: ../../include/conversation.php:239
 #, php-format
-msgid "%1$s, %2$s poked you at %3$s"
+msgid "%1$s poked %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:246
-#, php-format
-msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]."
+#: ../../include/conversation.php:243 ../../include/text.php:1009
+#: ../../include/text.php:1014
+msgid "poked"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:262
+#: ../../include/conversation.php:694
 #, php-format
-msgid "[Hubzilla:Notify] %s tagged your post"
+msgid "View %s's profile @ %s"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:263
-#, php-format
-msgid "%1$s, %2$s tagged your post at %3$s"
+#: ../../include/conversation.php:713
+msgid "Categories:"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:264
-#, php-format
-msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]"
+#: ../../include/conversation.php:714
+msgid "Filed under:"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:276
-msgid "[Hubzilla:Notify] Introduction received"
+#: ../../include/conversation.php:741
+msgid "View in context"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:277
-#, php-format
-msgid "%1$s, you've received an new connection request from '%2$s' at %3$s"
+#: ../../include/conversation.php:850
+msgid "remove"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:278
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s."
+#: ../../include/conversation.php:854 ../../include/nav.php:249
+msgid "Loading..."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:282 ../../Zotlabs/Lib/Enotify.php:301
-#, php-format
-msgid "You may visit their profile at %s"
+#: ../../include/conversation.php:855
+msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:284
-#, php-format
-msgid "Please visit %s to approve or reject the connection request."
+#: ../../include/conversation.php:951
+msgid "View Source"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:291
-msgid "[Hubzilla:Notify] Friend suggestion received"
+#: ../../include/conversation.php:952
+msgid "Follow Thread"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:292
-#, php-format
-msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s"
+#: ../../include/conversation.php:953
+msgid "Unfollow Thread"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:293
-#, php-format
-msgid ""
-"%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s."
+#: ../../include/conversation.php:958
+msgid "Activity/Posts"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:299
-msgid "Name:"
+#: ../../include/conversation.php:960
+msgid "Edit Connection"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:300
-msgid "Photo:"
+#: ../../include/conversation.php:961
+msgid "Message"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:303
+#: ../../include/conversation.php:1078
 #, php-format
-msgid "Please visit %s to approve or reject the suggestion."
+msgid "%s likes this."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:518
-msgid "[Hubzilla:Notify]"
+#: ../../include/conversation.php:1078
+#, php-format
+msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../Zotlabs/Lib/Enotify.php:667
-msgid "created a new post"
-msgstr ""
+#: ../../include/conversation.php:1082
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this."
+msgid_plural "<span  %1$s>%2$d people</span> like this."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../Zotlabs/Lib/Enotify.php:668
+#: ../../include/conversation.php:1084
 #, php-format
-msgid "commented on %s's post"
-msgstr ""
+msgid "<span  %1$s>%2$d people</span> don't like this."
+msgid_plural "<span  %1$s>%2$d people</span> don't like this."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/Import/import_diaspora.php:16
-msgid "No username found in import file."
+#: ../../include/conversation.php:1090
+msgid "and"
 msgstr ""
 
-#: ../../include/Import/import_diaspora.php:41 ../../include/import.php:50
-msgid "Unable to create a unique channel address. Import failed."
-msgstr ""
+#: ../../include/conversation.php:1093
+#, php-format
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/dba/dba_driver.php:171
+#: ../../include/conversation.php:1094
 #, php-format
-msgid "Cannot locate DNS info for database server '%s'"
+msgid "%s like this."
 msgstr ""
 
-#: ../../include/acl_selectors.php:232
-#: ../../include/PermissionDescription.php:31
-msgid "Visible to your default audience"
+#: ../../include/conversation.php:1094
+#, php-format
+msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/acl_selectors.php:268
-#: ../../include/PermissionDescription.php:115
-msgid "Only me"
+#: ../../include/conversation.php:1133
+msgid "Set your location"
 msgstr ""
 
-#: ../../include/acl_selectors.php:271
-msgid "Who can see this?"
+#: ../../include/conversation.php:1134
+msgid "Clear browser location"
 msgstr ""
 
-#: ../../include/acl_selectors.php:272
-msgid "Custom selection"
+#: ../../include/conversation.php:1182
+msgid "Tag term:"
 msgstr ""
 
-#: ../../include/acl_selectors.php:273
-msgid ""
-"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit "
-"the scope of \"Show\"."
+#: ../../include/conversation.php:1183
+msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/acl_selectors.php:274
-msgid "Show"
+#: ../../include/conversation.php:1221
+msgid "Page link name"
 msgstr ""
 
-#: ../../include/acl_selectors.php:275
-msgid "Don't show"
+#: ../../include/conversation.php:1224
+msgid "Post as"
 msgstr ""
 
-#: ../../include/acl_selectors.php:281
-msgid "Other networks and post services"
+#: ../../include/conversation.php:1238
+msgid "Toggle voting"
 msgstr ""
 
-#: ../../include/acl_selectors.php:311
-#, php-format
-msgid ""
-"Post permissions %s cannot be changed %s after a post is shared.</br />These "
-"permissions set who is allowed to view the post."
+#: ../../include/conversation.php:1246
+msgid "Categories (optional, comma-separated list)"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:398
-msgid "Attachments:"
+#: ../../include/conversation.php:1269
+msgid "Set publish date"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:485 ../../include/event.php:22
-#: ../../include/event.php:69
-msgid "l F d, Y \\@ g:i A"
+#: ../../include/conversation.php:1518
+msgid "Discover"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:487
-msgid "$Projectname event notification:"
+#: ../../include/conversation.php:1521
+msgid "Imported public streams"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:491 ../../include/event.php:30
-#: ../../include/event.php:73
-msgid "Starts:"
+#: ../../include/conversation.php:1526
+msgid "Commented Order"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:499 ../../include/event.php:40
-#: ../../include/event.php:77
-msgid "Finishes:"
+#: ../../include/conversation.php:1529
+msgid "Sort by Comment Date"
 msgstr ""
 
-#: ../../include/import.php:29
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
+#: ../../include/conversation.php:1533
+msgid "Posted Order"
 msgstr ""
 
-#: ../../include/import.php:76
-msgid "Channel clone failed. Import failed."
+#: ../../include/conversation.php:1536
+msgid "Sort by Post Date"
 msgstr ""
 
-#: ../../include/items.php:902 ../../include/items.php:947
-msgid "(Unknown)"
+#: ../../include/conversation.php:1544
+msgid "Posts that mention or involve you"
 msgstr ""
 
-#: ../../include/items.php:1146
-msgid "Visible to anybody on the internet."
+#: ../../include/conversation.php:1553
+msgid "Activity Stream - by date"
 msgstr ""
 
-#: ../../include/items.php:1148
-msgid "Visible to you only."
+#: ../../include/conversation.php:1559
+msgid "Starred"
 msgstr ""
 
-#: ../../include/items.php:1150
-msgid "Visible to anybody in this network."
+#: ../../include/conversation.php:1562
+msgid "Favourite Posts"
 msgstr ""
 
-#: ../../include/items.php:1152
-msgid "Visible to anybody authenticated."
+#: ../../include/conversation.php:1569
+msgid "Spam"
 msgstr ""
 
-#: ../../include/items.php:1154
-#, php-format
-msgid "Visible to anybody on %s."
+#: ../../include/conversation.php:1572
+msgid "Posts flagged as SPAM"
 msgstr ""
 
-#: ../../include/items.php:1156
-msgid "Visible to all connections."
+#: ../../include/conversation.php:1629
+msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../include/items.php:1158
-msgid "Visible to approved connections."
+#: ../../include/conversation.php:1638
+msgid "About"
 msgstr ""
 
-#: ../../include/items.php:1160
-msgid "Visible to specific connections."
+#: ../../include/conversation.php:1641
+msgid "Profile Details"
 msgstr ""
 
-#: ../../include/items.php:3932
-msgid "Privacy group is empty."
+#: ../../include/conversation.php:1650 ../../include/photos.php:506
+msgid "Photo Albums"
 msgstr ""
 
-#: ../../include/items.php:3939
-#, php-format
-msgid "Privacy group: %s"
+#: ../../include/conversation.php:1657
+msgid "Files and Storage"
 msgstr ""
 
-#: ../../include/items.php:3951
-msgid "Connection not found."
+#: ../../include/conversation.php:1677 ../../include/conversation.php:1680
+#: ../../include/widgets.php:842
+msgid "Chatrooms"
 msgstr ""
 
-#: ../../include/items.php:4317
-msgid "profile photo"
+#: ../../include/conversation.php:1690 ../../include/nav.php:102
+msgid "Bookmarks"
 msgstr ""
 
-#: ../../include/oembed.php:326
-msgid "Embedded content"
+#: ../../include/conversation.php:1693
+msgid "Saved Bookmarks"
 msgstr ""
 
-#: ../../include/oembed.php:335
-msgid "Embedding disabled"
+#: ../../include/conversation.php:1703
+msgid "Manage Webpages"
 msgstr ""
 
-#: ../../include/api.php:1326
-msgid "Public Timeline"
-msgstr ""
+#: ../../include/conversation.php:1768
+msgctxt "noun"
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1771
+msgctxt "noun"
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1774
+msgctxt "noun"
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1777
+msgctxt "noun"
+msgid "Agree"
+msgid_plural "Agrees"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1780
+msgctxt "noun"
+msgid "Disagree"
+msgid_plural "Disagrees"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1783
+msgctxt "noun"
+msgid "Abstain"
+msgid_plural "Abstains"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../../include/group.php:26
 msgid ""
@@ -6939,7 +7218,7 @@ msgstr ""
 msgid "edit"
 msgstr ""
 
-#: ../../include/group.php:311 ../../include/features.php:83
+#: ../../include/group.php:311 ../../include/features.php:84
 msgid "Privacy Groups"
 msgstr ""
 
@@ -6959,21 +7238,67 @@ msgstr ""
 msgid "add"
 msgstr ""
 
-#: ../../include/zot.php:709
-msgid "Invalid data packet"
+#: ../../include/import.php:29
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
 msgstr ""
 
-#: ../../include/zot.php:725
-msgid "Unable to verify channel signature"
+#: ../../include/import.php:76
+msgid "Channel clone failed. Import failed."
 msgstr ""
 
-#: ../../include/zot.php:2373
+#: ../../include/items.php:902 ../../include/items.php:947
+msgid "(Unknown)"
+msgstr ""
+
+#: ../../include/items.php:1146
+msgid "Visible to anybody on the internet."
+msgstr ""
+
+#: ../../include/items.php:1148
+msgid "Visible to you only."
+msgstr ""
+
+#: ../../include/items.php:1150
+msgid "Visible to anybody in this network."
+msgstr ""
+
+#: ../../include/items.php:1152
+msgid "Visible to anybody authenticated."
+msgstr ""
+
+#: ../../include/items.php:1154
 #, php-format
-msgid "Unable to verify site signature for %s"
+msgid "Visible to anybody on %s."
 msgstr ""
 
-#: ../../include/zot.php:3718
-msgid "invalid target signature"
+#: ../../include/items.php:1156
+msgid "Visible to all connections."
+msgstr ""
+
+#: ../../include/items.php:1158
+msgid "Visible to approved connections."
+msgstr ""
+
+#: ../../include/items.php:1160
+msgid "Visible to specific connections."
+msgstr ""
+
+#: ../../include/items.php:3932
+msgid "Privacy group is empty."
+msgstr ""
+
+#: ../../include/items.php:3939
+#, php-format
+msgid "Privacy group: %s"
+msgstr ""
+
+#: ../../include/items.php:3951
+msgid "Connection not found."
+msgstr ""
+
+#: ../../include/items.php:4317
+msgid "profile photo"
 msgstr ""
 
 #: ../../include/selectors.php:30
@@ -7246,70 +7571,122 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
-#: ../../include/network.php:697
-msgid "view full size"
+#: ../../include/bookmarks.php:35
+#, php-format
+msgid "%1$s's bookmarks"
 msgstr ""
 
-#: ../../include/network.php:1911 ../../include/account.php:317
-#: ../../include/account.php:344 ../../include/account.php:404
-msgid "Administrator"
+#: ../../include/datetime.php:135
+msgid "Birthday"
 msgstr ""
 
-#: ../../include/network.php:1925
-msgid "No Subject"
+#: ../../include/datetime.php:137
+msgid "Age: "
 msgstr ""
 
-#: ../../include/network.php:2179 ../../include/network.php:2180
-msgid "Friendica"
+#: ../../include/datetime.php:139
+msgid "YYYY-MM-DD or MM-DD"
 msgstr ""
 
-#: ../../include/network.php:2181
-msgid "OStatus"
+#: ../../include/datetime.php:272 ../../boot.php:2486
+msgid "never"
 msgstr ""
 
-#: ../../include/network.php:2182
-msgid "GNU-Social"
+#: ../../include/datetime.php:278
+msgid "less than a second ago"
 msgstr ""
 
-#: ../../include/network.php:2183
-msgid "RSS/Atom"
+#: ../../include/datetime.php:296
+#, php-format
+msgctxt "e.g. 22 hours ago, 1 minute ago"
+msgid "%1$d %2$s ago"
 msgstr ""
 
-#: ../../include/network.php:2185
-msgid "Diaspora"
+#: ../../include/datetime.php:307
+msgctxt "relative_date"
+msgid "year"
+msgid_plural "years"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/datetime.php:310
+msgctxt "relative_date"
+msgid "month"
+msgid_plural "months"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/datetime.php:313
+msgctxt "relative_date"
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/datetime.php:316
+msgctxt "relative_date"
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/datetime.php:319
+msgctxt "relative_date"
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/datetime.php:322
+msgctxt "relative_date"
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/datetime.php:325
+msgctxt "relative_date"
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/datetime.php:562
+#, php-format
+msgid "%1$s's birthday"
 msgstr ""
 
-#: ../../include/network.php:2186
-msgid "Facebook"
+#: ../../include/datetime.php:563
+#, php-format
+msgid "Happy Birthday %1$s"
 msgstr ""
 
-#: ../../include/network.php:2187
-msgid "Zot"
+#: ../../include/follow.php:27
+msgid "Channel is blocked on this site."
 msgstr ""
 
-#: ../../include/network.php:2188
-msgid "LinkedIn"
+#: ../../include/follow.php:32
+msgid "Channel location missing."
 msgstr ""
 
-#: ../../include/network.php:2189
-msgid "XMPP/IM"
+#: ../../include/follow.php:81
+msgid "Response from remote channel was incomplete."
 msgstr ""
 
-#: ../../include/network.php:2190
-msgid "MySpace"
+#: ../../include/follow.php:98
+msgid "Channel was deleted and no longer exists."
 msgstr ""
 
-#: ../../include/bookmarks.php:35
-#, php-format
-msgid "%1$s's bookmarks"
+#: ../../include/follow.php:154 ../../include/follow.php:190
+msgid "Protocol disabled."
 msgstr ""
 
-#: ../../include/page_widgets.php:7
-msgid "New Page"
+#: ../../include/follow.php:178
+msgid "Channel discovery failed."
 msgstr ""
 
-#: ../../include/page_widgets.php:46
-msgid "Title"
+#: ../../include/follow.php:216
+msgid "Cannot connect to yourself."
 msgstr ""
 
 #: ../../include/features.php:48
@@ -7357,246 +7734,250 @@ msgid "Provide managed web pages on your channel"
 msgstr ""
 
 #: ../../include/features.php:55
+msgid "Provide a wiki for your channel"
+msgstr ""
+
+#: ../../include/features.php:56
 msgid "Hide Rating"
 msgstr ""
 
-#: ../../include/features.php:55
+#: ../../include/features.php:56
 msgid ""
 "Hide the rating buttons on your channel and profile pages. Note: People can "
 "still rate you somewhere else."
 msgstr ""
 
-#: ../../include/features.php:56
+#: ../../include/features.php:57
 msgid "Private Notes"
 msgstr ""
 
-#: ../../include/features.php:56
+#: ../../include/features.php:57
 msgid "Enables a tool to store notes and reminders (note: not encrypted)"
 msgstr ""
 
-#: ../../include/features.php:57
+#: ../../include/features.php:58
 msgid "Navigation Channel Select"
 msgstr ""
 
-#: ../../include/features.php:57
+#: ../../include/features.php:58
 msgid "Change channels directly from within the navigation dropdown menu"
 msgstr ""
 
-#: ../../include/features.php:58
+#: ../../include/features.php:59
 msgid "Photo Location"
 msgstr ""
 
-#: ../../include/features.php:58
+#: ../../include/features.php:59
 msgid "If location data is available on uploaded photos, link this to a map."
 msgstr ""
 
-#: ../../include/features.php:59
+#: ../../include/features.php:60
 msgid "Access Controlled Chatrooms"
 msgstr ""
 
-#: ../../include/features.php:59
+#: ../../include/features.php:60
 msgid "Provide chatrooms and chat services with access control."
 msgstr ""
 
-#: ../../include/features.php:60
+#: ../../include/features.php:61
 msgid "Smart Birthdays"
 msgstr ""
 
-#: ../../include/features.php:60
+#: ../../include/features.php:61
 msgid ""
 "Make birthday events timezone aware in case your friends are scattered "
 "across the planet."
 msgstr ""
 
-#: ../../include/features.php:61
+#: ../../include/features.php:62
 msgid "Expert Mode"
 msgstr ""
 
-#: ../../include/features.php:61
+#: ../../include/features.php:62
 msgid "Enable Expert Mode to provide advanced configuration options"
 msgstr ""
 
-#: ../../include/features.php:62
+#: ../../include/features.php:63
 msgid "Premium Channel"
 msgstr ""
 
-#: ../../include/features.php:62
+#: ../../include/features.php:63
 msgid ""
 "Allows you to set restrictions and terms on those that connect with your "
 "channel"
 msgstr ""
 
-#: ../../include/features.php:67
+#: ../../include/features.php:68
 msgid "Post Composition Features"
 msgstr ""
 
-#: ../../include/features.php:70
+#: ../../include/features.php:71
 msgid "Large Photos"
 msgstr ""
 
-#: ../../include/features.php:70
+#: ../../include/features.php:71
 msgid ""
 "Include large (1024px) photo thumbnails in posts. If not enabled, use small "
 "(640px) photo thumbnails"
 msgstr ""
 
-#: ../../include/features.php:71
+#: ../../include/features.php:72
 msgid "Automatically import channel content from other channels or feeds"
 msgstr ""
 
-#: ../../include/features.php:72
+#: ../../include/features.php:73
 msgid "Even More Encryption"
 msgstr ""
 
-#: ../../include/features.php:72
+#: ../../include/features.php:73
 msgid ""
 "Allow optional encryption of content end-to-end with a shared secret key"
 msgstr ""
 
-#: ../../include/features.php:73
+#: ../../include/features.php:74
 msgid "Enable Voting Tools"
 msgstr ""
 
-#: ../../include/features.php:73
+#: ../../include/features.php:74
 msgid "Provide a class of post which others can vote on"
 msgstr ""
 
-#: ../../include/features.php:74
+#: ../../include/features.php:75
 msgid "Delayed Posting"
 msgstr ""
 
-#: ../../include/features.php:74
+#: ../../include/features.php:75
 msgid "Allow posts to be published at a later date"
 msgstr ""
 
-#: ../../include/features.php:75
+#: ../../include/features.php:76
 msgid "Suppress Duplicate Posts/Comments"
 msgstr ""
 
-#: ../../include/features.php:75
+#: ../../include/features.php:76
 msgid ""
 "Prevent posts with identical content to be published with less than two "
 "minutes in between submissions."
 msgstr ""
 
-#: ../../include/features.php:81
+#: ../../include/features.php:82
 msgid "Network and Stream Filtering"
 msgstr ""
 
-#: ../../include/features.php:82
+#: ../../include/features.php:83
 msgid "Search by Date"
 msgstr ""
 
-#: ../../include/features.php:82
+#: ../../include/features.php:83
 msgid "Ability to select posts by date ranges"
 msgstr ""
 
-#: ../../include/features.php:83
+#: ../../include/features.php:84
 msgid "Enable management and selection of privacy groups"
 msgstr ""
 
-#: ../../include/features.php:84 ../../include/widgets.php:281
+#: ../../include/features.php:85 ../../include/widgets.php:281
 msgid "Saved Searches"
 msgstr ""
 
-#: ../../include/features.php:84
+#: ../../include/features.php:85
 msgid "Save search terms for re-use"
 msgstr ""
 
-#: ../../include/features.php:85
+#: ../../include/features.php:86
 msgid "Network Personal Tab"
 msgstr ""
 
-#: ../../include/features.php:85
+#: ../../include/features.php:86
 msgid "Enable tab to display only Network posts that you've interacted on"
 msgstr ""
 
-#: ../../include/features.php:86
+#: ../../include/features.php:87
 msgid "Network New Tab"
 msgstr ""
 
-#: ../../include/features.php:86
+#: ../../include/features.php:87
 msgid "Enable tab to display all new Network activity"
 msgstr ""
 
-#: ../../include/features.php:87
+#: ../../include/features.php:88
 msgid "Affinity Tool"
 msgstr ""
 
-#: ../../include/features.php:87
+#: ../../include/features.php:88
 msgid "Filter stream activity by depth of relationships"
 msgstr ""
 
-#: ../../include/features.php:88
+#: ../../include/features.php:89
 msgid "Connection Filtering"
 msgstr ""
 
-#: ../../include/features.php:88
+#: ../../include/features.php:89
 msgid "Filter incoming posts from connections based on keywords/content"
 msgstr ""
 
-#: ../../include/features.php:89
+#: ../../include/features.php:90
 msgid "Show channel suggestions"
 msgstr ""
 
-#: ../../include/features.php:94
+#: ../../include/features.php:95
 msgid "Post/Comment Tools"
 msgstr ""
 
-#: ../../include/features.php:95
+#: ../../include/features.php:96
 msgid "Community Tagging"
 msgstr ""
 
-#: ../../include/features.php:95
+#: ../../include/features.php:96
 msgid "Ability to tag existing posts"
 msgstr ""
 
-#: ../../include/features.php:96
+#: ../../include/features.php:97
 msgid "Post Categories"
 msgstr ""
 
-#: ../../include/features.php:96
+#: ../../include/features.php:97
 msgid "Add categories to your posts"
 msgstr ""
 
-#: ../../include/features.php:97
+#: ../../include/features.php:98
 msgid "Emoji Reactions"
 msgstr ""
 
-#: ../../include/features.php:97
+#: ../../include/features.php:98
 msgid "Add emoji reaction ability to posts"
 msgstr ""
 
-#: ../../include/features.php:98 ../../include/contact_widgets.php:53
-#: ../../include/widgets.php:310
+#: ../../include/features.php:99 ../../include/widgets.php:310
+#: ../../include/contact_widgets.php:53
 msgid "Saved Folders"
 msgstr ""
 
-#: ../../include/features.php:98
+#: ../../include/features.php:99
 msgid "Ability to file posts under folders"
 msgstr ""
 
-#: ../../include/features.php:99
+#: ../../include/features.php:100
 msgid "Dislike Posts"
 msgstr ""
 
-#: ../../include/features.php:99
+#: ../../include/features.php:100
 msgid "Ability to dislike posts/comments"
 msgstr ""
 
-#: ../../include/features.php:100
+#: ../../include/features.php:101
 msgid "Star Posts"
 msgstr ""
 
-#: ../../include/features.php:100
+#: ../../include/features.php:101
 msgid "Ability to mark special posts with a star indicator"
 msgstr ""
 
-#: ../../include/features.php:101
+#: ../../include/features.php:102
 msgid "Tag Cloud"
 msgstr ""
 
-#: ../../include/features.php:101
+#: ../../include/features.php:102
 msgid "Provide a personal tag cloud on your channel page"
 msgstr ""
 
@@ -7606,355 +7987,48 @@ msgid ""
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr ""
 
-#: ../../include/nav.php:82 ../../include/nav.php:113 ../../boot.php:1703
-msgid "Logout"
-msgstr ""
-
-#: ../../include/nav.php:82 ../../include/nav.php:113
-msgid "End this session"
-msgstr ""
-
-#: ../../include/nav.php:85 ../../include/nav.php:144
-msgid "Home"
-msgstr ""
-
-#: ../../include/nav.php:85
-msgid "Your posts and conversations"
-msgstr ""
-
-#: ../../include/nav.php:86
-msgid "Your profile page"
-msgstr ""
-
-#: ../../include/nav.php:88
-msgid "Manage/Edit profiles"
-msgstr ""
-
-#: ../../include/nav.php:90 ../../include/channel.php:928
-msgid "Edit Profile"
-msgstr ""
-
-#: ../../include/nav.php:90
-msgid "Edit your profile"
-msgstr ""
-
-#: ../../include/nav.php:92
-msgid "Your photos"
-msgstr ""
-
-#: ../../include/nav.php:93
-msgid "Your files"
-msgstr ""
-
-#: ../../include/nav.php:96
-msgid "Your chatrooms"
-msgstr ""
-
-#: ../../include/nav.php:102 ../../include/conversation.php:1690
-msgid "Bookmarks"
-msgstr ""
-
-#: ../../include/nav.php:102
-msgid "Your bookmarks"
-msgstr ""
-
-#: ../../include/nav.php:106
-msgid "Your webpages"
-msgstr ""
-
-#: ../../include/nav.php:110
-msgid "Sign in"
-msgstr ""
-
-#: ../../include/nav.php:127
-#, php-format
-msgid "%s - click to logout"
-msgstr ""
-
-#: ../../include/nav.php:130
-msgid "Remote authentication"
-msgstr ""
-
-#: ../../include/nav.php:130
-msgid "Click to authenticate to your home hub"
-msgstr ""
-
-#: ../../include/nav.php:144
-msgid "Home Page"
-msgstr ""
-
-#: ../../include/nav.php:147
-msgid "Create an account"
-msgstr ""
-
-#: ../../include/nav.php:159
-msgid "Help and documentation"
-msgstr ""
-
-#: ../../include/nav.php:163
-msgid "Applications, utilities, links, games"
-msgstr ""
-
-#: ../../include/nav.php:165
-msgid "Search site @name, #tag, ?docs, content"
-msgstr ""
-
-#: ../../include/nav.php:167
-msgid "Channel Directory"
-msgstr ""
-
-#: ../../include/nav.php:179
-msgid "Your grid"
-msgstr ""
-
-#: ../../include/nav.php:180
-msgid "Mark all grid notifications seen"
-msgstr ""
-
-#: ../../include/nav.php:182
-msgid "Channel home"
-msgstr ""
-
-#: ../../include/nav.php:183
-msgid "Mark all channel notifications seen"
-msgstr ""
-
-#: ../../include/nav.php:189
-msgid "Notices"
-msgstr ""
-
-#: ../../include/nav.php:189
-msgid "Notifications"
-msgstr ""
-
-#: ../../include/nav.php:190
-msgid "See all notifications"
-msgstr ""
-
-#: ../../include/nav.php:193
-msgid "Private mail"
-msgstr ""
-
-#: ../../include/nav.php:194
-msgid "See all private messages"
-msgstr ""
-
-#: ../../include/nav.php:195
-msgid "Mark all private messages seen"
-msgstr ""
-
-#: ../../include/nav.php:196 ../../include/widgets.php:658
-msgid "Inbox"
-msgstr ""
-
-#: ../../include/nav.php:197 ../../include/widgets.php:663
-msgid "Outbox"
-msgstr ""
-
-#: ../../include/nav.php:198 ../../include/widgets.php:668
-msgid "New Message"
-msgstr ""
-
-#: ../../include/nav.php:201
-msgid "Event Calendar"
-msgstr ""
-
-#: ../../include/nav.php:202
-msgid "See all events"
-msgstr ""
-
-#: ../../include/nav.php:203
-msgid "Mark all events seen"
-msgstr ""
-
-#: ../../include/nav.php:206
-msgid "Manage Your Channels"
-msgstr ""
-
-#: ../../include/nav.php:208
-msgid "Account/Channel Settings"
-msgstr ""
-
-#: ../../include/nav.php:216 ../../include/widgets.php:1489
-msgid "Admin"
-msgstr ""
-
-#: ../../include/nav.php:216
-msgid "Site Setup and Configuration"
-msgstr ""
-
-#: ../../include/nav.php:247 ../../include/conversation.php:854
-msgid "Loading..."
-msgstr ""
-
-#: ../../include/nav.php:252
-msgid "@name, #tag, ?doc, content"
-msgstr ""
-
-#: ../../include/nav.php:253
-msgid "Please wait..."
-msgstr ""
-
-#: ../../include/datetime.php:135
-msgid "Birthday"
-msgstr ""
-
-#: ../../include/datetime.php:137
-msgid "Age: "
-msgstr ""
-
-#: ../../include/datetime.php:139
-msgid "YYYY-MM-DD or MM-DD"
-msgstr ""
-
-#: ../../include/datetime.php:272 ../../boot.php:2477
-msgid "never"
-msgstr ""
-
-#: ../../include/datetime.php:278
-msgid "less than a second ago"
-msgstr ""
-
-#: ../../include/datetime.php:296
-#, php-format
-msgctxt "e.g. 22 hours ago, 1 minute ago"
-msgid "%1$d %2$s ago"
-msgstr ""
-
-#: ../../include/datetime.php:307
-msgctxt "relative_date"
-msgid "year"
-msgid_plural "years"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/datetime.php:310
-msgctxt "relative_date"
-msgid "month"
-msgid_plural "months"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/datetime.php:313
-msgctxt "relative_date"
-msgid "week"
-msgid_plural "weeks"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/datetime.php:316
-msgctxt "relative_date"
-msgid "day"
-msgid_plural "days"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/datetime.php:319
-msgctxt "relative_date"
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/datetime.php:322
-msgctxt "relative_date"
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/datetime.php:325
-msgctxt "relative_date"
-msgid "second"
-msgid_plural "seconds"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/datetime.php:562
-#, php-format
-msgid "%1$s's birthday"
-msgstr ""
-
-#: ../../include/datetime.php:563
-#, php-format
-msgid "Happy Birthday %1$s"
-msgstr ""
-
-#: ../../include/account.php:28
-msgid "Not a valid email address"
-msgstr ""
-
-#: ../../include/account.php:30
-msgid "Your email domain is not among those allowed on this site"
-msgstr ""
-
-#: ../../include/account.php:36
-msgid "Your email address is already registered at this site."
-msgstr ""
-
-#: ../../include/account.php:68
-msgid "An invitation is required."
-msgstr ""
-
-#: ../../include/account.php:72
-msgid "Invitation could not be verified."
-msgstr ""
-
-#: ../../include/account.php:122
-msgid "Please enter the required information."
+#: ../../include/api.php:1326
+msgid "Public Timeline"
 msgstr ""
 
-#: ../../include/account.php:189
-msgid "Failed to store account information."
+#: ../../include/page_widgets.php:7
+msgid "New Page"
 msgstr ""
 
-#: ../../include/account.php:249
-#, php-format
-msgid "Registration confirmation for %s"
+#: ../../include/page_widgets.php:46
+msgid "Title"
 msgstr ""
 
-#: ../../include/account.php:315
+#: ../../include/photos.php:114
 #, php-format
-msgid "Registration request at %s"
+msgid "Image exceeds website size limit of %lu bytes"
 msgstr ""
 
-#: ../../include/account.php:339
-msgid "your registration password"
+#: ../../include/photos.php:121
+msgid "Image file is empty."
 msgstr ""
 
-#: ../../include/account.php:342 ../../include/account.php:402
-#, php-format
-msgid "Registration details for %s"
+#: ../../include/photos.php:259
+msgid "Photo storage failed."
 msgstr ""
 
-#: ../../include/account.php:414
-msgid "Account approved."
+#: ../../include/photos.php:299
+msgid "a new photo"
 msgstr ""
 
-#: ../../include/account.php:454
+#: ../../include/photos.php:303
 #, php-format
-msgid "Registration revoked for %s"
-msgstr ""
-
-#: ../../include/account.php:506
-msgid "Account verified. Please login."
-msgstr ""
-
-#: ../../include/account.php:723 ../../include/account.php:725
-msgid "Click here to upgrade."
-msgstr ""
-
-#: ../../include/account.php:731
-msgid "This action exceeds the limits set by your subscription plan."
+msgctxt "photo_upload"
+msgid "%1$s posted %2$s to %3$s"
 msgstr ""
 
-#: ../../include/account.php:736
-msgid "This action is not available under your subscription plan."
+#: ../../include/photos.php:510
+msgid "Upload New Photos"
 msgstr ""
 
 #: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270
-#: ../../include/contact_widgets.php:91 ../../include/widgets.php:46
-#: ../../include/widgets.php:429
+#: ../../include/widgets.php:46 ../../include/widgets.php:429
+#: ../../include/contact_widgets.php:91
 msgid "Categories"
 msgstr ""
 
@@ -7990,81 +8064,6 @@ msgstr ""
 msgid "dislikes"
 msgstr ""
 
-#: ../../include/follow.php:27
-msgid "Channel is blocked on this site."
-msgstr ""
-
-#: ../../include/follow.php:32
-msgid "Channel location missing."
-msgstr ""
-
-#: ../../include/follow.php:81
-msgid "Response from remote channel was incomplete."
-msgstr ""
-
-#: ../../include/follow.php:98
-msgid "Channel was deleted and no longer exists."
-msgstr ""
-
-#: ../../include/follow.php:154 ../../include/follow.php:190
-msgid "Protocol disabled."
-msgstr ""
-
-#: ../../include/follow.php:178
-msgid "Channel discovery failed."
-msgstr ""
-
-#: ../../include/follow.php:216
-msgid "Cannot connect to yourself."
-msgstr ""
-
-#: ../../include/bbcode.php:123 ../../include/bbcode.php:866
-#: ../../include/bbcode.php:869 ../../include/bbcode.php:874
-#: ../../include/bbcode.php:877 ../../include/bbcode.php:880
-#: ../../include/bbcode.php:883 ../../include/bbcode.php:888
-#: ../../include/bbcode.php:891 ../../include/bbcode.php:896
-#: ../../include/bbcode.php:899 ../../include/bbcode.php:902
-#: ../../include/bbcode.php:905
-msgid "Image/photo"
-msgstr ""
-
-#: ../../include/bbcode.php:162 ../../include/bbcode.php:916
-msgid "Encrypted content"
-msgstr ""
-
-#: ../../include/bbcode.php:178
-#, php-format
-msgid "Install %s element: "
-msgstr ""
-
-#: ../../include/bbcode.php:182
-#, php-format
-msgid ""
-"This post contains an installable %s element, however you lack permissions "
-"to install it on this site."
-msgstr ""
-
-#: ../../include/bbcode.php:261
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
-msgstr ""
-
-#: ../../include/bbcode.php:338 ../../include/bbcode.php:346
-msgid "Click to open/close"
-msgstr ""
-
-#: ../../include/bbcode.php:346
-msgid "spoiler"
-msgstr ""
-
-#: ../../include/bbcode.php:607
-msgid "Different viewers will see this text differently"
-msgstr ""
-
-#: ../../include/bbcode.php:854
-msgid "$1 wrote:"
-msgstr ""
-
 #: ../../include/text.php:404
 msgid "prev"
 msgstr ""
@@ -8102,11 +8101,6 @@ msgstr ""
 msgid "poke"
 msgstr ""
 
-#: ../../include/text.php:1009 ../../include/text.php:1014
-#: ../../include/conversation.php:243
-msgid "poked"
-msgstr ""
-
 #: ../../include/text.php:1015
 msgid "ping"
 msgstr ""
@@ -8355,340 +8349,272 @@ msgstr ""
 msgid "Pages"
 msgstr ""
 
-#: ../../include/activities.php:41
-msgid " and "
+#: ../../include/widgets.php:103
+msgid "System"
 msgstr ""
 
-#: ../../include/activities.php:49
-msgid "public profile"
+#: ../../include/widgets.php:106
+msgid "New App"
 msgstr ""
 
-#: ../../include/activities.php:58
-#, php-format
-msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+#: ../../include/widgets.php:154
+msgid "Suggestions"
 msgstr ""
 
-#: ../../include/activities.php:59
-#, php-format
-msgid "Visit %1$s's %2$s"
+#: ../../include/widgets.php:155
+msgid "See more..."
 msgstr ""
 
-#: ../../include/activities.php:62
+#: ../../include/widgets.php:175
 #, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
+msgid "You have %1$.0f of %2$.0f allowed connections."
 msgstr ""
 
-#: ../../include/connections.php:95
-msgid "New window"
+#: ../../include/widgets.php:181
+msgid "Add New Connection"
 msgstr ""
 
-#: ../../include/connections.php:96
-msgid "Open the selected location in a different window or browser tab"
+#: ../../include/widgets.php:182
+msgid "Enter channel address"
 msgstr ""
 
-#: ../../include/connections.php:214
-#, php-format
-msgid "User '%s' deleted"
+#: ../../include/widgets.php:183
+msgid "Examples: bob@example.com, https://example.com/barbara"
 msgstr ""
 
-#: ../../include/conversation.php:204
-#, php-format
-msgid "%1$s is now connected with %2$s"
+#: ../../include/widgets.php:199
+msgid "Notes"
 msgstr ""
 
-#: ../../include/conversation.php:239
-#, php-format
-msgid "%1$s poked %2$s"
+#: ../../include/widgets.php:273
+msgid "Remove term"
 msgstr ""
 
-#: ../../include/conversation.php:694
-#, php-format
-msgid "View %s's profile @ %s"
+#: ../../include/widgets.php:313 ../../include/widgets.php:432
+#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94
+msgid "Everything"
 msgstr ""
 
-#: ../../include/conversation.php:713
-msgid "Categories:"
+#: ../../include/widgets.php:354
+msgid "Archives"
 msgstr ""
 
-#: ../../include/conversation.php:714
-msgid "Filed under:"
+#: ../../include/widgets.php:516
+msgid "Refresh"
 msgstr ""
 
-#: ../../include/conversation.php:741
-msgid "View in context"
+#: ../../include/widgets.php:556
+msgid "Account settings"
 msgstr ""
 
-#: ../../include/conversation.php:850
-msgid "remove"
+#: ../../include/widgets.php:562
+msgid "Channel settings"
 msgstr ""
 
-#: ../../include/conversation.php:855
-msgid "Delete Selected Items"
+#: ../../include/widgets.php:571
+msgid "Additional features"
 msgstr ""
 
-#: ../../include/conversation.php:951
-msgid "View Source"
+#: ../../include/widgets.php:578
+msgid "Feature/Addon settings"
 msgstr ""
 
-#: ../../include/conversation.php:952
-msgid "Follow Thread"
+#: ../../include/widgets.php:584
+msgid "Display settings"
 msgstr ""
 
-#: ../../include/conversation.php:953
-msgid "Unfollow Thread"
+#: ../../include/widgets.php:591
+msgid "Manage locations"
 msgstr ""
 
-#: ../../include/conversation.php:958
-msgid "Activity/Posts"
+#: ../../include/widgets.php:600
+msgid "Export channel"
 msgstr ""
 
-#: ../../include/conversation.php:960
-msgid "Edit Connection"
+#: ../../include/widgets.php:607
+msgid "Connected apps"
 msgstr ""
 
-#: ../../include/conversation.php:961
-msgid "Message"
+#: ../../include/widgets.php:622
+msgid "Premium Channel Settings"
 msgstr ""
 
-#: ../../include/conversation.php:1078
-#, php-format
-msgid "%s likes this."
+#: ../../include/widgets.php:651
+msgid "Private Mail Menu"
 msgstr ""
 
-#: ../../include/conversation.php:1078
-#, php-format
-msgid "%s doesn't like this."
+#: ../../include/widgets.php:653
+msgid "Combined View"
 msgstr ""
 
-#: ../../include/conversation.php:1082
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this."
-msgid_plural "<span  %1$s>%2$d people</span> like this."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1084
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this."
-msgid_plural "<span  %1$s>%2$d people</span> don't like this."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1090
-msgid "and"
+#: ../../include/widgets.php:658 ../../include/nav.php:198
+msgid "Inbox"
 msgstr ""
 
-#: ../../include/conversation.php:1093
-#, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1094
-#, php-format
-msgid "%s like this."
+#: ../../include/widgets.php:663 ../../include/nav.php:199
+msgid "Outbox"
 msgstr ""
 
-#: ../../include/conversation.php:1094
-#, php-format
-msgid "%s don't like this."
+#: ../../include/widgets.php:668 ../../include/nav.php:200
+msgid "New Message"
 msgstr ""
 
-#: ../../include/conversation.php:1133
-msgid "Set your location"
+#: ../../include/widgets.php:685 ../../include/widgets.php:697
+msgid "Conversations"
 msgstr ""
 
-#: ../../include/conversation.php:1134
-msgid "Clear browser location"
+#: ../../include/widgets.php:689
+msgid "Received Messages"
 msgstr ""
 
-#: ../../include/conversation.php:1150
-msgid "Embed image from photo albums"
+#: ../../include/widgets.php:693
+msgid "Sent Messages"
 msgstr ""
 
-#: ../../include/conversation.php:1182
-msgid "Tag term:"
+#: ../../include/widgets.php:707
+msgid "No messages."
 msgstr ""
 
-#: ../../include/conversation.php:1183
-msgid "Where are you right now?"
+#: ../../include/widgets.php:725
+msgid "Delete conversation"
 msgstr ""
 
-#: ../../include/conversation.php:1186
-msgid "Choose images to embed"
+#: ../../include/widgets.php:751
+msgid "Events Menu"
 msgstr ""
 
-#: ../../include/conversation.php:1187
-msgid "Choose an album"
+#: ../../include/widgets.php:752
+msgid "Day View"
 msgstr ""
 
-#: ../../include/conversation.php:1188
-msgid "Choose a different album..."
+#: ../../include/widgets.php:753
+msgid "Week View"
 msgstr ""
 
-#: ../../include/conversation.php:1189
-msgid "Error getting album list"
+#: ../../include/widgets.php:754
+msgid "Month View"
 msgstr ""
 
-#: ../../include/conversation.php:1190
-msgid "Error getting photo link"
+#: ../../include/widgets.php:766
+msgid "Events Tools"
 msgstr ""
 
-#: ../../include/conversation.php:1191
-msgid "Error getting album"
+#: ../../include/widgets.php:767
+msgid "Export Calendar"
 msgstr ""
 
-#: ../../include/conversation.php:1221
-msgid "Page link name"
+#: ../../include/widgets.php:768
+msgid "Import Calendar"
 msgstr ""
 
-#: ../../include/conversation.php:1224
-msgid "Post as"
+#: ../../include/widgets.php:846
+msgid "Overview"
 msgstr ""
 
-#: ../../include/conversation.php:1234
-msgid "Embed an image from your albums"
+#: ../../include/widgets.php:853
+msgid "Chat Members"
 msgstr ""
 
-#: ../../include/conversation.php:1236 ../../include/conversation.php:1273
-msgid "OK"
+#: ../../include/widgets.php:875
+msgid "Wiki List"
 msgstr ""
 
-#: ../../include/conversation.php:1238
-msgid "Toggle voting"
+#: ../../include/widgets.php:913
+msgid "Wiki Pages"
 msgstr ""
 
-#: ../../include/conversation.php:1246
-msgid "Categories (optional, comma-separated list)"
+#: ../../include/widgets.php:948
+msgid "Bookmarked Chatrooms"
 msgstr ""
 
-#: ../../include/conversation.php:1269
-msgid "Set publish date"
+#: ../../include/widgets.php:971
+msgid "Suggested Chatrooms"
 msgstr ""
 
-#: ../../include/conversation.php:1518
-msgid "Discover"
+#: ../../include/widgets.php:1117 ../../include/widgets.php:1229
+msgid "photo/image"
 msgstr ""
 
-#: ../../include/conversation.php:1521
-msgid "Imported public streams"
+#: ../../include/widgets.php:1172
+msgid "Click to show more"
 msgstr ""
 
-#: ../../include/conversation.php:1526
-msgid "Commented Order"
+#: ../../include/widgets.php:1323
+msgid "Rating Tools"
 msgstr ""
 
-#: ../../include/conversation.php:1529
-msgid "Sort by Comment Date"
+#: ../../include/widgets.php:1327 ../../include/widgets.php:1329
+msgid "Rate Me"
 msgstr ""
 
-#: ../../include/conversation.php:1533
-msgid "Posted Order"
+#: ../../include/widgets.php:1332
+msgid "View Ratings"
 msgstr ""
 
-#: ../../include/conversation.php:1536
-msgid "Sort by Post Date"
+#: ../../include/widgets.php:1389
+msgid "Forums"
 msgstr ""
 
-#: ../../include/conversation.php:1544
-msgid "Posts that mention or involve you"
+#: ../../include/widgets.php:1418
+msgid "Tasks"
 msgstr ""
 
-#: ../../include/conversation.php:1553
-msgid "Activity Stream - by date"
+#: ../../include/widgets.php:1427
+msgid "Documentation"
 msgstr ""
 
-#: ../../include/conversation.php:1559
-msgid "Starred"
+#: ../../include/widgets.php:1429
+msgid "Project/Site Information"
 msgstr ""
 
-#: ../../include/conversation.php:1562
-msgid "Favourite Posts"
+#: ../../include/widgets.php:1430
+msgid "For Members"
 msgstr ""
 
-#: ../../include/conversation.php:1569
-msgid "Spam"
+#: ../../include/widgets.php:1431
+msgid "For Administrators"
 msgstr ""
 
-#: ../../include/conversation.php:1572
-msgid "Posts flagged as SPAM"
+#: ../../include/widgets.php:1432
+msgid "For Developers"
 msgstr ""
 
-#: ../../include/conversation.php:1629
-msgid "Status Messages and Posts"
+#: ../../include/widgets.php:1456 ../../include/widgets.php:1494
+msgid "Member registrations waiting for confirmation"
 msgstr ""
 
-#: ../../include/conversation.php:1638
-msgid "About"
+#: ../../include/widgets.php:1462
+msgid "Inspect queue"
 msgstr ""
 
-#: ../../include/conversation.php:1641
-msgid "Profile Details"
+#: ../../include/widgets.php:1464
+msgid "DB updates"
 msgstr ""
 
-#: ../../include/conversation.php:1650 ../../include/photos.php:506
-msgid "Photo Albums"
+#: ../../include/widgets.php:1489 ../../include/nav.php:218
+msgid "Admin"
 msgstr ""
 
-#: ../../include/conversation.php:1657
-msgid "Files and Storage"
+#: ../../include/widgets.php:1490
+msgid "Plugin Features"
 msgstr ""
 
-#: ../../include/conversation.php:1677 ../../include/conversation.php:1680
-#: ../../include/widgets.php:842
-msgid "Chatrooms"
+#: ../../include/zot.php:709
+msgid "Invalid data packet"
 msgstr ""
 
-#: ../../include/conversation.php:1693
-msgid "Saved Bookmarks"
+#: ../../include/zot.php:725
+msgid "Unable to verify channel signature"
 msgstr ""
 
-#: ../../include/conversation.php:1703
-msgid "Manage Webpages"
+#: ../../include/zot.php:2373
+#, php-format
+msgid "Unable to verify site signature for %s"
 msgstr ""
 
-#: ../../include/conversation.php:1762
-msgctxt "noun"
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1765
-msgctxt "noun"
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1768
-msgctxt "noun"
-msgid "Undecided"
-msgid_plural "Undecided"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1771
-msgctxt "noun"
-msgid "Agree"
-msgid_plural "Agrees"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1774
-msgctxt "noun"
-msgid "Disagree"
-msgid_plural "Disagrees"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/conversation.php:1777
-msgctxt "noun"
-msgid "Abstain"
-msgid_plural "Abstains"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/zot.php:3718
+msgid "invalid target signature"
+msgstr ""
 
 #: ../../include/attach.php:247 ../../include/attach.php:333
 msgid "Item was not found."
@@ -8752,31 +8678,305 @@ msgstr ""
 msgid "Empty path"
 msgstr ""
 
-#: ../../include/photos.php:114
+#: ../../include/bbcode.php:123 ../../include/bbcode.php:878
+#: ../../include/bbcode.php:881 ../../include/bbcode.php:886
+#: ../../include/bbcode.php:889 ../../include/bbcode.php:892
+#: ../../include/bbcode.php:895 ../../include/bbcode.php:900
+#: ../../include/bbcode.php:903 ../../include/bbcode.php:908
+#: ../../include/bbcode.php:911 ../../include/bbcode.php:914
+#: ../../include/bbcode.php:917
+msgid "Image/photo"
+msgstr ""
+
+#: ../../include/bbcode.php:162 ../../include/bbcode.php:928
+msgid "Encrypted content"
+msgstr ""
+
+#: ../../include/bbcode.php:178
 #, php-format
-msgid "Image exceeds website size limit of %lu bytes"
+msgid "Install %s element: "
 msgstr ""
 
-#: ../../include/photos.php:121
-msgid "Image file is empty."
+#: ../../include/bbcode.php:182
+#, php-format
+msgid ""
+"This post contains an installable %s element, however you lack permissions "
+"to install it on this site."
 msgstr ""
 
-#: ../../include/photos.php:259
-msgid "Photo storage failed."
+#: ../../include/bbcode.php:261
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
 msgstr ""
 
-#: ../../include/photos.php:299
-msgid "a new photo"
+#: ../../include/bbcode.php:338 ../../include/bbcode.php:346
+msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/photos.php:303
+#: ../../include/bbcode.php:346
+msgid "spoiler"
+msgstr ""
+
+#: ../../include/bbcode.php:619
+msgid "Different viewers will see this text differently"
+msgstr ""
+
+#: ../../include/bbcode.php:866
+msgid "$1 wrote:"
+msgstr ""
+
+#: ../../include/channel.php:32
+msgid "Unable to obtain identity information from database"
+msgstr ""
+
+#: ../../include/channel.php:66
+msgid "Empty name"
+msgstr ""
+
+#: ../../include/channel.php:69
+msgid "Name too long"
+msgstr ""
+
+#: ../../include/channel.php:180
+msgid "No account identifier"
+msgstr ""
+
+#: ../../include/channel.php:192
+msgid "Nickname is required."
+msgstr ""
+
+#: ../../include/channel.php:206
+msgid "Reserved nickname. Please choose another."
+msgstr ""
+
+#: ../../include/channel.php:211
+msgid ""
+"Nickname has unsupported characters or is already being used on this site."
+msgstr ""
+
+#: ../../include/channel.php:287
+msgid "Unable to retrieve created identity"
+msgstr ""
+
+#: ../../include/channel.php:345
+msgid "Default Profile"
+msgstr ""
+
+#: ../../include/channel.php:815
+msgid "Requested channel is not available."
+msgstr ""
+
+#: ../../include/channel.php:962
+msgid "Create New Profile"
+msgstr ""
+
+#: ../../include/channel.php:965 ../../include/nav.php:90
+msgid "Edit Profile"
+msgstr ""
+
+#: ../../include/channel.php:982
+msgid "Visible to everybody"
+msgstr ""
+
+#: ../../include/channel.php:1055 ../../include/channel.php:1167
+msgid "Gender:"
+msgstr ""
+
+#: ../../include/channel.php:1056 ../../include/channel.php:1211
+msgid "Status:"
+msgstr ""
+
+#: ../../include/channel.php:1057 ../../include/channel.php:1222
+msgid "Homepage:"
+msgstr ""
+
+#: ../../include/channel.php:1058
+msgid "Online Now"
+msgstr ""
+
+#: ../../include/channel.php:1172
+msgid "Like this channel"
+msgstr ""
+
+#: ../../include/channel.php:1196
+msgid "j F, Y"
+msgstr ""
+
+#: ../../include/channel.php:1197
+msgid "j F"
+msgstr ""
+
+#: ../../include/channel.php:1204
+msgid "Birthday:"
+msgstr ""
+
+#: ../../include/channel.php:1217
 #, php-format
-msgctxt "photo_upload"
-msgid "%1$s posted %2$s to %3$s"
+msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/photos.php:510
-msgid "Upload New Photos"
+#: ../../include/channel.php:1220
+msgid "Sexual Preference:"
+msgstr ""
+
+#: ../../include/channel.php:1226
+msgid "Tags:"
+msgstr ""
+
+#: ../../include/channel.php:1228
+msgid "Political Views:"
+msgstr ""
+
+#: ../../include/channel.php:1230
+msgid "Religion:"
+msgstr ""
+
+#: ../../include/channel.php:1234
+msgid "Hobbies/Interests:"
+msgstr ""
+
+#: ../../include/channel.php:1236
+msgid "Likes:"
+msgstr ""
+
+#: ../../include/channel.php:1238
+msgid "Dislikes:"
+msgstr ""
+
+#: ../../include/channel.php:1240
+msgid "Contact information and Social Networks:"
+msgstr ""
+
+#: ../../include/channel.php:1242
+msgid "My other channels:"
+msgstr ""
+
+#: ../../include/channel.php:1244
+msgid "Musical interests:"
+msgstr ""
+
+#: ../../include/channel.php:1246
+msgid "Books, literature:"
+msgstr ""
+
+#: ../../include/channel.php:1248
+msgid "Television:"
+msgstr ""
+
+#: ../../include/channel.php:1250
+msgid "Film/dance/culture/entertainment:"
+msgstr ""
+
+#: ../../include/channel.php:1252
+msgid "Love/Romance:"
+msgstr ""
+
+#: ../../include/channel.php:1254
+msgid "Work/employment:"
+msgstr ""
+
+#: ../../include/channel.php:1256
+msgid "School/education:"
+msgstr ""
+
+#: ../../include/channel.php:1277
+msgid "Like this thing"
+msgstr ""
+
+#: ../../include/activities.php:41
+msgid " and "
+msgstr ""
+
+#: ../../include/activities.php:49
+msgid "public profile"
+msgstr ""
+
+#: ../../include/activities.php:58
+#, php-format
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+msgstr ""
+
+#: ../../include/activities.php:59
+#, php-format
+msgid "Visit %1$s's %2$s"
+msgstr ""
+
+#: ../../include/activities.php:62
+#, php-format
+msgid "%1$s has an updated %2$s, changing %3$s."
+msgstr ""
+
+#: ../../include/account.php:28
+msgid "Not a valid email address"
+msgstr ""
+
+#: ../../include/account.php:30
+msgid "Your email domain is not among those allowed on this site"
+msgstr ""
+
+#: ../../include/account.php:36
+msgid "Your email address is already registered at this site."
+msgstr ""
+
+#: ../../include/account.php:68
+msgid "An invitation is required."
+msgstr ""
+
+#: ../../include/account.php:72
+msgid "Invitation could not be verified."
+msgstr ""
+
+#: ../../include/account.php:122
+msgid "Please enter the required information."
+msgstr ""
+
+#: ../../include/account.php:189
+msgid "Failed to store account information."
+msgstr ""
+
+#: ../../include/account.php:249
+#, php-format
+msgid "Registration confirmation for %s"
+msgstr ""
+
+#: ../../include/account.php:315
+#, php-format
+msgid "Registration request at %s"
+msgstr ""
+
+#: ../../include/account.php:317 ../../include/account.php:344
+#: ../../include/account.php:404 ../../include/network.php:1930
+msgid "Administrator"
+msgstr ""
+
+#: ../../include/account.php:339
+msgid "your registration password"
+msgstr ""
+
+#: ../../include/account.php:342 ../../include/account.php:402
+#, php-format
+msgid "Registration details for %s"
+msgstr ""
+
+#: ../../include/account.php:414
+msgid "Account approved."
+msgstr ""
+
+#: ../../include/account.php:454
+#, php-format
+msgid "Registration revoked for %s"
+msgstr ""
+
+#: ../../include/account.php:739 ../../include/account.php:741
+msgid "Click here to upgrade."
+msgstr ""
+
+#: ../../include/account.php:747
+msgid "This action exceeds the limits set by your subscription plan."
+msgstr ""
+
+#: ../../include/account.php:752
+msgid "This action is not available under your subscription plan."
 msgstr ""
 
 #: ../../include/js_strings.php:5
@@ -8784,15 +8984,18 @@ msgid "Delete this item?"
 msgstr ""
 
 #: ../../include/js_strings.php:8
-msgid "[-] show less"
+#, php-format
+msgid "%s show less"
 msgstr ""
 
 #: ../../include/js_strings.php:9
-msgid "[+] expand"
+#, php-format
+msgid "%s expand"
 msgstr ""
 
 #: ../../include/js_strings.php:10
-msgid "[-] collapse"
+#, php-format
+msgid "%s collapse"
 msgstr ""
 
 #: ../../include/js_strings.php:11
@@ -9023,523 +9226,356 @@ msgctxt "calendar"
 msgid "All day"
 msgstr ""
 
-#: ../../include/PermissionDescription.php:116
-msgid "Public"
-msgstr ""
-
-#: ../../include/PermissionDescription.php:117
-msgid "Anybody in the $Projectname network"
-msgstr ""
-
-#: ../../include/PermissionDescription.php:118
-#, php-format
-msgid "Any account on %s"
-msgstr ""
-
-#: ../../include/PermissionDescription.php:119
-msgid "Any of my connections"
-msgstr ""
-
-#: ../../include/PermissionDescription.php:120
-msgid "Only connections I specifically allow"
-msgstr ""
-
-#: ../../include/PermissionDescription.php:121
-msgid "Anybody authenticated (could include visitors from other networks)"
-msgstr ""
-
-#: ../../include/PermissionDescription.php:122
-msgid "Any connections including those who haven't yet been approved"
+#: ../../include/nav.php:82 ../../include/nav.php:115 ../../boot.php:1703
+msgid "Logout"
 msgstr ""
 
-#: ../../include/PermissionDescription.php:161
-msgid ""
-"This is your default setting for the audience of your normal stream, and "
-"posts."
+#: ../../include/nav.php:82 ../../include/nav.php:115
+msgid "End this session"
 msgstr ""
 
-#: ../../include/PermissionDescription.php:162
-msgid ""
-"This is your default setting for who can view your default channel profile"
+#: ../../include/nav.php:85 ../../include/nav.php:146
+msgid "Home"
 msgstr ""
 
-#: ../../include/PermissionDescription.php:163
-msgid "This is your default setting for who can view your connections"
+#: ../../include/nav.php:85
+msgid "Your posts and conversations"
 msgstr ""
 
-#: ../../include/PermissionDescription.php:164
-msgid ""
-"This is your default setting for who can view your file storage and photos"
+#: ../../include/nav.php:86
+msgid "Your profile page"
 msgstr ""
 
-#: ../../include/PermissionDescription.php:165
-msgid "This is your default setting for the audience of your webpages"
+#: ../../include/nav.php:88
+msgid "Manage/Edit profiles"
 msgstr ""
 
-#: ../../include/contact_widgets.php:11
-#, php-format
-msgid "%d invitation available"
-msgid_plural "%d invitations available"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/contact_widgets.php:19
-msgid "Find Channels"
+#: ../../include/nav.php:90
+msgid "Edit your profile"
 msgstr ""
 
-#: ../../include/contact_widgets.php:20
-msgid "Enter name or interest"
+#: ../../include/nav.php:92
+msgid "Your photos"
 msgstr ""
 
-#: ../../include/contact_widgets.php:21
-msgid "Connect/Follow"
+#: ../../include/nav.php:93
+msgid "Your files"
 msgstr ""
 
-#: ../../include/contact_widgets.php:22
-msgid "Examples: Robert Morgenstein, Fishing"
+#: ../../include/nav.php:96
+msgid "Your chatrooms"
 msgstr ""
 
-#: ../../include/contact_widgets.php:26
-msgid "Random Profile"
+#: ../../include/nav.php:102
+msgid "Your bookmarks"
 msgstr ""
 
-#: ../../include/contact_widgets.php:27
-msgid "Invite Friends"
+#: ../../include/nav.php:106
+msgid "Your webpages"
 msgstr ""
 
-#: ../../include/contact_widgets.php:29
-msgid "Advanced example: name=fred and country=iceland"
+#: ../../include/nav.php:108
+msgid "Your wiki"
 msgstr ""
 
-#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94
-#: ../../include/widgets.php:313 ../../include/widgets.php:432
-msgid "Everything"
+#: ../../include/nav.php:112
+msgid "Sign in"
 msgstr ""
 
-#: ../../include/contact_widgets.php:122
+#: ../../include/nav.php:129
 #, php-format
-msgid "%d connection in common"
-msgid_plural "%d connections in common"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../include/contact_widgets.php:127
-msgid "show more"
-msgstr ""
-
-#: ../../include/dir_fns.php:141
-msgid "Directory Options"
-msgstr ""
-
-#: ../../include/dir_fns.php:143
-msgid "Safe Mode"
-msgstr ""
-
-#: ../../include/dir_fns.php:144
-msgid "Public Forums Only"
-msgstr ""
-
-#: ../../include/dir_fns.php:145
-msgid "This Website Only"
-msgstr ""
-
-#: ../../include/message.php:20
-msgid "No recipient provided."
-msgstr ""
-
-#: ../../include/message.php:25
-msgid "[no subject]"
-msgstr ""
-
-#: ../../include/message.php:45
-msgid "Unable to determine sender."
-msgstr ""
-
-#: ../../include/message.php:222
-msgid "Stored post could not be verified."
+msgid "%s - click to logout"
 msgstr ""
 
-#: ../../include/channel.php:32
-msgid "Unable to obtain identity information from database"
+#: ../../include/nav.php:132
+msgid "Remote authentication"
 msgstr ""
 
-#: ../../include/channel.php:66
-msgid "Empty name"
+#: ../../include/nav.php:132
+msgid "Click to authenticate to your home hub"
 msgstr ""
 
-#: ../../include/channel.php:69
-msgid "Name too long"
+#: ../../include/nav.php:146
+msgid "Home Page"
 msgstr ""
 
-#: ../../include/channel.php:180
-msgid "No account identifier"
+#: ../../include/nav.php:149
+msgid "Create an account"
 msgstr ""
 
-#: ../../include/channel.php:192
-msgid "Nickname is required."
+#: ../../include/nav.php:161
+msgid "Help and documentation"
 msgstr ""
 
-#: ../../include/channel.php:206
-msgid "Reserved nickname. Please choose another."
+#: ../../include/nav.php:165
+msgid "Applications, utilities, links, games"
 msgstr ""
 
-#: ../../include/channel.php:211
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
+#: ../../include/nav.php:167
+msgid "Search site @name, #tag, ?docs, content"
 msgstr ""
 
-#: ../../include/channel.php:287
-msgid "Unable to retrieve created identity"
+#: ../../include/nav.php:169
+msgid "Channel Directory"
 msgstr ""
 
-#: ../../include/channel.php:345
-msgid "Default Profile"
+#: ../../include/nav.php:181
+msgid "Your grid"
 msgstr ""
 
-#: ../../include/channel.php:778
-msgid "Requested channel is not available."
+#: ../../include/nav.php:182
+msgid "Mark all grid notifications seen"
 msgstr ""
 
-#: ../../include/channel.php:925
-msgid "Create New Profile"
+#: ../../include/nav.php:184
+msgid "Channel home"
 msgstr ""
 
-#: ../../include/channel.php:945
-msgid "Visible to everybody"
+#: ../../include/nav.php:185
+msgid "Mark all channel notifications seen"
 msgstr ""
 
-#: ../../include/channel.php:1018 ../../include/channel.php:1130
-msgid "Gender:"
+#: ../../include/nav.php:191
+msgid "Notices"
 msgstr ""
 
-#: ../../include/channel.php:1019 ../../include/channel.php:1174
-msgid "Status:"
+#: ../../include/nav.php:191
+msgid "Notifications"
 msgstr ""
 
-#: ../../include/channel.php:1020 ../../include/channel.php:1185
-msgid "Homepage:"
+#: ../../include/nav.php:192
+msgid "See all notifications"
 msgstr ""
 
-#: ../../include/channel.php:1021
-msgid "Online Now"
+#: ../../include/nav.php:195
+msgid "Private mail"
 msgstr ""
 
-#: ../../include/channel.php:1135
-msgid "Like this channel"
+#: ../../include/nav.php:196
+msgid "See all private messages"
 msgstr ""
 
-#: ../../include/channel.php:1159
-msgid "j F, Y"
+#: ../../include/nav.php:197
+msgid "Mark all private messages seen"
 msgstr ""
 
-#: ../../include/channel.php:1160
-msgid "j F"
+#: ../../include/nav.php:203
+msgid "Event Calendar"
 msgstr ""
 
-#: ../../include/channel.php:1167
-msgid "Birthday:"
+#: ../../include/nav.php:204
+msgid "See all events"
 msgstr ""
 
-#: ../../include/channel.php:1180
-#, php-format
-msgid "for %1$d %2$s"
+#: ../../include/nav.php:205
+msgid "Mark all events seen"
 msgstr ""
 
-#: ../../include/channel.php:1183
-msgid "Sexual Preference:"
+#: ../../include/nav.php:208
+msgid "Manage Your Channels"
 msgstr ""
 
-#: ../../include/channel.php:1189
-msgid "Tags:"
+#: ../../include/nav.php:210
+msgid "Account/Channel Settings"
 msgstr ""
 
-#: ../../include/channel.php:1191
-msgid "Political Views:"
+#: ../../include/nav.php:218
+msgid "Site Setup and Configuration"
 msgstr ""
 
-#: ../../include/channel.php:1193
-msgid "Religion:"
+#: ../../include/nav.php:254
+msgid "@name, #tag, ?doc, content"
 msgstr ""
 
-#: ../../include/channel.php:1197
-msgid "Hobbies/Interests:"
+#: ../../include/nav.php:255
+msgid "Please wait..."
 msgstr ""
 
-#: ../../include/channel.php:1199
-msgid "Likes:"
+#: ../../include/network.php:704
+msgid "view full size"
 msgstr ""
 
-#: ../../include/channel.php:1201
-msgid "Dislikes:"
+#: ../../include/network.php:1944
+msgid "No Subject"
 msgstr ""
 
-#: ../../include/channel.php:1203
-msgid "Contact information and Social Networks:"
+#: ../../include/network.php:2198 ../../include/network.php:2199
+msgid "Friendica"
 msgstr ""
 
-#: ../../include/channel.php:1205
-msgid "My other channels:"
+#: ../../include/network.php:2200
+msgid "OStatus"
 msgstr ""
 
-#: ../../include/channel.php:1207
-msgid "Musical interests:"
+#: ../../include/network.php:2201
+msgid "GNU-Social"
 msgstr ""
 
-#: ../../include/channel.php:1209
-msgid "Books, literature:"
+#: ../../include/network.php:2202
+msgid "RSS/Atom"
 msgstr ""
 
-#: ../../include/channel.php:1211
-msgid "Television:"
+#: ../../include/network.php:2204
+msgid "Diaspora"
 msgstr ""
 
-#: ../../include/channel.php:1213
-msgid "Film/dance/culture/entertainment:"
+#: ../../include/network.php:2205
+msgid "Facebook"
 msgstr ""
 
-#: ../../include/channel.php:1215
-msgid "Love/Romance:"
+#: ../../include/network.php:2206
+msgid "Zot"
 msgstr ""
 
-#: ../../include/channel.php:1217
-msgid "Work/employment:"
+#: ../../include/network.php:2207
+msgid "LinkedIn"
 msgstr ""
 
-#: ../../include/channel.php:1219
-msgid "School/education:"
+#: ../../include/network.php:2208
+msgid "XMPP/IM"
 msgstr ""
 
-#: ../../include/channel.php:1240
-msgid "Like this thing"
+#: ../../include/network.php:2209
+msgid "MySpace"
 msgstr ""
 
-#: ../../include/widgets.php:103
-msgid "System"
+#: ../../include/oembed.php:325
+msgid "Embedded content"
 msgstr ""
 
-#: ../../include/widgets.php:106
-msgid "New App"
+#: ../../include/oembed.php:334
+msgid "Embedding disabled"
 msgstr ""
 
-#: ../../include/widgets.php:154
-msgid "Suggestions"
+#: ../../include/PermissionDescription.php:116
+msgid "Public"
 msgstr ""
 
-#: ../../include/widgets.php:155
-msgid "See more..."
+#: ../../include/PermissionDescription.php:117
+msgid "Anybody in the $Projectname network"
 msgstr ""
 
-#: ../../include/widgets.php:175
+#: ../../include/PermissionDescription.php:118
 #, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
-msgstr ""
-
-#: ../../include/widgets.php:181
-msgid "Add New Connection"
-msgstr ""
-
-#: ../../include/widgets.php:182
-msgid "Enter channel address"
-msgstr ""
-
-#: ../../include/widgets.php:183
-msgid "Examples: bob@example.com, https://example.com/barbara"
-msgstr ""
-
-#: ../../include/widgets.php:199
-msgid "Notes"
-msgstr ""
-
-#: ../../include/widgets.php:273
-msgid "Remove term"
-msgstr ""
-
-#: ../../include/widgets.php:354
-msgid "Archives"
-msgstr ""
-
-#: ../../include/widgets.php:516
-msgid "Refresh"
-msgstr ""
-
-#: ../../include/widgets.php:556
-msgid "Account settings"
-msgstr ""
-
-#: ../../include/widgets.php:562
-msgid "Channel settings"
-msgstr ""
-
-#: ../../include/widgets.php:571
-msgid "Additional features"
-msgstr ""
-
-#: ../../include/widgets.php:578
-msgid "Feature/Addon settings"
-msgstr ""
-
-#: ../../include/widgets.php:584
-msgid "Display settings"
-msgstr ""
-
-#: ../../include/widgets.php:591
-msgid "Manage locations"
-msgstr ""
-
-#: ../../include/widgets.php:600
-msgid "Export channel"
-msgstr ""
-
-#: ../../include/widgets.php:607
-msgid "Connected apps"
-msgstr ""
-
-#: ../../include/widgets.php:622
-msgid "Premium Channel Settings"
-msgstr ""
-
-#: ../../include/widgets.php:651
-msgid "Private Mail Menu"
-msgstr ""
-
-#: ../../include/widgets.php:653
-msgid "Combined View"
-msgstr ""
-
-#: ../../include/widgets.php:685 ../../include/widgets.php:697
-msgid "Conversations"
-msgstr ""
-
-#: ../../include/widgets.php:689
-msgid "Received Messages"
-msgstr ""
-
-#: ../../include/widgets.php:693
-msgid "Sent Messages"
-msgstr ""
-
-#: ../../include/widgets.php:707
-msgid "No messages."
-msgstr ""
-
-#: ../../include/widgets.php:725
-msgid "Delete conversation"
-msgstr ""
-
-#: ../../include/widgets.php:751
-msgid "Events Menu"
-msgstr ""
-
-#: ../../include/widgets.php:752
-msgid "Day View"
+msgid "Any account on %s"
 msgstr ""
 
-#: ../../include/widgets.php:753
-msgid "Week View"
+#: ../../include/PermissionDescription.php:119
+msgid "Any of my connections"
 msgstr ""
 
-#: ../../include/widgets.php:754
-msgid "Month View"
+#: ../../include/PermissionDescription.php:120
+msgid "Only connections I specifically allow"
 msgstr ""
 
-#: ../../include/widgets.php:766
-msgid "Events Tools"
+#: ../../include/PermissionDescription.php:121
+msgid "Anybody authenticated (could include visitors from other networks)"
 msgstr ""
 
-#: ../../include/widgets.php:767
-msgid "Export Calendar"
+#: ../../include/PermissionDescription.php:122
+msgid "Any connections including those who haven't yet been approved"
 msgstr ""
 
-#: ../../include/widgets.php:768
-msgid "Import Calendar"
+#: ../../include/PermissionDescription.php:161
+msgid ""
+"This is your default setting for the audience of your normal stream, and "
+"posts."
 msgstr ""
 
-#: ../../include/widgets.php:846
-msgid "Overview"
+#: ../../include/PermissionDescription.php:162
+msgid ""
+"This is your default setting for who can view your default channel profile"
 msgstr ""
 
-#: ../../include/widgets.php:853
-msgid "Chat Members"
+#: ../../include/PermissionDescription.php:163
+msgid "This is your default setting for who can view your connections"
 msgstr ""
 
-#: ../../include/widgets.php:875
-msgid "Wiki List"
+#: ../../include/PermissionDescription.php:164
+msgid ""
+"This is your default setting for who can view your file storage and photos"
 msgstr ""
 
-#: ../../include/widgets.php:913
-msgid "Wiki Pages"
+#: ../../include/PermissionDescription.php:165
+msgid "This is your default setting for the audience of your webpages"
 msgstr ""
 
-#: ../../include/widgets.php:948
-msgid "Bookmarked Chatrooms"
-msgstr ""
+#: ../../include/contact_widgets.php:11
+#, php-format
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/widgets.php:971
-msgid "Suggested Chatrooms"
+#: ../../include/contact_widgets.php:19
+msgid "Find Channels"
 msgstr ""
 
-#: ../../include/widgets.php:1117 ../../include/widgets.php:1229
-msgid "photo/image"
+#: ../../include/contact_widgets.php:20
+msgid "Enter name or interest"
 msgstr ""
 
-#: ../../include/widgets.php:1172
-msgid "Click to show more"
+#: ../../include/contact_widgets.php:21
+msgid "Connect/Follow"
 msgstr ""
 
-#: ../../include/widgets.php:1323
-msgid "Rating Tools"
+#: ../../include/contact_widgets.php:22
+msgid "Examples: Robert Morgenstein, Fishing"
 msgstr ""
 
-#: ../../include/widgets.php:1327 ../../include/widgets.php:1329
-msgid "Rate Me"
+#: ../../include/contact_widgets.php:26
+msgid "Random Profile"
 msgstr ""
 
-#: ../../include/widgets.php:1332
-msgid "View Ratings"
+#: ../../include/contact_widgets.php:27
+msgid "Invite Friends"
 msgstr ""
 
-#: ../../include/widgets.php:1389
-msgid "Forums"
+#: ../../include/contact_widgets.php:29
+msgid "Advanced example: name=fred and country=iceland"
 msgstr ""
 
-#: ../../include/widgets.php:1418
-msgid "Tasks"
-msgstr ""
+#: ../../include/contact_widgets.php:122
+#, php-format
+msgid "%d connection in common"
+msgid_plural "%d connections in common"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/widgets.php:1427
-msgid "Documentation"
+#: ../../include/contact_widgets.php:127
+msgid "show more"
 msgstr ""
 
-#: ../../include/widgets.php:1429
-msgid "Project/Site Information"
+#: ../../include/dir_fns.php:141
+msgid "Directory Options"
 msgstr ""
 
-#: ../../include/widgets.php:1430
-msgid "For Members"
+#: ../../include/dir_fns.php:143
+msgid "Safe Mode"
 msgstr ""
 
-#: ../../include/widgets.php:1431
-msgid "For Administrators"
+#: ../../include/dir_fns.php:144
+msgid "Public Forums Only"
 msgstr ""
 
-#: ../../include/widgets.php:1432
-msgid "For Developers"
+#: ../../include/dir_fns.php:145
+msgid "This Website Only"
 msgstr ""
 
-#: ../../include/widgets.php:1456 ../../include/widgets.php:1494
-msgid "Member registrations waiting for confirmation"
+#: ../../include/message.php:20
+msgid "No recipient provided."
 msgstr ""
 
-#: ../../include/widgets.php:1462
-msgid "Inspect queue"
+#: ../../include/message.php:25
+msgid "[no subject]"
 msgstr ""
 
-#: ../../include/widgets.php:1464
-msgid "DB updates"
+#: ../../include/message.php:45
+msgid "Unable to determine sender."
 msgstr ""
 
-#: ../../include/widgets.php:1490
-msgid "Plugin Features"
+#: ../../include/message.php:222
+msgid "Stored post could not be verified."
 msgstr ""
 
 #: ../../include/permissions.php:26
@@ -9877,11 +9913,11 @@ msgstr ""
 msgid "[hubzilla] Website SSL error for %s"
 msgstr ""
 
-#: ../../boot.php:2476
+#: ../../boot.php:2485
 msgid "Cron/Scheduled tasks not running."
 msgstr ""
 
-#: ../../boot.php:2480
+#: ../../boot.php:2489
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr ""
diff --git a/view/js/mod_events.js b/view/js/mod_events.js
index 66cf81ddd..a507a84d7 100644
--- a/view/js/mod_events.js
+++ b/view/js/mod_events.js
@@ -19,15 +19,10 @@ function enableDisableFinishDate() {
 }
 
 function on_fullscreen() {
-	var view = $('#events-calendar').fullCalendar('getView');
-	if(view.type === 'month') {
-		$('#events-calendar').fullCalendar('option', 'height', $(window).height() - $('.section-title-wrapper').outerHeight(true) - 2); // -2 is for border width (top and bottom) of .generic-content-wrapper
-	}
+	$('#events-calendar').fullCalendar('option', 'height', $(window).height() - $('.section-title-wrapper').outerHeight(true) - 2); // -2 is for border width (.generic-content-wrapper top and bottom) of .generic-content-wrapper
 }
 
 function on_inline() {
 	var view = $('#events-calendar').fullCalendar('getView');
-	if(view.type === 'month') {
-		$('#events-calendar').fullCalendar('option', 'height', '');
-	}
+	((view.type === 'month') ? $('#events-calendar').fullCalendar('option', 'height', '') : $('#events-calendar').fullCalendar('option', 'height', 'auto'));
 }
diff --git a/view/pdl/mod_events.pdl b/view/pdl/mod_events.pdl
index a3bc0c019..8347d4c59 100644
--- a/view/pdl/mod_events.pdl
+++ b/view/pdl/mod_events.pdl
@@ -1,5 +1,4 @@
 [region=aside]
-[widget=eventsmenu][/widget]
 [widget=eventstools][/widget]
 [widget=tasklist][/widget]
 [/region]
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
index 4397c5c9d..fee4f17a3 100755
--- a/view/tpl/event_head.tpl
+++ b/view/tpl/event_head.tpl
@@ -30,18 +30,18 @@
 	function changeView(action, viewName) {
 		$('#events-calendar').fullCalendar(action, viewName);
 		var view = $('#events-calendar').fullCalendar('getView');
-		if(view.type === 'agendaDay' || view.type === 'agendaWeek') {
+
+		if(view.type !== 'month' && !$('main').hasClass('fullscreen')) {
 			$('#events-calendar').fullCalendar('option', 'height', 'auto');
 		}
 		else {
-			if($('main').hasClass('fullscreen')) {
-				$('#calendar').fullCalendar('option', 'height', $(window).height() - $('.section-title-wrapper').outerHeight(true) - 2); // -2 is for border width (.generic-content-wrapper top and bottom) of .generic-content-wrapper
+			$('#events-calendar').fullCalendar('option', 'height', '');
+		}
 
-			}
-			else {
-				$('#calendar').fullCalendar('option', 'height', '');
-			}
+		if($('main').hasClass('fullscreen')) {
+			$('#events-calendar').fullCalendar('option', 'height', $(window).height() - $('.section-title-wrapper').outerHeight(true) - 2); // -2 is for border width (.generic-content-wrapper top and bottom) of .generic-content-wrapper
 		}
+
 		$('#title').text(view.title);
 	}
 
diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl
index 7d5258ecd..3397411a8 100755
--- a/view/tpl/events-js.tpl
+++ b/view/tpl/events-js.tpl
@@ -1,13 +1,21 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
 		<div class="pull-right">
-			<button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
-			<button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
-			<button class="btn btn-success btn-xs" onclick="openClose('form');">{{$new_event.1}}</button>
-			<div class="btn-group">
-				<button class="btn btn-default btn-xs" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button>
-				<button id="events-spinner" class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button>
-				<button class="btn btn-default btn-xs" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button>
+			<div class="dropdown">
+				<button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
+				<button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
+				<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown"><i class="fa fa-caret-down"></i>&nbsp;{{$view_label}}</button>
+				<ul class="dropdown-menu">
+					<li><a href="#" onclick="changeView('changeView', 'month'); return false;">{{$month}}</a></li>
+					<li><a href="#" onclick="changeView('changeView', 'agendaWeek'); return false;">{{$week}}</a></li>
+					<li><a href="#" onclick="changeView('changeView', 'agendaDay'); return false;">{{$day}}</a></li>
+				</ul>
+				<button class="btn btn-success btn-xs" onclick="openClose('form');">{{$new_event.1}}</button>
+				<div class="btn-group">
+					<button class="btn btn-default btn-xs" onclick="changeView('prev', false);" title="{{$prev}}"><i class="fa fa-backward"></i></button>
+					<button id="events-spinner" class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye"></i></button>
+					<button class="btn btn-default btn-xs" onclick="changeView('next', false);" title="{{$next}}"><i class="fa fa-forward"></i></button>
+				</div>
 			</div>
 		</div>
 		<h2 id="title"></h2>