Merge remote-tracking branch 'upstream/dev' into website-export. Added attach_move() to include/attach.php.

author: Andrew Manning <tamanning@zoho.com> 2016-08-27 06:52:01 -0400
committer: Andrew Manning <tamanning@zoho.com> 2016-08-27 06:52:01 -0400
commit: ddfc5209d3a8a4b10f66b0ae0497a269ff2bdde1 (patch)
tree: 80936d2335aca91c1a3b828c234ae736c811d22b
parent: 420aa4bc44a2fdf707b3964582258809f978ea2d (diff)
parent: aea2fa1629692cc29f1070a66fbde9fb9ae837a6 (diff)
download: volse-hubzilla-ddfc5209d3a8a4b10f66b0ae0497a269ff2bdde1.tar.gz
volse-hubzilla-ddfc5209d3a8a4b10f66b0ae0497a269ff2bdde1.tar.bz2
volse-hubzilla-ddfc5209d3a8a4b10f66b0ae0497a269ff2bdde1.zip
26 files changed, 4711 insertions, 4413 deletions
diff --git a/Zotlabs/Module/Admin.php b/Zotlabs/Module/Admin.php
index eede5a045..15edbd407 100644
--- a/Zotlabs/Module/Admin.php
+++ b/Zotlabs/Module/Admin.php
@@ -268,6 +268,8 @@ class Admin extends \Zotlabs\Web\Controller {
 		check_form_security_token_redirectOnErr('/admin/site', 'admin_site');
 	
 		$sitename 			=	((x($_POST,'sitename'))			? notags(trim($_POST['sitename']))			: '');
+		$server_role 		=	((x($_POST,'server_role'))		? notags(trim($_POST['server_role']))		: 'standard');
+
 		$banner				=	((x($_POST,'banner'))      		? trim($_POST['banner'])				: false);
 		$admininfo			=	((x($_POST,'admininfo'))		? trim($_POST['admininfo'])				: false);
 		$language			=	((x($_POST,'language'))			? notags(trim($_POST['language']))			: '');
@@ -308,6 +310,8 @@ class Admin extends \Zotlabs\Web\Controller {
 		$feed_contacts     = ((x($_POST,'feed_contacts'))    ? intval($_POST['feed_contacts'])    : 0);
 		$verify_email      = ((x($_POST,'verify_email'))     ? 1 : 0);
 	
+
+		set_config('system', 'server_role', $server_role);
 		set_config('system', 'feed_contacts', $feed_contacts);
 		set_config('system', 'delivery_interval', $delivery_interval);
 		set_config('system', 'delivery_batch_count', $delivery_batch_count);
@@ -481,6 +485,12 @@ class Admin extends \Zotlabs\Web\Controller {
 		// now invert the logic for the setting.
 		$discover_tab = (1 - $discover_tab);
 	
+		$server_roles = [
+			'basic'    => t('Basic/Minimal Social Networking'),
+			'standard' => t('Standard Configuration (default)'),
+			'pro'      => t('Professional')
+		];
+
 	
 		$homelogin = get_config('system','login_on_homepage');
 		$enable_context_help = get_config('system','enable_context_help');
@@ -498,6 +508,9 @@ class Admin extends \Zotlabs\Web\Controller {
 			'$baseurl' => z_root(),
 			// name, label, value, help string, extra data...
 			'$sitename' 		=> array('sitename', t("Site name"), htmlspecialchars(get_config('system','sitename'), ENT_QUOTES, 'UTF-8'),''),
+
+			'$server_role' 		=> array('server_role', t("Server Configuration/Role"), get_config('system','server_role'),'',$server_roles),
+
 			'$banner'			=> array('banner', t("Banner/Logo"), $banner, ""),
 			'$admininfo'		=> array('admininfo', t("Administrator Information"), $admininfo, t("Contact information for site administrators.  Displayed on siteinfo page.  BBCode can be used here")),
 			'$language' 		=> array('language', t("System language"), get_config('system','language'), "", $lang_choices),
diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php
index 217249469..43feac189 100644
--- a/Zotlabs/Module/Connedit.php
+++ b/Zotlabs/Module/Connedit.php
@@ -663,13 +663,9 @@ class Connedit extends \Zotlabs\Web\Controller {
 				$rating_text = $xl[0]['xlink_rating_text'];
 			}
 	
-			$poco_rating = get_config('system','poco_rating_enable');
+			$rating_enabled = get_config('system','rating_enabled');
 	
-			// if unset default to enabled
-			if($poco_rating === false)
-				$poco_rating = true;
-	
-			if($poco_rating) {
+			if($rating_enabled) {
 				$rating = replace_macros(get_markup_template('rating_slider.tpl'),array(
 					'$min' => -10,
 					'$val' => $rating_val
diff --git a/Zotlabs/Module/Directory.php b/Zotlabs/Module/Directory.php
index 560038ffc..84d40a166 100644
--- a/Zotlabs/Module/Directory.php
+++ b/Zotlabs/Module/Directory.php
@@ -239,7 +239,7 @@ class Directory extends \Zotlabs\Web\Controller {
 	
 							$page_type = '';
 	
-							if($rr['total_ratings'])
+							if($rr['total_ratings'] && get_config('system','rating_enabled'))
 								$total_ratings = sprintf( tt("%d rating", "%d ratings", $rr['total_ratings']), $rr['total_ratings']);
 							else
 								$total_ratings = '';
diff --git a/Zotlabs/Module/Pubsites.php b/Zotlabs/Module/Pubsites.php
index 0dda08e6d..35a305130 100644
--- a/Zotlabs/Module/Pubsites.php
+++ b/Zotlabs/Module/Pubsites.php
@@ -16,7 +16,9 @@ class Pubsites extends \Zotlabs\Web\Controller {
 			$url = $directory['url'] . '/dirsearch';
 		}
 		$url .= '/sites';
-	
+
+		$rating_enabled = get_config('system','rating_enabled');
+
 		$o .= '<div class="generic-content-wrapper">';
 	
 		$o .= '<div class="section-title-wrapper"><h2>' . t('Public Hubs') . '</h2></div>';
@@ -28,7 +30,10 @@ class Pubsites extends \Zotlabs\Web\Controller {
 		if($ret['success']) {
 			$j = json_decode($ret['body'],true);
 			if($j) {
-				$o .= '<table class="table table-striped table-hover"><tr><td>' . t('Hub URL') . '</td><td>' . t('Access Type') . '</td><td>' . t('Registration Policy') . '</td><td>' . t('Stats') . '</td><td>' . t('Software') . '</td><td colspan="2">' . t('Ratings') . '</td></tr>';
+				$o .= '<table class="table table-striped table-hover"><tr><td>' . t('Hub URL') . '</td><td>' . t('Access Type') . '</td><td>' . t('Registration Policy') . '</td><td>' . t('Stats') . '</td><td>' . t('Software') . '</td>';
+				if($rating_enabled)
+					$o .= '<td colspan="2">' . t('Ratings') . '</td>';
+				$o .= '</tr>';
 				if($j['sites']) {
 					foreach($j['sites'] as $jj) {
 						$m = parse_url($jj['url']);
@@ -44,7 +49,10 @@ class Pubsites extends \Zotlabs\Web\Controller {
 							$location = '<br />&nbsp;';
 							}
 						$urltext = str_replace(array('https://'), '', $jj['url']);
-						$o .= '<tr><td><a href="'. (($jj['sellpage']) ? $jj['sellpage'] : $jj['url'] . '/register' ) . '" ><i class="fa fa-link"></i> ' . $urltext . '</a>' . $location . '</td><td>' . $jj['access'] . '</td><td>' . $jj['register'] . '</td><td>' . '<a target="stats" href="https://hubchart-tarine.rhcloud.com/hub.jsp?hubFqdn=' . $m['host'] . '"><i class="fa fa-area-chart"></i></a></td><td>' . ucwords($jj['project']) . '</td><td><a href="ratings/' . $host . '" class="btn-btn-default"><i class="fa fa-eye"></i> ' . t('View') . '</a></td>' . $rate_links . '</tr>';
+						$o .= '<tr><td><a href="'. (($jj['sellpage']) ? $jj['sellpage'] : $jj['url'] . '/register' ) . '" ><i class="fa fa-link"></i> ' . $urltext . '</a>' . $location . '</td><td>' . $jj['access'] . '</td><td>' . $jj['register'] . '</td><td>' . '<a target="stats" href="https://hubchart-tarine.rhcloud.com/hub.jsp?hubFqdn=' . $m['host'] . '"><i class="fa fa-area-chart"></i></a></td><td>' . ucwords($jj['project']) . '</td>';
+						if($rating_enabled)
+							$o .= '<td><a href="ratings/' . $host . '" class="btn-btn-default"><i class="fa fa-eye"></i> ' . t('View') . '</a></td>' . $rate_links ;
+						$o .=  '</tr>';
 					}
 				}
 		
diff --git a/Zotlabs/Module/Rate.php b/Zotlabs/Module/Rate.php
index 2f769b36b..c03aaa54f 100644
--- a/Zotlabs/Module/Rate.php
+++ b/Zotlabs/Module/Rate.php
@@ -119,8 +119,8 @@ class Rate extends \Zotlabs\Web\Controller {
 	//		return;
 	//	}
 	
-		$poco_rating = get_config('system','poco_rating_enable');
-		if((! $poco_rating) && ($poco_rating !== false)) {
+		$rating_enabled = get_config('system','rating_enabled');
+		if(! $rating_enabled) {
 			notice('Ratings are disabled on this site.');
 			return;
 		}
@@ -141,11 +141,7 @@ class Rate extends \Zotlabs\Web\Controller {
 			$rating_text = '';
 		}
 	
-		// if unset default to enabled
-		if($poco_rating === false)
-			$poco_rating = true;
-	
-		if($poco_rating) {
+		if($rating_enabled) {
 			$rating = replace_macros(get_markup_template('rating_slider.tpl'),array(
 				'$min' => -10,
 				'$val' => $rating_val
diff --git a/Zotlabs/Module/Ratings.php b/Zotlabs/Module/Ratings.php
index 969fb5015..055b16ca3 100644
--- a/Zotlabs/Module/Ratings.php
+++ b/Zotlabs/Module/Ratings.php
@@ -21,12 +21,9 @@ class Ratings extends \Zotlabs\Web\Controller {
 		if($x)
 			$url = $x['url'];
 	
-		$poco_rating = get_config('system','poco_rating_enable');
-		// if unset default to enabled
-		if($poco_rating === false)
-			$poco_rating = true;
+		$rating_enabled = get_config('system','rating_enabled');
 	
-		if(! $poco_rating)
+		if(! $rating_enabled)
 			return;
 	
 		if(argc() > 1)
@@ -87,12 +84,9 @@ class Ratings extends \Zotlabs\Web\Controller {
 			return;
 		}
 	
-		$poco_rating = get_config('system','poco_rating_enable');
-		// if unset default to enabled
-		if($poco_rating === false)
-			$poco_rating = true;
+		$rating_enabled = get_config('system','rating_enabled');
 	
-		if(! $poco_rating)
+		if(! $rating_enabled)
 			return;
 	
 		$site_target = ((array_key_exists('target',\App::$data) && array_key_exists('site_url',\App::$data['target'])) ?
diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php
index cb43b5c20..f8e210410 100644
--- a/Zotlabs/Module/Setup.php
+++ b/Zotlabs/Module/Setup.php
@@ -73,7 +73,9 @@ class Setup extends \Zotlabs\Web\Controller {
 				$phpath = trim($_POST['phpath']);
 				$adminmail = trim($_POST['adminmail']);
 				$siteurl = trim($_POST['siteurl']);
-				$advanced = ((intval($_POST['advanced'])) ? 1 : 0);
+				$server_role = trim($_POST['server_role']);
+				if(! $server_role)
+					$server_role = 'standard';
 				
 				// $siteurl should not have a trailing slash
 	
@@ -101,7 +103,9 @@ class Setup extends \Zotlabs\Web\Controller {
 				$timezone = notags(trim($_POST['timezone']));
 				$adminmail = notags(trim($_POST['adminmail']));
 				$siteurl = notags(trim($_POST['siteurl']));
-				$advanced = ((intval($_POST['advanced'])) ? 'standard' : 'basic');
+				$server_role = notags(trim($_POST['server_role']));
+				if(! $server_role)
+					$server_role = 'standard';
 	
 				if($siteurl != z_root()) {
 					$test = z_fetch_url($siteurl."/setup/testrewrite");
@@ -130,7 +134,7 @@ class Setup extends \Zotlabs\Web\Controller {
 					'$dbpass'      => $dbpass,
 					'$dbdata'      => $dbdata,
 					'$dbtype'      => $dbtype,
-					'$server_role' => $advanced,
+					'$server_role' => $server_role,
 					'$timezone'    => $timezone,
 					'$siteurl'     => $siteurl,
 					'$site_id'     => random_string(),
@@ -327,6 +331,12 @@ class Setup extends \Zotlabs\Web\Controller {
 				$siteurl = notags(trim($_POST['siteurl']));
 				$timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles');
 	
+				$server_roles = [
+					'basic'    => t('Basic/Minimal Social Networking'),
+					'standard' => t('Standard Configuration (default)'),
+					'pro'      => t('Professional')
+				];
+
 				$tpl = get_markup_template('install_settings.tpl');
 				$o .= replace_macros($tpl, array(
 					'$title' => $install_title,
@@ -344,7 +354,8 @@ class Setup extends \Zotlabs\Web\Controller {
 					'$adminmail' => array('adminmail', t('Site administrator email address'), $adminmail, t('Your account email address must match this in order to use the web admin panel.')),
 	
 					'$siteurl' => array('siteurl', t('Website URL'), z_root(), t('Please use SSL (https) URL if available.')),
-					'$advanced' => array('advanced', t('Enable $Projectname <strong>advanced</strong> features?'), 1, t('Some advanced features, while useful - may be best suited for technically proficient audiences')),
+
+					'$server_role' 		=> array('server_role', t("Server Configuration/Role"), 'standard','',$server_roles),
 	
 					'$timezone' => array('timezone', t('Please select a default timezone for your website'), $timezone, '', get_timezones()),
 	
diff --git a/Zotlabs/Render/Comanche.php b/Zotlabs/Render/Comanche.php
index 820897ee9..91f0ce33a 100644
--- a/Zotlabs/Render/Comanche.php
+++ b/Zotlabs/Render/Comanche.php
@@ -99,18 +99,73 @@ class Comanche {
 		}
 	}
 
-
+	function get_condition_var($v) {
+		if($v) {
+			$x = explode('.',$v);
+			if($x[0] == 'config')
+				return get_config($x[1],$x[2]);
+			elseif($x[0] === 'observer') {
+				if(count($x) > 1) {
+					$y = \App::get_observer();
+					if(! $y)
+						return false;
+					if($x[1] == 'address')
+						return $y['xchan_addr'];
+					elseif($x[1] == 'name')
+						return $y['xchan_name'];
+					return false;
+				}
+				return get_observer_hash();
+			}
+			else
+				return false;
+		}
+		return false;
+	}
 
 	function test_condition($s) {
 
-		// This is extensible. The first version of variable testing supports tests of the form
+		// This is extensible. The first version of variable testing supports tests of the forms:
+		// [if $config.system.foo == baz] which will check if get_config('system','foo') is the string 'baz';
+		// [if $config.system.foo != baz] which will check if get_config('system','foo') is not the string 'baz';
+		// You may check numeric entries, but these checks are evaluated as strings. 
+		// [if $config.system.foo {} baz] which will check if 'baz' is an array element in get_config('system','foo')
+		// [if $config.system.foo {*} baz] which will check if 'baz' is an array key in get_config('system','foo')
 		// [if $config.system.foo] which will check for a return of a true condition for get_config('system','foo');
 		// The values 0, '', an empty array, and an unset value will all evaluate to false.
 
-		if(preg_match("/[\$]config[\.](.*?)/",$s,$matches)) {
-			$x = explode('.',$s);
-			if(get_config($x[1],$x[2]))
+		if(preg_match('/[\$](.*?)\s\=\=\s(.*?)$/',$s,$matches)) {
+			$x = $this->get_condition_var($matches[1]);
+			if($x == trim($matches[2]))
+				return true;
+			return false;
+		}
+		if(preg_match('/[\$](.*?)\s\!\=\s(.*?)$/',$s,$matches)) {
+			$x = $this->get_condition_var($matches[1]);
+			if($x != trim($matches[2]))
+				return true;
+			return false;
+		}
+
+		if(preg_match('/[\$](.*?)\s\{\}\s(.*?)$/',$s,$matches)) {
+			$x = $this->get_condition_var($matches[1]);
+			if(is_array($x) && in_array(trim($matches[2]),$x))
+				return true;
+			return false;
+		}
+
+		if(preg_match('/[\$](.*?)\s\{\*\}\s(.*?)$/',$s,$matches)) {
+			$x = $this->get_condition_var($matches[1]);
+			if(is_array($x) && array_key_exists(trim($matches[2]),$x))
+				return true;
+			return false;
+		}
+
+		if(preg_match('/[\$](.*?)/',$s,$matches)) {
+			$x = $this->get_condition_var($matches[1]);
+			if($x)
 				return true;
+			return false;
 		}
 		return false;
 
diff --git a/Zotlabs/Render/SmartyTemplate.php b/Zotlabs/Render/SmartyTemplate.php
index 532d6e42f..b7e68c1bc 100755
--- a/Zotlabs/Render/SmartyTemplate.php
+++ b/Zotlabs/Render/SmartyTemplate.php
@@ -27,6 +27,12 @@ class SmartyTemplate implements TemplateEngine {
 
 	public function replace_macros($s, $r) {
 		$template = '';
+
+		// these are available for use in all templates
+
+		$r['$z_baseurl']     = z_root();
+		$r['$z_server_role'] = \Zotlabs\Lib\System::get_server_role();
+
 		if(gettype($s) === 'string') {
 			$template = $s;
 			$s = new SmartyInterface();
diff --git a/doc/comanche.bb b/doc/comanche.bb
index 6a96d5251..177a4252d 100644
--- a/doc/comanche.bb
+++ b/doc/comanche.bb
@@ -65,17 +65,23 @@ By default, $nav is placed in the &quot;nav&quot; page region and $content is pl
 
 To select a theme for your page, use the 'theme' tag.
 [code]
-	[theme]apw[/theme]
+	[theme]suckerberg[/theme]
 
 [/code]
-This will select the theme named &quot;apw&quot;. By default your channel's preferred theme will be used.
+This will select the theme named &quot;suckerberg&quot;. By default your channel's preferred theme will be used.
 
 [code]
-	[theme=passion]apw[/theme]
+	[theme=passion]suckerberg[/theme]
 
 [/code]
-This will select the theme named &quot;apw&quot; and select the &quot;passion&quot; schema (theme variant). 
+This will select the theme named &quot;suckerberg&quot; and select the &quot;passion&quot; schema (theme variant). Alternatively it may be possible to use a condensed theme notation for this. 
 
+[code]
+	[theme]suckerberg:passion[/theme]
+
+[/code]
+
+The condensed notation isn't part of Comanche itself but is recognised by the $Projectname platform as a theme specifier.
 
 [b]Regions[/b]
 Each region has a name, as noted above. You will specify the region of interest using a 'region' tag, which includes the name. Any content you wish placed in this region should be placed between the opening region tag and the closing tag.
@@ -164,7 +170,42 @@ The 'comment' tag is used to delimit comments. These comments will not appear on
 	[comment]This is a comment[/comment]
 
 [/code]
- 
+
+[b]Conditional Execution[/b]
+You can use an 'if' construct to make decisions. These are currently based on system configuration variable or the current observer.
+
+[code]
+	[if $config.system.foo]
+		... the configuration variable system.foo evaluates to 'true'.
+	[else]
+		... the configuration variable system.foo evaluates to 'false'.
+ 	[/if]
+
+	[if $observer]
+		... this content will only be show to authenticated viewers
+	[/if]
+
+[/code]
+
+	The 'else' clause is optional. 
+
+	Several tests are supported besides boolean evaluation.
+
+[code]
+	[if $config.system.foo == bar]
+		... the configuration variable system.foo is equal to the string 'bar'
+	[/if]
+	[if $config.system.foo != bar]
+		... the configuration variable system.foo is not equal to the string 'bar'
+	[/if]
+	[if $config.system.foo {} bar ]
+		... the configuration variable system.foo is a simple array containing a value 'bar'
+	[/if]
+	[if $config.system.foo {*} bar]
+		... the configuration variable system.foo is a simple array containing a key named 'bar'
+	[/if]
+[/code]
+
 [b]Complex Example[/b]
 [code]
 	[comment]use an existing page template which provides a banner region plus 3 columns beneath it[/comment]
diff --git a/doc/context/en/connedit/help.html b/doc/context/en/connedit/help.html
new file mode 100644
index 000000000..9eb62ecc7
--- /dev/null
+++ b/doc/context/en/connedit/help.html
@@ -0,0 +1,12 @@
+<dl class="dl-horizontal">
+    <dt>General</dt>
+    <dd>This page allows you to change or edit any individual settings for a particular connection or delete a connection completely. You may have arrived at this page after creating or approving a new connection. If so, you are not required to do anything. Your connection has already been established. You <strong>may</strong> wish to add them to a group or adjust special permissions, and this page is presented so that you may do this while the opportunity is fresh.</dd> 
+    <dt><a href='#' onclick='contextualHelpFocus(".section-title-wrapper", 0); return false;' title="Click to highlight element...">Connection Tools</a></dt>
+    <dd>The <a href='#' onclick='contextualHelpFocus(".section-title-wrapper", 0); return false;' title="Click to highlight element...">Connection Tools</a> menu access several settings. View Profile, View Recent Activity, Refresh Permissions, set or reset flags (Block, Ignore, Archive, Hide) and Delete the connection.</dd>
+	<dt><a href='#' onclick='contextualHelpFocus("#group-sidebar", 0); return false;' title="Click to highlight element...">Privacy Groups</a></dt>
+	<dd>Each connection may be assigned to one or more Privacy Groups for grouping collections of friends with access to specific posts, media and other content. You may add them to an existing privacy group here, or create a new privacy group. When you add them to an existing group the action is immediate and you are not required to submit a form. </dd>
+    <dt><a href='#' onclick='contextualHelpFocus("#perms-tool", 0); return false;' title="Click to highlight element...">Individual Permissions</a></dt>
+    <dd>Granting of permissions is usually automatic and require no action on your part. However you may wish to adjust specific permsisions for this connection which are different than for others.</dd>
+	<dt>Feature Specific Settings</dt>
+	<dd>A number of individual settings are controlled through additional features which may or may not be activated on your hub or for your channel. Several optional features have settings for each connection, and those may be set on this page through additional form tabs which may be present.</dd> 
+</dl>
diff --git a/doc/context/es-es/connedit/help.html b/doc/context/es-es/connedit/help.html
new file mode 100644
index 000000000..000f28950
--- /dev/null
+++ b/doc/context/es-es/connedit/help.html
@@ -0,0 +1,12 @@
+<dl class="dl-horizontal">
+    <dt>General</dt>
+    <dd>Esta página le permite cambiar o modificar cualquier ajuste individual para una conexión en concreto o eliminar una conexión completamente. Ha podido llegar a esta página tras crear o aprobar una conexión nueva. Si es así, no tiene por qué hacer nada. Su conexión ya se ha establecido. <strong>Es posible</strong> que desee añadirla a un grupo o ajustar para ella permisos especiales; si es así, esta página se presenta de modo que usted pueda hacerlo mientras todo el proceso es aún reciente.</dd> 
+    <dt><a href='#' onclick='contextualHelpFocus(".section-title-wrapper", 0); return false;' title="Pulsar para resaltar el elemento...">Conexiones</a></dt>
+    <dd>El menú <a href='#' onclick='contextualHelpFocus(".section-title-wrapper", 0); return false;' title="Pulsar para resaltar el elemento...">Conexiones</a> le da acceso a varios ajustes: "Ver el perfil", "Ver la actividad reciente", "Recargar los permisos", añadir o quitar estados ("flags") ("Bloquear", "Ignorar", "Archivar", "Ocultar") y eliminar la conexión.</dd>
+	<dt><a href='#' onclick='contextualHelpFocus("#group-sidebar", 0); return false;' title="Pulsar para resaltar el elemento...">Grupos de canales</a></dt>
+	<dd>Todas las conexiones se puede incluir en uno o varios grupos de canales para formar conjuntos de amigos con acceso a publicaciones concretas, ficheros multimedia y otros tipos de contenido. Puede añadirla aquí a un grupo de canales ya existente o crear un grupo nuevo. Cuando añade la conexión a un grupo que ya existe, el efecto es inmediato y no será requerido para confirmarlo.</dd>
+    <dt><a href='#' onclick='contextualHelpFocus("#perms-tool", 0); return false;' title="Pulsar para resaltar el elemento...">Permisos individuales</a></dt>
+    <dd>La concesión de permisos es, generalmente, automática y no requiere ninguna acción por su parte. Sin embargo, puede, si lo desea, ajustar permisos especiales, diferentes de los permisos concedidos a otros, para una conexión concreta.</dd>
+	<dt>Ajustes de funcionalidades concretas</dt>
+	<dd>Una serie de ajustes individuales se controlan mediante funcionalidades adicionales que pueden, o no, estar activadas en un hub o para su canal en concreto. Varias funcionalidades adicionales tienen ajustes para cada conexión, Estas funcionalidades se pueden configurar en esta página, de forma adicional, mediante pestañas que pueden estar presentes.</dd> 
+</dl>
diff --git a/doc/hidden_configs.bb b/doc/hidden_configs.bb
index 6e093dbfc..35408c037 100644
--- a/doc/hidden_configs.bb
+++ b/doc/hidden_configs.bb
@@ -67,7 +67,7 @@ Options are:
   [*= system.paranoia ] As the pconfig, but on a site-wide basis.  Can be overwritten by member settings.
   [*= system.photo_cache_time ] How long to cache photos, in seconds. Default is 86400 (1 day). Longer time increases performance, but it also means it takes longer for changed permissions to apply.
   [*= system.platform_name ] What to report as the platform name in webpages and statistics. (*) Must be set in .htconfig.php
-  [*= system.poco_rating_enable ] Distributed reputation reporting and data collection may be disabled. If your site does not participate  in distributed reputation you will also not be able to make use of the data from your connections on  other sites. By default and in the absence of any setting it is enabled. Individual members can opt out  by restricting who can see their connections or by not providing any reputation information for their  connections.
+  [*= system.rating_enabled ] Distributed reputation reporting and data collection. This feature is currently being re-worked.
   [*= system.poke_basic ] Reduce the number of poke verbs to exactly 1 ("poke"). Disable other verbs. 
   [*= system.proc_run_use_exec ] If 1, use the exec system call in proc_run to run background tasks. By default we use proc_open and proc_close. On some (currently rare) systems this does not work well.
   [*= system.projecthome ] Display the project page on your home page for logged out viewers.
diff --git a/include/attach.php b/include/attach.php
index 6b17cdca1..137d2b11c 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -2040,4 +2040,128 @@ function copy_folder_to_cloudfiles($channel, $observer_hash, $srcpath, $cloudpat
 		}
 
     return true;
-}
-\ No newline at end of file
+}
+/**
+ * attach_move()
+ * This function performs an in place directory-to-directory move of a stored attachment or photo.
+ * The data is physically moved in the store/nickname storage location and the paths adjusted
+ * in the attach structure (and if applicable the photo table). The new 'album name' is recorded
+ * for photos and will show up immediately there.
+ * This takes a channel_id, attach.hash of the file to move (this is the same as a photo resource_id), and
+ * the attach.hash of the new parent folder, which must already exist. If $new_folder_hash is blank or empty,
+ * the file is relocated to the root of the channel's storage area. 
+ *
+ * @fixme: this operation is currently not synced to clones !!
+ */
+
+function attach_move($channel_id,$resource_id,$new_folder_hash) {
+
+	$c = channelx_by_n($channel_id);
+	if(! $c)
+		return false;
+
+	$r = q("select * from attach where hash = '%s' and uid = %d limit 1",
+		dbesc($resource_id),
+		intval($channel_id)
+	);
+	if(! $r)
+		return false;
+
+	$oldstorepath = $r[0]['content'];
+	
+	if($new_folder_hash) {
+		$n = q("select * from attach where hash = '%s' and uid = %d limit 1",
+			dbesc($new_folder_hash),
+			intval($channel_id)
+		);
+		if(! $n)
+			return;
+		$newdirname = $n[0]['filename'];
+		$newstorepath = $n[0]['content'] . '/' . $resource_id;
+	}
+	else {
+		$newstorepath = 'store/' . $c['channel_address'] . '/' . $resource_id;
+	}
+
+	rename($oldstorepath,$newstorepath);
+
+	// duplicate detection. If 'overwrite' is specified, return false because we can't yet do that.
+
+	$filename = $r[0]['filename'];
+
+	$s = q("select filename, id, hash, filesize from attach where filename = '%s' and folder = '%s' ",
+		dbesc($filename),
+		dbesc($new_folder_hash)
+	);
+
+	if($s) {
+		$overwrite = get_pconfig($channel_id,'system','overwrite_dup_files');
+		if($overwrite) {
+			// @fixme
+			return;
+		}
+		else {
+			if(strpos($filename,'.') !== false) {
+				$basename = substr($filename,0,strrpos($filename,'.'));
+				$ext = substr($filename,strrpos($filename,'.'));
+			}
+			else {
+				$basename = $filename;
+				$ext = '';
+			}
+
+			$v = q("select filename from attach where ( filename = '%s' OR filename like '%s' ) and folder = '%s' ",
+				dbesc($basename . $ext),
+				dbesc($basename . '(%)' . $ext),
+				dbesc($new_folder_hash)
+			);
+
+			if($v) {
+				$x = 1;
+
+				do {
+					$found = false;
+					foreach($v as $vv) {
+						if($vv['filename'] === $basename . '(' . $x . ')' . $ext) {
+							$found = true;
+							break;
+						}
+					}
+					if($found)
+						$x++;
+				}			
+				while($found);
+				$filename = $basename . '(' . $x . ')' . $ext;
+			}
+			else
+				$filename = $basename . $ext;
+		}
+	}
+
+	$t = q("update attach set content = '%s', folder = '%s', filename = '%s' where id = %d",
+		dbesc($newstorepath),
+		dbesc($new_folder_hash),
+		dbesc($filename),
+		intval($r[0]['id'])
+	);
+
+	if($r[0]['is_photo']) {
+		$t = q("update photo set album = '%s', filename = '%s' where resource_id = '%s' and uid = %d",
+			dbesc($newdirname),
+			dbesc($filename),
+			dbesc($resource_id),
+			intval($channel_id)
+		);
+
+		$t = q("update photo set content = '%s' where resource_id = '%s' and uid = %d and imgscale = 0",
+			dbesc($newstorepath),
+			dbesc($resource_id),
+			intval($channel_id)
+		);
+	}
+
+	return true;
+
+}
+
+
diff --git a/include/channel.php b/include/channel.php
index 47db7e806..2c892dbb9 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -1103,8 +1103,8 @@ function profile_sidebar($profile, $block = 0, $show_connect = true, $zcard = fa
 
 	require_once('include/widgets.php');
 
-	if(! feature_enabled($profile['uid'],'hide_rating'))
-		$z = widget_rating(array('target' => $profile['channel_hash']));
+//	if(! feature_enabled($profile['uid'],'hide_rating'))
+	$z = widget_rating(array('target' => $profile['channel_hash']));
 
 	$o .= replace_macros($tpl, array(
 		'$zcard'         => $zcard,
diff --git a/include/conversation.php b/include/conversation.php
index 637234bff..2e056b620 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -941,12 +941,9 @@ function item_photo_menu($item){
 		$clean_url = normalise_link($item['author-link']);
 	}
 
-	$poco_rating = get_config('system','poco_rating_enable');
-	// if unset default to enabled
-	if($poco_rating === false)
-		$poco_rating = true;
+	$rating_enabled = get_config('system','rating_enabled');
 
-	$ratings_url = (($poco_rating) ? z_root() . '/ratings/' . urlencode($item['author_xchan']) : '');
+	$ratings_url = (($rating_enabled) ? z_root() . '/ratings/' . urlencode($item['author_xchan']) : '');
 
 	$post_menu = Array(
 		t("View Source") => $vsrc_link,
diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php
index f6091f6e1..7225a9be2 100755
--- a/include/dba/dba_driver.php
+++ b/include/dba/dba_driver.php
@@ -62,6 +62,8 @@ class DBA {
  
 
 		if(is_object(self::$dba) && self::$dba->connected) {
+			if($server === 'localhost') 
+				$port = $set_port;
 			$dns = ((self::$dbtype == DBTYPE_POSTGRES) ? 'postgres' : 'mysql')
 			. ':host=' . $server . (is_null($port) ? '' : ';port=' . $port)
 			. ';dbname=' . $db;
diff --git a/include/features.php b/include/features.php
index 356de35a2..4e86b7881 100644
--- a/include/features.php
+++ b/include/features.php
@@ -55,21 +55,18 @@ function get_features($filtered = true) {
 			array('profile_export',      t('Profile Import/Export'),  t('Save and load profile details across sites/channels'),false,get_config('feature_lock','profile_export')),
 			array('webpages',            t('Web Pages'),              t('Provide managed web pages on your channel'),false,get_config('feature_lock','webpages')),
 			array('wiki',            t('Wiki'),              t('Provide a wiki for your channel'),(($server_role === 'basic') ? false : true),get_config('feature_lock','wiki')),
-			array('hide_rating',       t('Hide Rating'),          t('Hide the rating buttons on your channel and profile pages. Note: People can still rate you somewhere else.'),false,get_config('feature_lock','hide_rating')),			
+//			array('hide_rating',       t('Hide Rating'),          t('Hide the rating buttons on your channel and profile pages. Note: People can still rate you somewhere else.'),false,get_config('feature_lock','hide_rating')),			
 			array('private_notes',       t('Private Notes'),          t('Enables a tool to store notes and reminders (note: not encrypted)'),false,get_config('feature_lock','private_notes')),
 			array('nav_channel_select',  t('Navigation Channel Select'), t('Change channels directly from within the navigation dropdown menu'),false,get_config('feature_lock','nav_channel_select')),
 			array('photo_location',       t('Photo Location'),          t('If location data is available on uploaded photos, link this to a map.'),false,get_config('feature_lock','photo_location')),
 			array('ajaxchat',       t('Access Controlled Chatrooms'),          t('Provide chatrooms and chat services with access control.'),true,get_config('feature_lock','ajaxchat')),
 			array('smart_birthdays',       t('Smart Birthdays'),          t('Make birthday events timezone aware in case your friends are scattered across the planet.'),true,get_config('feature_lock','smart_birthdays')),
 			array('expert',       t('Expert Mode'),                 t('Enable Expert Mode to provide advanced configuration options'),false,get_config('feature_lock','expert')),
-			array('premium_channel', t('Premium Channel'), t('Allows you to set restrictions and terms on those that connect with your channel'),false,get_config('feature_lock','premium_channel')),
 		),
 
 		// Post composition
 		'composition' => array(
 			t('Post Composition Features'),
-//			array('richtext',       t('Richtext Editor'),			t('Enable richtext editor'),falseget_config('feature_lock','richtext')),
-//			array('markdown',       t('Use Markdown'),              t('Allow use of "Markdown" to format posts'),false,get_config('feature_lock','markdown')),
 			array('large_photos',   t('Large Photos'),              t('Include large (1024px) photo thumbnails in posts. If not enabled, use small (640px) photo thumbnails'),false,get_config('feature_lock','large_photos')),
 			array('channel_sources', t('Channel Sources'),          t('Automatically import channel content from other channels or feeds'),false,get_config('feature_lock','channel_sources')),
 			array('content_encrypt', t('Even More Encryption'),          t('Allow optional encryption of content end-to-end with a shared secret key'),false,get_config('feature_lock','content_encrypt')),
@@ -106,6 +103,18 @@ function get_features($filtered = true) {
 		),
 	);
 
+
+
+	if(\Zotlabs\Lib\System::get_server_role() === 'pro') {
+		$arr['general'][] = [
+			'premium_channel', 
+			t('Premium Channel'), 
+			t('Allows you to set restrictions and terms on those that connect with your channel'),
+			false,
+			get_config('feature_lock','premium_channel')
+		];
+	}
+
 	// removed any locked features and remove the entire category if this makes it empty
 
 	if($filtered) {
diff --git a/include/photos.php b/include/photos.php
index d14c12d84..9d15d3692 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -588,6 +588,8 @@ function photos_album_rename($channel_id, $oldname, $newname) {
 	);
 }
 
+
+
 /**
  * @brief
  *
diff --git a/include/widgets.php b/include/widgets.php
index 2f8416f8e..9429df249 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -1286,8 +1286,8 @@ function widget_random_block($arr) {
 function widget_rating($arr) {
 
 
-	$poco_rating = get_config('system','poco_rating_enable');
-	if((! $poco_rating) && ($poco_rating !== false)) {
+	$rating_enabled = get_config('system','rating_enabled');
+	if(! $rating_enabled) {
 		return;
 	}
 
diff --git a/include/zot.php b/include/zot.php
index c3c924113..6187e8a61 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -3785,20 +3785,14 @@ function zotinfo($arr) {
 	if($role === 'forum' || $role === 'repository') {
 		$public_forum = true;
 	}
-	elseif($ztarget_hash) {
+	else {
 		// check if it has characteristics of a public forum based on custom permissions.
-		$t = q("select * from abconfig where abconfig.cat = 'my_perms' and abconfig.chan = %d and abconfig.xchan = '%s' and abconfig.k in ('tag_deliver', 'send_stream') ",
-			intval($e['channel_id']),
-			dbesc($ztarget_hash)
-		);
-
-		$ch = 0;
-
-		if($t) {
-			foreach($t as $tt) {
-				if($tt['k'] == 'tag_deliver' && $tt['v'] == 1)
+		$m = \Zotlabs\Access\Permissions::FilledAutoperms($e['channel_id']);
+		if($m) {
+			foreach($m as $k => $v) {
+				if($k == 'tag_deliver' && intval($v) == 1)
 					$ch ++;
-				if($tt['k'] == 'send_stream' && $tt['v'] == 0)
+				if($k == 'send_stream' && intval($v) == 0)
 					$ch ++;
 			}
 			if($ch == 2)
diff --git a/util/hmessages.po b/util/hmessages.po
index ada834815..f985f6903 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-08-19 00:02-0700\n"
+"POT-Creation-Date: 2016-08-26 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"
@@ -87,9 +87,10 @@ msgstr ""
 msgid "Special - Group Repository"
 msgstr ""
 
-#: ../../Zotlabs/Access/PermissionRoles.php:204 ../../include/selectors.php:49
+#: ../../Zotlabs/Access/PermissionRoles.php:204
+#: ../../include/permissions.php:943 ../../include/selectors.php:49
 #: ../../include/selectors.php:66 ../../include/selectors.php:104
-#: ../../include/selectors.php:140 ../../include/permissions.php:943
+#: ../../include/selectors.php:140
 msgid "Other"
 msgstr ""
 
@@ -193,13 +194,13 @@ msgstr ""
 #: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:800
 #: ../../Zotlabs/Module/Photos.php:1249
 #: ../../Zotlabs/Module/Embedphotos.php:147 ../../Zotlabs/Lib/Apps.php:490
-#: ../../Zotlabs/Lib/Apps.php:565 ../../include/conversation.php:1036
-#: ../../include/widgets.php:1613
+#: ../../Zotlabs/Lib/Apps.php:565 ../../include/widgets.php:1613
+#: ../../include/conversation.php:1033
 msgid "Unknown"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:226 ../../Zotlabs/Module/Fbrowser.php:85
-#: ../../Zotlabs/Lib/Apps.php:217 ../../include/conversation.php:1669
+#: ../../Zotlabs/Lib/Apps.php:217 ../../include/conversation.php:1672
 #: ../../include/nav.php:95
 msgid "Files"
 msgstr ""
@@ -213,24 +214,23 @@ msgid "Shared"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:323
-#: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/New_channel.php:142
+#: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/Webpages.php:216
+#: ../../Zotlabs/Module/New_channel.php:142
 #: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/Layouts.php:184
-#: ../../Zotlabs/Module/Webpages.php:216
 msgid "Create"
 msgstr ""
 
 #: ../../Zotlabs/Storage/Browser.php:231 ../../Zotlabs/Storage/Browser.php:325
 #: ../../Zotlabs/Module/Cover_photo.php:357
-#: ../../Zotlabs/Module/Profile_photo.php:390
 #: ../../Zotlabs/Module/Photos.php:827 ../../Zotlabs/Module/Photos.php:1370
+#: ../../Zotlabs/Module/Profile_photo.php:390
 #: ../../Zotlabs/Module/Embedphotos.php:159 ../../include/widgets.php:1626
 msgid "Upload"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Chat.php:250
-#: ../../Zotlabs/Module/Admin.php:1223
-#: ../../Zotlabs/Module/Sharedwithme.php:99
-#: ../../Zotlabs/Module/Settings.php:684 ../../Zotlabs/Module/Settings.php:710
+#: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Settings.php:684
+#: ../../Zotlabs/Module/Settings.php:710 ../../Zotlabs/Module/Admin.php:1236
+#: ../../Zotlabs/Module/Sharedwithme.php:99 ../../Zotlabs/Module/Chat.php:250
 msgid "Name"
 msgstr ""
 
@@ -248,33 +248,34 @@ msgstr ""
 msgid "Last Modified"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Thing.php:260
+#: ../../Zotlabs/Storage/Browser.php:240
 #: ../../Zotlabs/Module/Connections.php:290
 #: ../../Zotlabs/Module/Connections.php:310
 #: ../../Zotlabs/Module/Editblock.php:109
 #: ../../Zotlabs/Module/Editlayout.php:114
 #: ../../Zotlabs/Module/Editwebpage.php:145 ../../Zotlabs/Module/Menu.php:112
-#: ../../Zotlabs/Module/Admin.php:2113 ../../Zotlabs/Module/Blocks.php:160
-#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:217
-#: ../../Zotlabs/Module/Settings.php:744 ../../Zotlabs/Module/Editpost.php:84
-#: ../../Zotlabs/Lib/Apps.php:341 ../../Zotlabs/Lib/ThreadItem.php:106
-#: ../../include/page_widgets.php:9 ../../include/page_widgets.php:39
-#: ../../include/menu.php:113 ../../include/channel.php:959
-#: ../../include/channel.php:963
+#: ../../Zotlabs/Module/Settings.php:744 ../../Zotlabs/Module/Admin.php:2127
+#: ../../Zotlabs/Module/Webpages.php:217 ../../Zotlabs/Module/Blocks.php:160
+#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Editpost.php:84
+#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Lib/Apps.php:341
+#: ../../Zotlabs/Lib/ThreadItem.php:106 ../../include/channel.php:959
+#: ../../include/channel.php:963 ../../include/page_widgets.php:9
+#: ../../include/page_widgets.php:39 ../../include/menu.php:113
 msgid "Edit"
 msgstr ""
 
-#: ../../Zotlabs/Storage/Browser.php:241 ../../Zotlabs/Module/Thing.php:261
-#: ../../Zotlabs/Module/Connedit.php:607
+#: ../../Zotlabs/Storage/Browser.php:241
 #: ../../Zotlabs/Module/Connections.php:263
 #: ../../Zotlabs/Module/Editblock.php:134
 #: ../../Zotlabs/Module/Editlayout.php:137
-#: ../../Zotlabs/Module/Editwebpage.php:170 ../../Zotlabs/Module/Group.php:177
-#: ../../Zotlabs/Module/Admin.php:1039 ../../Zotlabs/Module/Admin.php:1213
-#: ../../Zotlabs/Module/Admin.php:2114 ../../Zotlabs/Module/Blocks.php:162
-#: ../../Zotlabs/Module/Photos.php:1179 ../../Zotlabs/Module/Webpages.php:219
-#: ../../Zotlabs/Module/Settings.php:745 ../../Zotlabs/Lib/Apps.php:342
-#: ../../Zotlabs/Lib/ThreadItem.php:126 ../../include/conversation.php:660
+#: ../../Zotlabs/Module/Editwebpage.php:170
+#: ../../Zotlabs/Module/Settings.php:745 ../../Zotlabs/Module/Group.php:177
+#: ../../Zotlabs/Module/Photos.php:1179 ../../Zotlabs/Module/Admin.php:1052
+#: ../../Zotlabs/Module/Admin.php:1226 ../../Zotlabs/Module/Admin.php:2128
+#: ../../Zotlabs/Module/Webpages.php:219 ../../Zotlabs/Module/Blocks.php:162
+#: ../../Zotlabs/Module/Connedit.php:607 ../../Zotlabs/Module/Thing.php:261
+#: ../../Zotlabs/Lib/Apps.php:342 ../../Zotlabs/Lib/ThreadItem.php:126
+#: ../../include/conversation.php:660
 msgid "Delete"
 msgstr ""
 
@@ -304,74 +305,64 @@ msgstr ""
 msgid "Drop files here to immediately upload"
 msgstr ""
 
-#: ../../Zotlabs/Web/WebServer.php:127 ../../Zotlabs/Module/Like.php:283
-#: ../../Zotlabs/Module/Group.php:72 ../../Zotlabs/Module/Import_items.php:114
-#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62
-#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:66
-#: ../../include/items.php:384
-msgid "Permission denied"
-msgstr ""
-
-#: ../../Zotlabs/Web/WebServer.php:128 ../../Zotlabs/Web/Router.php:65
-#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Thing.php:274
-#: ../../Zotlabs/Module/Thing.php:294 ../../Zotlabs/Module/Thing.php:335
-#: ../../Zotlabs/Module/Like.php:181 ../../Zotlabs/Module/Authtest.php:16
-#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Bookmarks.php:61
-#: ../../Zotlabs/Module/Item.php:214 ../../Zotlabs/Module/Item.php:222
-#: ../../Zotlabs/Module/Item.php:1073 ../../Zotlabs/Module/Page.php:35
-#: ../../Zotlabs/Module/Page.php:91 ../../Zotlabs/Module/Connedit.php:395
-#: ../../Zotlabs/Module/Connections.php:33
+#: ../../Zotlabs/Web/Router.php:65 ../../Zotlabs/Web/WebServer.php:128
+#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Api.php:12
+#: ../../Zotlabs/Module/Rate.php:113 ../../Zotlabs/Module/Authtest.php:16
+#: ../../Zotlabs/Module/Register.php:77 ../../Zotlabs/Module/Bookmarks.php:61
+#: ../../Zotlabs/Module/Page.php:35 ../../Zotlabs/Module/Page.php:91
+#: ../../Zotlabs/Module/Network.php:15 ../../Zotlabs/Module/Connections.php:33
 #: ../../Zotlabs/Module/Cover_photo.php:277
-#: ../../Zotlabs/Module/Cover_photo.php:290 ../../Zotlabs/Module/Mail.php:121
+#: ../../Zotlabs/Module/Cover_photo.php:290 ../../Zotlabs/Module/Setup.php:219
 #: ../../Zotlabs/Module/Editblock.php:67
 #: ../../Zotlabs/Module/Editlayout.php:67
 #: ../../Zotlabs/Module/Editlayout.php:90
 #: ../../Zotlabs/Module/Editwebpage.php:68
 #: ../../Zotlabs/Module/Editwebpage.php:89
 #: ../../Zotlabs/Module/Editwebpage.php:104
-#: ../../Zotlabs/Module/Editwebpage.php:126 ../../Zotlabs/Module/Chat.php:100
-#: ../../Zotlabs/Module/Chat.php:105 ../../Zotlabs/Module/Appman.php:75
-#: ../../Zotlabs/Module/Pdledit.php:26 ../../Zotlabs/Module/Filestorage.php:23
+#: ../../Zotlabs/Module/Editwebpage.php:126 ../../Zotlabs/Module/Menu.php:78
+#: ../../Zotlabs/Module/Appman.php:75 ../../Zotlabs/Module/Pdledit.php:26
+#: ../../Zotlabs/Module/Filestorage.php:23
 #: ../../Zotlabs/Module/Filestorage.php:78
 #: ../../Zotlabs/Module/Filestorage.php:93
 #: ../../Zotlabs/Module/Filestorage.php:120
-#: ../../Zotlabs/Module/Profiles.php:203 ../../Zotlabs/Module/Profiles.php:601
-#: ../../Zotlabs/Module/Channel.php:104 ../../Zotlabs/Module/Channel.php:226
-#: ../../Zotlabs/Module/Channel.php:267 ../../Zotlabs/Module/Group.php:13
-#: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/Block.php:26
+#: ../../Zotlabs/Module/Settings.php:664 ../../Zotlabs/Module/Group.php:13
+#: ../../Zotlabs/Module/Photos.php:73 ../../Zotlabs/Module/Block.php:26
 #: ../../Zotlabs/Module/Block.php:76 ../../Zotlabs/Module/Invite.php:17
 #: ../../Zotlabs/Module/Invite.php:91 ../../Zotlabs/Module/Locs.php:87
-#: ../../Zotlabs/Module/Events.php:264 ../../Zotlabs/Module/Message.php:18
-#: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Mood.php:116
-#: ../../Zotlabs/Module/Menu.php:78 ../../Zotlabs/Module/Setup.php:215
-#: ../../Zotlabs/Module/New_channel.php:77
+#: ../../Zotlabs/Module/Like.php:181 ../../Zotlabs/Module/Manage.php:10
+#: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/Message.php:18
+#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Profiles.php:203
+#: ../../Zotlabs/Module/Profiles.php:601 ../../Zotlabs/Module/Webpages.php:95
+#: ../../Zotlabs/Module/Events.php:264 ../../Zotlabs/Module/New_channel.php:77
 #: ../../Zotlabs/Module/New_channel.php:104
 #: ../../Zotlabs/Module/Notifications.php:70 ../../Zotlabs/Module/Poke.php:137
 #: ../../Zotlabs/Module/Profile.php:68 ../../Zotlabs/Module/Profile.php:76
-#: ../../Zotlabs/Module/Api.php:12 ../../Zotlabs/Module/Blocks.php:73
+#: ../../Zotlabs/Module/Channel.php:104 ../../Zotlabs/Module/Channel.php:227
+#: ../../Zotlabs/Module/Channel.php:268 ../../Zotlabs/Module/Blocks.php:73
 #: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Layouts.php:71
 #: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89
 #: ../../Zotlabs/Module/Profile_photo.php:265
 #: ../../Zotlabs/Module/Profile_photo.php:278
-#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Network.php:15
-#: ../../Zotlabs/Module/Photos.php:73 ../../Zotlabs/Module/Regmod.php:21
-#: ../../Zotlabs/Module/Webpages.php:95
+#: ../../Zotlabs/Module/Common.php:39 ../../Zotlabs/Module/Mail.php:121
+#: ../../Zotlabs/Module/Connedit.php:395 ../../Zotlabs/Module/Regmod.php:21
+#: ../../Zotlabs/Module/Editpost.php:17
 #: ../../Zotlabs/Module/Service_limits.php:11
-#: ../../Zotlabs/Module/Register.php:77
+#: ../../Zotlabs/Module/Thing.php:274 ../../Zotlabs/Module/Thing.php:294
+#: ../../Zotlabs/Module/Thing.php:335 ../../Zotlabs/Module/Item.php:214
+#: ../../Zotlabs/Module/Item.php:222 ../../Zotlabs/Module/Item.php:1073
 #: ../../Zotlabs/Module/Sharedwithme.php:11
 #: ../../Zotlabs/Module/Sources.php:74 ../../Zotlabs/Module/Suggest.php:30
-#: ../../Zotlabs/Module/Settings.php:664
 #: ../../Zotlabs/Module/Viewconnections.php:28
 #: ../../Zotlabs/Module/Viewconnections.php:33
-#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Editpost.php:17
-#: ../../Zotlabs/Lib/Chatroom.php:137 ../../include/photos.php:27
-#: ../../include/items.php:3450 ../../include/attach.php:142
-#: ../../include/attach.php:190 ../../include/attach.php:253
-#: ../../include/attach.php:267 ../../include/attach.php:274
-#: ../../include/attach.php:339 ../../include/attach.php:353
-#: ../../include/attach.php:360 ../../include/attach.php:440
-#: ../../include/attach.php:902 ../../include/attach.php:973
-#: ../../include/attach.php:1125
+#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Chat.php:100
+#: ../../Zotlabs/Module/Chat.php:105 ../../Zotlabs/Lib/Chatroom.php:137
+#: ../../include/items.php:3477 ../../include/photos.php:27
+#: ../../include/attach.php:142 ../../include/attach.php:190
+#: ../../include/attach.php:253 ../../include/attach.php:267
+#: ../../include/attach.php:274 ../../include/attach.php:339
+#: ../../include/attach.php:353 ../../include/attach.php:360
+#: ../../include/attach.php:440 ../../include/attach.php:902
+#: ../../include/attach.php:973 ../../include/attach.php:1125
 msgid "Permission denied."
 msgstr ""
 
@@ -379,12 +370,20 @@ msgstr ""
 msgid "Not Found"
 msgstr ""
 
-#: ../../Zotlabs/Web/Router.php:149 ../../Zotlabs/Module/Page.php:94
-#: ../../Zotlabs/Module/Help.php:97 ../../Zotlabs/Module/Block.php:79
-#: ../../Zotlabs/Module/Display.php:119
+#: ../../Zotlabs/Web/Router.php:149 ../../Zotlabs/Module/Display.php:120
+#: ../../Zotlabs/Module/Page.php:94 ../../Zotlabs/Module/Help.php:97
+#: ../../Zotlabs/Module/Block.php:79
 msgid "Page not found."
 msgstr ""
 
+#: ../../Zotlabs/Web/WebServer.php:127 ../../Zotlabs/Module/Dreport.php:10
+#: ../../Zotlabs/Module/Dreport.php:66 ../../Zotlabs/Module/Group.php:72
+#: ../../Zotlabs/Module/Import_items.php:114 ../../Zotlabs/Module/Like.php:283
+#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62
+#: ../../include/items.php:384
+msgid "Permission denied"
+msgstr ""
+
 #: ../../Zotlabs/Zot/Auth.php:138
 msgid ""
 "Remote authentication blocked. You are logged into this site locally. Please "
@@ -400,10 +399,11 @@ msgstr ""
 #: ../../Zotlabs/Module/Editblock.php:31
 #: ../../Zotlabs/Module/Editlayout.php:31
 #: ../../Zotlabs/Module/Editwebpage.php:32
-#: ../../Zotlabs/Module/Filestorage.php:59 ../../Zotlabs/Module/Hcard.php:12
+#: ../../Zotlabs/Module/Filestorage.php:59
+#: ../../Zotlabs/Module/Webpages.php:33 ../../Zotlabs/Module/Hcard.php:12
 #: ../../Zotlabs/Module/Profile.php:20 ../../Zotlabs/Module/Blocks.php:33
 #: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Connect.php:17
-#: ../../Zotlabs/Module/Webpages.php:33 ../../include/channel.php:859
+#: ../../include/channel.php:859
 msgid "Requested profile is not available."
 msgstr ""
 
@@ -419,447 +419,373 @@ msgstr ""
 msgid "Online"
 msgstr ""
 
-#: ../../Zotlabs/Module/Thing.php:89 ../../Zotlabs/Module/Filestorage.php:32
-#: ../../Zotlabs/Module/Display.php:40 ../../Zotlabs/Module/Admin.php:164
-#: ../../Zotlabs/Module/Admin.php:1255 ../../Zotlabs/Module/Admin.php:1561
-#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3371
-msgid "Item not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Thing.php:114
-msgid "Thing updated"
-msgstr ""
-
-#: ../../Zotlabs/Module/Thing.php:166
-msgid "Object store: failed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Thing.php:170
-msgid "Thing added"
-msgstr ""
-
-#: ../../Zotlabs/Module/Thing.php:196
-#, php-format
-msgid "OBJ: %1$s %2$s %3$s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Thing.php:259
-msgid "Show Thing"
-msgstr ""
-
-#: ../../Zotlabs/Module/Thing.php:266
-msgid "item not found."
-msgstr ""
-
-#: ../../Zotlabs/Module/Thing.php:299
-msgid "Edit Thing"
-msgstr ""
-
-#: ../../Zotlabs/Module/Thing.php:301 ../../Zotlabs/Module/Thing.php:355
-msgid "Select a profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:358
-msgid "Post an activity"
-msgstr ""
-
-#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:358
-msgid "Only sends to viewers of the applicable profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:360
-msgid "Name of thing e.g. something"
-msgstr ""
-
-#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:361
-msgid "URL of thing (optional)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:362
-msgid "URL for photo of thing (optional)"
-msgstr ""
-
-#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:363
-#: ../../Zotlabs/Module/Chat.php:234 ../../Zotlabs/Module/Filestorage.php:152
-#: ../../Zotlabs/Module/Photos.php:669 ../../Zotlabs/Module/Photos.php:1047
-#: ../../include/acl_selectors.php:186
-msgid "Permissions"
-msgstr ""
-
-#: ../../Zotlabs/Module/Thing.php:320 ../../Zotlabs/Module/Thing.php:370
-#: ../../Zotlabs/Module/Rate.php:170 ../../Zotlabs/Module/Connedit.php:783
-#: ../../Zotlabs/Module/Import.php:560 ../../Zotlabs/Module/Mail.php:370
-#: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:241
-#: ../../Zotlabs/Module/Appman.php:126 ../../Zotlabs/Module/Pdledit.php:66
-#: ../../Zotlabs/Module/Filestorage.php:165
-#: ../../Zotlabs/Module/Profiles.php:687 ../../Zotlabs/Module/Group.php:85
-#: ../../Zotlabs/Module/Mitem.php:243
-#: ../../Zotlabs/Module/Import_items.php:122
-#: ../../Zotlabs/Module/Invite.php:146 ../../Zotlabs/Module/Locs.php:121
-#: ../../Zotlabs/Module/Events.php:484 ../../Zotlabs/Module/Mood.php:139
-#: ../../Zotlabs/Module/Setup.php:312 ../../Zotlabs/Module/Setup.php:353
-#: ../../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/Cal.php:338
-#: ../../Zotlabs/Module/Connect.php:98 ../../Zotlabs/Module/Photos.php:679
-#: ../../Zotlabs/Module/Photos.php:1058 ../../Zotlabs/Module/Photos.php:1098
-#: ../../Zotlabs/Module/Photos.php:1216 ../../Zotlabs/Module/Sources.php:114
-#: ../../Zotlabs/Module/Sources.php:149 ../../Zotlabs/Module/Settings.php:682
-#: ../../Zotlabs/Module/Settings.php:795 ../../Zotlabs/Module/Settings.php:886
-#: ../../Zotlabs/Module/Settings.php:912 ../../Zotlabs/Module/Settings.php:935
-#: ../../Zotlabs/Module/Settings.php:1040
-#: ../../Zotlabs/Module/Settings.php:1229 ../../Zotlabs/Module/Xchan.php:15
-#: ../../Zotlabs/Lib/ThreadItem.php:711 ../../include/widgets.php:763
-#: ../../include/js_strings.php:22
-#: ../../view/theme/redbasic/php/config.php:106
-msgid "Submit"
-msgstr ""
-
-#: ../../Zotlabs/Module/Thing.php:353
-msgid "Add Thing to your Profile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:19
-msgid "Like/Dislike"
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:24
-msgid "This action is restricted to members."
-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/Dreport.php:44
+msgid "Invalid message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:105 ../../Zotlabs/Module/Like.php:131
-#: ../../Zotlabs/Module/Like.php:169
-msgid "Invalid request."
+#: ../../Zotlabs/Module/Dreport.php:76
+msgid "no results"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:117 ../../include/conversation.php:126
-msgid "channel"
+#: ../../Zotlabs/Module/Dreport.php:91
+msgid "channel sync processed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:146
-msgid "thing"
+#: ../../Zotlabs/Module/Dreport.php:95
+msgid "queued"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:192
-msgid "Channel unavailable."
+#: ../../Zotlabs/Module/Dreport.php:99
+msgid "posted"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:240
-msgid "Previous action reversed."
+#: ../../Zotlabs/Module/Dreport.php:103
+msgid "accepted for delivery"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
-#: ../../Zotlabs/Module/Tagger.php:47 ../../include/conversation.php:120
-#: ../../include/text.php:1945
-msgid "photo"
+#: ../../Zotlabs/Module/Dreport.php:107
+msgid "updated"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
-#: ../../include/conversation.php:148 ../../include/text.php:1951
-msgid "status"
+#: ../../Zotlabs/Module/Dreport.php:110
+msgid "update ignored"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:372 ../../Zotlabs/Module/Events.php:253
-#: ../../Zotlabs/Module/Tagger.php:51 ../../include/conversation.php:123
-#: ../../include/text.php:1948 ../../include/event.php:958
-msgid "event"
+#: ../../Zotlabs/Module/Dreport.php:113
+msgid "permission denied"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:419 ../../include/conversation.php:164
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
+#: ../../Zotlabs/Module/Dreport.php:117
+msgid "recipient not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:421 ../../include/conversation.php:167
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
+#: ../../Zotlabs/Module/Dreport.php:120
+msgid "mail recalled"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:423
-#, php-format
-msgid "%1$s agrees with %2$s's %3$s"
+#: ../../Zotlabs/Module/Dreport.php:123
+msgid "duplicate mail received"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:425
-#, php-format
-msgid "%1$s doesn't agree with %2$s's %3$s"
+#: ../../Zotlabs/Module/Dreport.php:126
+msgid "mail delivered"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:427
+#: ../../Zotlabs/Module/Dreport.php:146
 #, php-format
-msgid "%1$s abstains from a decision on %2$s's %3$s"
+msgid "Delivery report for %1$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:429
-#, php-format
-msgid "%1$s is attending %2$s's %3$s"
+#: ../../Zotlabs/Module/Dreport.php:149
+msgid "Options"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:431
-#, php-format
-msgid "%1$s is not attending %2$s's %3$s"
+#: ../../Zotlabs/Module/Dreport.php:150
+msgid "Redeliver"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:433
+#: ../../Zotlabs/Module/Probe.php:28 ../../Zotlabs/Module/Probe.php:32
 #, php-format
-msgid "%1$s may attend %2$s's %3$s"
-msgstr ""
-
-#: ../../Zotlabs/Module/Like.php:538
-msgid "Action completed."
+msgid "Fetching URL returns error: %1$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Like.php:539
-msgid "Thank you."
+#: ../../Zotlabs/Module/Api.php:60 ../../Zotlabs/Module/Api.php:81
+msgid "Authorize application connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:20 ../../Zotlabs/Module/Chat.php:25
-#: ../../Zotlabs/Module/Channel.php:28
-msgid "You must be logged in to see this page."
+#: ../../Zotlabs/Module/Api.php:61
+msgid "Return to your app and insert this Security Code:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:34
-msgid "Not found"
+#: ../../Zotlabs/Module/Api.php:71
+msgid "Please login to continue."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:97 ../../Zotlabs/Lib/Apps.php:219
-#: ../../include/conversation.php:1725 ../../include/conversation.php:1728
-#: ../../include/features.php:57 ../../include/nav.php:110
-msgid "Wiki"
+#: ../../Zotlabs/Module/Api.php:83
+msgid ""
+"Do you want to authorize this application to access your posts and contacts, "
+"and/or create new posts for you?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:98
-msgid "Sandbox"
+#: ../../Zotlabs/Module/Api.php:84 ../../Zotlabs/Module/Menu.php:100
+#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Filestorage.php:160
+#: ../../Zotlabs/Module/Filestorage.php:168
+#: ../../Zotlabs/Module/Settings.php:673 ../../Zotlabs/Module/Photos.php:664
+#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163
+#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241
+#: ../../Zotlabs/Module/Admin.php:465 ../../Zotlabs/Module/Profiles.php:647
+#: ../../Zotlabs/Module/Events.php:462 ../../Zotlabs/Module/Events.php:463
+#: ../../Zotlabs/Module/Events.php:472 ../../Zotlabs/Module/Connedit.php:408
+#: ../../Zotlabs/Module/Removeme.php:63 ../../include/dir_fns.php:143
+#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145
+#: ../../view/theme/redbasic/php/config.php:111
+#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1742
+msgid "Yes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:100
-msgid ""
-"\"# Wiki Sandbox\\n\\nContent you **edit** and **preview** here *will not be "
-"saved*.\""
+#: ../../Zotlabs/Module/Api.php:85 ../../Zotlabs/Module/Menu.php:100
+#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Filestorage.php:160
+#: ../../Zotlabs/Module/Filestorage.php:168
+#: ../../Zotlabs/Module/Settings.php:673 ../../Zotlabs/Module/Photos.php:664
+#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163
+#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241
+#: ../../Zotlabs/Module/Admin.php:463 ../../Zotlabs/Module/Profiles.php:647
+#: ../../Zotlabs/Module/Events.php:462 ../../Zotlabs/Module/Events.php:463
+#: ../../Zotlabs/Module/Events.php:472 ../../Zotlabs/Module/Connedit.php:408
+#: ../../Zotlabs/Module/Connedit.php:686 ../../Zotlabs/Module/Removeme.php:63
+#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144
+#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:111
+#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1742
+msgid "No"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:169
-msgid "Revision Comparison"
+#: ../../Zotlabs/Module/Rate.php:155 ../../Zotlabs/Module/Connedit.php:762
+#: ../../include/js_strings.php:20
+msgid "Rating"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:170
-msgid "Revert"
+#: ../../Zotlabs/Module/Rate.php:156
+msgid "Website:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:171 ../../Zotlabs/Module/Wiki.php:211
-#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
-#: ../../Zotlabs/Module/Admin.php:1406 ../../Zotlabs/Module/Tagrm.php:15
-#: ../../Zotlabs/Module/Tagrm.php:138 ../../Zotlabs/Module/Settings.php:683
-#: ../../Zotlabs/Module/Settings.php:709 ../../include/conversation.php:1242
-#: ../../include/conversation.php:1289
-msgid "Cancel"
+#: ../../Zotlabs/Module/Rate.php:159
+#, php-format
+msgid "Remote Channel [%s] (not yet known on this site)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:201
-msgid "Enter the name of your new wiki:"
+#: ../../Zotlabs/Module/Rate.php:160
+msgid "Rating (this information is public)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:202
-msgid "Enter the name of the new page:"
+#: ../../Zotlabs/Module/Rate.php:161
+msgid "Optionally explain your rating (this information is public)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:203
-msgid "Enter the new name:"
+#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Module/Setup.php:316
+#: ../../Zotlabs/Module/Setup.php:364 ../../Zotlabs/Module/Appman.php:126
+#: ../../Zotlabs/Module/Pdledit.php:66
+#: ../../Zotlabs/Module/Filestorage.php:165
+#: ../../Zotlabs/Module/Settings.php:682 ../../Zotlabs/Module/Settings.php:795
+#: ../../Zotlabs/Module/Settings.php:886 ../../Zotlabs/Module/Settings.php:912
+#: ../../Zotlabs/Module/Settings.php:935
+#: ../../Zotlabs/Module/Settings.php:1040
+#: ../../Zotlabs/Module/Settings.php:1229 ../../Zotlabs/Module/Group.php:85
+#: ../../Zotlabs/Module/Photos.php:679 ../../Zotlabs/Module/Photos.php:1058
+#: ../../Zotlabs/Module/Photos.php:1098 ../../Zotlabs/Module/Photos.php:1216
+#: ../../Zotlabs/Module/Import_items.php:122
+#: ../../Zotlabs/Module/Invite.php:146 ../../Zotlabs/Module/Locs.php:121
+#: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Admin.php:502
+#: ../../Zotlabs/Module/Admin.php:701 ../../Zotlabs/Module/Admin.php:784
+#: ../../Zotlabs/Module/Admin.php:1045 ../../Zotlabs/Module/Admin.php:1224
+#: ../../Zotlabs/Module/Admin.php:1435 ../../Zotlabs/Module/Admin.php:1662
+#: ../../Zotlabs/Module/Admin.php:1747 ../../Zotlabs/Module/Admin.php:2130
+#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Profiles.php:687
+#: ../../Zotlabs/Module/Events.php:484 ../../Zotlabs/Module/Import.php:560
+#: ../../Zotlabs/Module/Poke.php:186 ../../Zotlabs/Module/Pconfig.php:107
+#: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Mail.php:370
+#: ../../Zotlabs/Module/Connedit.php:779 ../../Zotlabs/Module/Connect.php:98
+#: ../../Zotlabs/Module/Thing.php:320 ../../Zotlabs/Module/Thing.php:370
+#: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149
+#: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:241
+#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Lib/ThreadItem.php:711
+#: ../../include/widgets.php:763 ../../include/js_strings.php:22
+#: ../../view/theme/redbasic/php/config.php:106
+msgid "Submit"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:209 ../../include/conversation.php:1155
-msgid "Embed image from photo albums"
+#: ../../Zotlabs/Module/Pubsites.php:24 ../../include/widgets.php:1351
+msgid "Public Hubs"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:210 ../../include/conversation.php:1241
-msgid "Embed an image from your albums"
+#: ../../Zotlabs/Module/Pubsites.php:27
+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."
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:212 ../../include/conversation.php:1243
-#: ../../include/conversation.php:1288
-msgid "OK"
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Hub URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:213 ../../include/conversation.php:1191
-msgid "Choose images to embed"
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Access Type"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:214 ../../include/conversation.php:1192
-msgid "Choose an album"
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Registration Policy"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:215 ../../include/conversation.php:1193
-msgid "Choose a different album..."
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Stats"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:216 ../../include/conversation.php:1194
-msgid "Error getting album list"
+#: ../../Zotlabs/Module/Pubsites.php:33
+msgid "Software"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:217 ../../include/conversation.php:1195
-msgid "Error getting photo link"
+#: ../../Zotlabs/Module/Pubsites.php:35 ../../Zotlabs/Module/Ratings.php:97
+#: ../../include/conversation.php:960
+msgid "Ratings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Wiki.php:218 ../../include/conversation.php:1196
-msgid "Error getting album"
+#: ../../Zotlabs/Module/Pubsites.php:43
+msgid "Rate"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Display.php:17
-#: ../../Zotlabs/Module/Ratings.php:86 ../../Zotlabs/Module/Photos.php:520
-#: ../../Zotlabs/Module/Search.php:17
-#: ../../Zotlabs/Module/Viewconnections.php:23
-msgid "Public access denied."
+#: ../../Zotlabs/Module/Pubsites.php:46 ../../Zotlabs/Module/Locs.php:117
+#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:698
+#: ../../Zotlabs/Module/Events.php:467 ../../include/js_strings.php:25
+msgid "Location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:243
-#, php-format
-msgid "%d rating"
-msgid_plural "%d ratings"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../Zotlabs/Module/Directory.php:254
-msgid "Gender: "
+#: ../../Zotlabs/Module/Pubsites.php:54 ../../Zotlabs/Module/Webpages.php:223
+#: ../../Zotlabs/Module/Events.php:680 ../../Zotlabs/Module/Blocks.php:166
+#: ../../Zotlabs/Module/Layouts.php:197 ../../include/page_widgets.php:42
+msgid "View"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:256
-msgid "Status: "
+#: ../../Zotlabs/Module/Register.php:49
+msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:258
-msgid "Homepage: "
+#: ../../Zotlabs/Module/Register.php:55
+msgid ""
+"Please indicate acceptance of the Terms of Service. Registration failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:306 ../../include/channel.php:1207
-msgid "Age:"
+#: ../../Zotlabs/Module/Register.php:89
+msgid "Passwords do not match."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:311 ../../include/bb2diaspora.php:507
-#: ../../include/channel.php:1049 ../../include/event.php:52
-#: ../../include/event.php:84
-msgid "Location:"
+#: ../../Zotlabs/Module/Register.php:131
+msgid ""
+"Registration successful. Please check your email for validation instructions."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:317
-msgid "Description:"
+#: ../../Zotlabs/Module/Register.php:137
+msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:322 ../../include/channel.php:1223
-msgid "Hometown:"
+#: ../../Zotlabs/Module/Register.php:140
+msgid "Your registration can not be processed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1231
-msgid "About:"
+#: ../../Zotlabs/Module/Register.php:184
+msgid "Registration on this hub is disabled."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:325 ../../Zotlabs/Module/Match.php:68
-#: ../../Zotlabs/Module/Suggest.php:56 ../../include/conversation.php:960
-#: ../../include/widgets.php:147 ../../include/widgets.php:184
-#: ../../include/channel.php:1034 ../../include/connections.php:78
-msgid "Connect"
+#: ../../Zotlabs/Module/Register.php:193
+msgid "Registration on this hub is by approval only."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:326
-msgid "Public Forum:"
+#: ../../Zotlabs/Module/Register.php:194
+msgid "<a href=\"pubsites\">Register at another affiliated hub.</a>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:329
-msgid "Keywords: "
+#: ../../Zotlabs/Module/Register.php:204
+msgid ""
+"This site has exceeded the number of allowed daily account registrations. "
+"Please try again tomorrow."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:332
-msgid "Don't suggest"
+#: ../../Zotlabs/Module/Register.php:215
+msgid "Terms of Service"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:334
-msgid "Common connections:"
+#: ../../Zotlabs/Module/Register.php:221
+#, php-format
+msgid "I accept the %s for this website"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:383
-msgid "Global Directory"
+#: ../../Zotlabs/Module/Register.php:223
+#, php-format
+msgid "I am over 13 years of age and accept the %s for this website"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:383
-msgid "Local Directory"
+#: ../../Zotlabs/Module/Register.php:227
+msgid "Your email address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:388
-#: ../../Zotlabs/Module/Directory.php:393
-#: ../../Zotlabs/Module/Connections.php:309
-#: ../../include/contact_widgets.php:23
-msgid "Find"
+#: ../../Zotlabs/Module/Register.php:228
+msgid "Choose a password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:389
-msgid "Finding:"
+#: ../../Zotlabs/Module/Register.php:229
+msgid "Please re-enter your password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:392 ../../Zotlabs/Module/Suggest.php:64
-#: ../../include/contact_widgets.php:24
-msgid "Channel Suggestions"
+#: ../../Zotlabs/Module/Register.php:230
+msgid "Please enter your invitation code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:394
-msgid "next page"
+#: ../../Zotlabs/Module/Register.php:231
+#: ../../Zotlabs/Module/New_channel.php:128
+msgid "Name or caption"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:394
-msgid "previous page"
+#: ../../Zotlabs/Module/Register.php:231
+#: ../../Zotlabs/Module/New_channel.php:128
+msgid ""
+"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation "
+"Group\""
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:395
-msgid "Sort options"
+#: ../../Zotlabs/Module/Register.php:233
+#: ../../Zotlabs/Module/New_channel.php:130
+msgid "Choose a short nickname"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:396
-msgid "Alphabetic"
+#: ../../Zotlabs/Module/Register.php:233
+#: ../../Zotlabs/Module/New_channel.php:130
+#, php-format
+msgid ""
+"Your nickname will be used to create an easy to remember channel address e."
+"g. nickname%s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:397
-msgid "Reverse Alphabetic"
+#: ../../Zotlabs/Module/Register.php:235
+#: ../../Zotlabs/Module/New_channel.php:132
+msgid "Channel role and privacy"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:398
-msgid "Newest to Oldest"
+#: ../../Zotlabs/Module/Register.php:235
+#: ../../Zotlabs/Module/New_channel.php:132
+msgid "Select a channel role with your privacy requirements."
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:399
-msgid "Oldest to Newest"
+#: ../../Zotlabs/Module/Register.php:235
+#: ../../Zotlabs/Module/New_channel.php:132
+msgid "Read more about roles"
 msgstr ""
 
-#: ../../Zotlabs/Module/Directory.php:416
-msgid "No entries (some entries may be hidden)."
+#: ../../Zotlabs/Module/Register.php:236
+msgid "no"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rate.php:159 ../../Zotlabs/Module/Connedit.php:766
-#: ../../include/js_strings.php:20
-msgid "Rating"
+#: ../../Zotlabs/Module/Register.php:236
+msgid "yes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rate.php:160
-msgid "Website:"
+#: ../../Zotlabs/Module/Register.php:248 ../../Zotlabs/Module/Admin.php:503
+msgid "Registration"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rate.php:163
-#, php-format
-msgid "Remote Channel [%s] (not yet known on this site)"
+#: ../../Zotlabs/Module/Register.php:253
+msgid "Membership on this site is by invitation only."
 msgstr ""
 
-#: ../../Zotlabs/Module/Rate.php:164
-msgid "Rating (this information is public)"
+#: ../../Zotlabs/Module/Register.php:265 ../../include/nav.php:151
+#: ../../boot.php:1720
+msgid "Register"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rate.php:165
-msgid "Optionally explain your rating (this information is public)"
+#: ../../Zotlabs/Module/Register.php:266
+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/Bookmarks.php:53
@@ -874,45 +800,34 @@ msgstr ""
 msgid "My Connections Bookmarks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:180
-msgid "Unable to locate original post."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:433
-msgid "Empty post discarded."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:473
-msgid "Executable content type not permitted to this channel."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:858
-msgid "Duplicate post suppressed."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:991
-msgid "System error. Post not saved."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:1112
-msgid "Unable to obtain post information from database."
-msgstr ""
-
-#: ../../Zotlabs/Module/Item.php:1119
-#, php-format
-msgid "You have reached your limit of %1$.0f top level posts."
+#: ../../Zotlabs/Module/Display.php:17 ../../Zotlabs/Module/Directory.php:63
+#: ../../Zotlabs/Module/Photos.php:520 ../../Zotlabs/Module/Ratings.php:83
+#: ../../Zotlabs/Module/Search.php:17
+#: ../../Zotlabs/Module/Viewconnections.php:23
+msgid "Public access denied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Item.php:1126
-#, php-format
-msgid "You have reached your limit of %1$.0f webpages."
+#: ../../Zotlabs/Module/Display.php:40 ../../Zotlabs/Module/Filestorage.php:32
+#: ../../Zotlabs/Module/Admin.php:164 ../../Zotlabs/Module/Admin.php:1268
+#: ../../Zotlabs/Module/Admin.php:1575 ../../Zotlabs/Module/Thing.php:89
+#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3398
+msgid "Item not found."
 msgstr ""
 
 #: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:222
-#: ../../include/conversation.php:1662 ../../include/nav.php:94
+#: ../../include/conversation.php:1665 ../../include/nav.php:94
 msgid "Photos"
 msgstr ""
 
+#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88
+#: ../../Zotlabs/Module/Settings.php:683 ../../Zotlabs/Module/Settings.php:709
+#: ../../Zotlabs/Module/Admin.php:1420 ../../Zotlabs/Module/Wiki.php:171
+#: ../../Zotlabs/Module/Wiki.php:211 ../../Zotlabs/Module/Tagrm.php:15
+#: ../../Zotlabs/Module/Tagrm.php:138 ../../include/conversation.php:1243
+#: ../../include/conversation.php:1292
+msgid "Cancel"
+msgstr ""
+
 #: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31
 msgid "Invalid item."
 msgstr ""
@@ -940,803 +855,850 @@ msgstr ""
 msgid "- select -"
 msgstr ""
 
-#: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Admin.php:2033
-#: ../../Zotlabs/Module/Admin.php:2053 ../../Zotlabs/Module/Rbmark.php:32
-#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/widgets.php:201
-#: ../../include/text.php:926 ../../include/text.php:938
+#: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Admin.php:2047
+#: ../../Zotlabs/Module/Admin.php:2067 ../../Zotlabs/Module/Rbmark.php:32
+#: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:926
+#: ../../include/text.php:938 ../../include/widgets.php:201
 msgid "Save"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:80
-msgid "Could not access contact record."
+#: ../../Zotlabs/Module/Network.php:94
+msgid "No such group"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:104
-msgid "Could not locate selected profile."
+#: ../../Zotlabs/Module/Network.php:134
+msgid "No such channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:256
-msgid "Connection updated."
+#: ../../Zotlabs/Module/Network.php:139
+msgid "forum"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:258
-msgid "Failed to update connection record."
+#: ../../Zotlabs/Module/Network.php:151
+msgid "Search Results For:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:308
-msgid "is now connected to"
+#: ../../Zotlabs/Module/Network.php:217
+msgid "Privacy group is empty"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:408 ../../Zotlabs/Module/Connedit.php:690
-#: ../../Zotlabs/Module/Filestorage.php:160
-#: ../../Zotlabs/Module/Filestorage.php:168
-#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Mitem.php:162
-#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240
-#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Events.php:462
-#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Events.php:472
-#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
-#: ../../Zotlabs/Module/Admin.php:459 ../../Zotlabs/Module/Api.php:85
-#: ../../Zotlabs/Module/Photos.php:664 ../../Zotlabs/Module/Removeme.php:63
-#: ../../Zotlabs/Module/Settings.php:673 ../../include/dir_fns.php:143
-#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145
-#: ../../view/theme/redbasic/php/config.php:111
-#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1717
-msgid "No"
+#: ../../Zotlabs/Module/Network.php:226
+msgid "Privacy group: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:408
-#: ../../Zotlabs/Module/Filestorage.php:160
-#: ../../Zotlabs/Module/Filestorage.php:168
-#: ../../Zotlabs/Module/Profiles.php:647 ../../Zotlabs/Module/Mitem.php:162
-#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240
-#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Events.php:462
-#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Events.php:472
-#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
-#: ../../Zotlabs/Module/Admin.php:461 ../../Zotlabs/Module/Api.php:84
-#: ../../Zotlabs/Module/Photos.php:664 ../../Zotlabs/Module/Removeme.php:63
-#: ../../Zotlabs/Module/Settings.php:673 ../../include/dir_fns.php:143
-#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145
-#: ../../view/theme/redbasic/php/config.php:111
-#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1717
-msgid "Yes"
+#: ../../Zotlabs/Module/Network.php:252
+msgid "Invalid connection."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:440
-msgid "Could not access address book record."
+#: ../../Zotlabs/Module/Connections.php:56
+#: ../../Zotlabs/Module/Connections.php:161
+#: ../../Zotlabs/Module/Connections.php:242
+msgid "Blocked"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:460
-msgid "Refresh failed - channel is currently unavailable."
+#: ../../Zotlabs/Module/Connections.php:61
+#: ../../Zotlabs/Module/Connections.php:168
+#: ../../Zotlabs/Module/Connections.php:241
+msgid "Ignored"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:475 ../../Zotlabs/Module/Connedit.php:484
-#: ../../Zotlabs/Module/Connedit.php:493 ../../Zotlabs/Module/Connedit.php:502
-#: ../../Zotlabs/Module/Connedit.php:515
-msgid "Unable to set address book parameters."
+#: ../../Zotlabs/Module/Connections.php:66
+#: ../../Zotlabs/Module/Connections.php:182
+#: ../../Zotlabs/Module/Connections.php:240
+msgid "Hidden"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:538
-msgid "Connection has been removed."
+#: ../../Zotlabs/Module/Connections.php:71
+#: ../../Zotlabs/Module/Connections.php:175
+#: ../../Zotlabs/Module/Connections.php:239
+msgid "Archived"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:554 ../../Zotlabs/Lib/Apps.php:221
-#: ../../include/conversation.php:958 ../../include/nav.php:88
-msgid "View Profile"
+#: ../../Zotlabs/Module/Connections.php:76
+#: ../../Zotlabs/Module/Connections.php:86 ../../Zotlabs/Module/Menu.php:116
+#: ../../include/conversation.php:1568
+msgid "New"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:557
-#, php-format
-msgid "View %s's profile"
+#: ../../Zotlabs/Module/Connections.php:92
+#: ../../Zotlabs/Module/Connections.php:107
+#: ../../Zotlabs/Module/Connedit.php:629 ../../include/widgets.php:497
+msgid "All"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:561
-msgid "Refresh Permissions"
+#: ../../Zotlabs/Module/Connections.php:138
+msgid "New Connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:564
-msgid "Fetch updated permissions"
+#: ../../Zotlabs/Module/Connections.php:141
+msgid "Show pending (new) connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:568
-msgid "Recent Activity"
+#: ../../Zotlabs/Module/Connections.php:145
+#: ../../Zotlabs/Module/Profperm.php:144
+msgid "All Connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:571
-msgid "View recent posts and comments"
+#: ../../Zotlabs/Module/Connections.php:148
+msgid "Show all connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:575 ../../Zotlabs/Module/Admin.php:1041
-msgid "Unblock"
+#: ../../Zotlabs/Module/Connections.php:164
+msgid "Only show blocked connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:575 ../../Zotlabs/Module/Admin.php:1040
-msgid "Block"
+#: ../../Zotlabs/Module/Connections.php:171
+msgid "Only show ignored connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:578
-msgid "Block (or Unblock) all communications with this connection"
+#: ../../Zotlabs/Module/Connections.php:178
+msgid "Only show archived connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:579
-msgid "This connection is blocked!"
+#: ../../Zotlabs/Module/Connections.php:185
+msgid "Only show hidden connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:583
-msgid "Unignore"
+#: ../../Zotlabs/Module/Connections.php:238
+msgid "Pending approval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:583
-#: ../../Zotlabs/Module/Connections.php:277
-#: ../../Zotlabs/Module/Notifications.php:55
-msgid "Ignore"
+#: ../../Zotlabs/Module/Connections.php:254
+#, php-format
+msgid "%1$s [%2$s]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:586
-msgid "Ignore (or Unignore) all inbound communications from this connection"
+#: ../../Zotlabs/Module/Connections.php:255
+msgid "Edit connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:587
-msgid "This connection is ignored!"
+#: ../../Zotlabs/Module/Connections.php:256
+msgid "Delete connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:591
-msgid "Unarchive"
+#: ../../Zotlabs/Module/Connections.php:265
+msgid "Channel address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:591
-msgid "Archive"
+#: ../../Zotlabs/Module/Connections.php:267
+msgid "Network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:594
-msgid ""
-"Archive (or Unarchive) this connection - mark channel dead but keep content"
+#: ../../Zotlabs/Module/Connections.php:270 ../../Zotlabs/Module/Admin.php:723
+msgid "Status"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:595
-msgid "This connection is archived!"
+#: ../../Zotlabs/Module/Connections.php:272
+msgid "Connected"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:599
-msgid "Unhide"
+#: ../../Zotlabs/Module/Connections.php:274
+msgid "Approve connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:599
-msgid "Hide"
+#: ../../Zotlabs/Module/Connections.php:275
+#: ../../Zotlabs/Module/Admin.php:1050
+msgid "Approve"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:602
-msgid "Hide or Unhide this connection from your other connections"
+#: ../../Zotlabs/Module/Connections.php:276
+msgid "Ignore connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:603
-msgid "This connection is hidden!"
+#: ../../Zotlabs/Module/Connections.php:277
+#: ../../Zotlabs/Module/Notifications.php:55
+#: ../../Zotlabs/Module/Connedit.php:583
+msgid "Ignore"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:610
-msgid "Delete this connection"
+#: ../../Zotlabs/Module/Connections.php:278
+msgid "Recent activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:625 ../../include/widgets.php:493
-msgid "Me"
+#: ../../Zotlabs/Module/Connections.php:302 ../../Zotlabs/Lib/Apps.php:209
+#: ../../include/text.php:855 ../../include/nav.php:190
+msgid "Connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:626 ../../include/widgets.php:494
-msgid "Family"
+#: ../../Zotlabs/Module/Connections.php:306 ../../Zotlabs/Module/Search.php:44
+#: ../../Zotlabs/Lib/Apps.php:230 ../../include/text.php:925
+#: ../../include/text.php:937 ../../include/acl_selectors.php:174
+#: ../../include/nav.php:169
+msgid "Search"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:627 ../../Zotlabs/Module/Settings.php:429
-#: ../../Zotlabs/Module/Settings.php:433 ../../Zotlabs/Module/Settings.php:434
-#: ../../Zotlabs/Module/Settings.php:437 ../../Zotlabs/Module/Settings.php:448
-#: ../../include/selectors.php:123 ../../include/widgets.php:495
-#: ../../include/channel.php:402 ../../include/channel.php:403
-#: ../../include/channel.php:410
-msgid "Friends"
+#: ../../Zotlabs/Module/Connections.php:307
+msgid "Search your connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:628 ../../include/widgets.php:496
-msgid "Acquaintances"
+#: ../../Zotlabs/Module/Connections.php:308
+msgid "Connections search"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:629
-#: ../../Zotlabs/Module/Connections.php:92
-#: ../../Zotlabs/Module/Connections.php:107 ../../include/widgets.php:497
-msgid "All"
+#: ../../Zotlabs/Module/Connections.php:309
+#: ../../Zotlabs/Module/Directory.php:388
+#: ../../Zotlabs/Module/Directory.php:393 ../../include/contact_widgets.php:23
+msgid "Find"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:690
-msgid "Approve this connection"
+#: ../../Zotlabs/Module/Cover_photo.php:58
+#: ../../Zotlabs/Module/Profile_photo.php:61
+msgid "Image uploaded but image cropping failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:690
-msgid "Accept connection to allow communication"
+#: ../../Zotlabs/Module/Cover_photo.php:134
+#: ../../Zotlabs/Module/Cover_photo.php:181
+msgid "Cover Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:695
-msgid "Set Affinity"
+#: ../../Zotlabs/Module/Cover_photo.php:154
+#: ../../Zotlabs/Module/Profile_photo.php:135
+msgid "Image resize failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:698
-msgid "Set Profile"
+#: ../../Zotlabs/Module/Cover_photo.php:168
+#: ../../Zotlabs/Module/Profile_photo.php:196 ../../include/photos.php:148
+msgid "Unable to process image"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:701
-msgid "Set Affinity & Profile"
+#: ../../Zotlabs/Module/Cover_photo.php:192
+#: ../../Zotlabs/Module/Profile_photo.php:223
+msgid "Image upload failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:750
-msgid "none"
+#: ../../Zotlabs/Module/Cover_photo.php:210
+#: ../../Zotlabs/Module/Profile_photo.php:242
+msgid "Unable to process image."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:754 ../../include/widgets.php:623
-msgid "Connection Default Permissions"
+#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4312
+msgid "female"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:754 ../../include/items.php:3937
+#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4313
 #, php-format
-msgid "Connection: %s"
+msgid "%1$s updated her %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:755
-msgid "Apply these permissions automatically"
+#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4314
+msgid "male"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:755
-msgid "Connection requests will be approved without your interaction"
+#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4315
+#, php-format
+msgid "%1$s updated his %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:757
-msgid "This connection's primary address is"
+#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4317
+#, php-format
+msgid "%1$s updated their %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:758
-msgid "Available locations:"
+#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1720
+msgid "cover photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:762
-msgid ""
-"The permissions indicated on this page will be applied to all new "
-"connections."
+#: ../../Zotlabs/Module/Cover_photo.php:303
+#: ../../Zotlabs/Module/Cover_photo.php:318
+#: ../../Zotlabs/Module/Profile_photo.php:300
+#: ../../Zotlabs/Module/Profile_photo.php:341
+msgid "Photo not available."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:763
-msgid "Connection Tools"
+#: ../../Zotlabs/Module/Cover_photo.php:354
+#: ../../Zotlabs/Module/Profile_photo.php:387
+msgid "Upload File:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:765
-msgid "Slide to adjust your degree of friendship"
+#: ../../Zotlabs/Module/Cover_photo.php:355
+#: ../../Zotlabs/Module/Profile_photo.php:388
+msgid "Select a profile:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:767
-msgid "Slide to adjust your rating"
+#: ../../Zotlabs/Module/Cover_photo.php:356
+msgid "Upload Cover Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:768 ../../Zotlabs/Module/Connedit.php:773
-msgid "Optionally explain your rating"
+#: ../../Zotlabs/Module/Cover_photo.php:361
+#: ../../Zotlabs/Module/Settings.php:1180
+#: ../../Zotlabs/Module/Profile_photo.php:396
+msgid "or"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:770
-msgid "Custom Filter"
+#: ../../Zotlabs/Module/Cover_photo.php:361
+#: ../../Zotlabs/Module/Profile_photo.php:396
+msgid "skip this step"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:771
-msgid "Only import posts with this text"
+#: ../../Zotlabs/Module/Cover_photo.php:361
+#: ../../Zotlabs/Module/Profile_photo.php:396
+msgid "select a photo from your photo albums"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:771 ../../Zotlabs/Module/Connedit.php:772
-msgid ""
-"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
-"all posts"
+#: ../../Zotlabs/Module/Cover_photo.php:377
+#: ../../Zotlabs/Module/Profile_photo.php:415
+msgid "Crop Image"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:772
-msgid "Do not import posts with this text"
+#: ../../Zotlabs/Module/Cover_photo.php:378
+#: ../../Zotlabs/Module/Profile_photo.php:416
+msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:774
-msgid "This information is public!"
+#: ../../Zotlabs/Module/Cover_photo.php:380
+#: ../../Zotlabs/Module/Profile_photo.php:418
+msgid "Done Editing"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:779
-msgid "Connection Pending Approval"
+#: ../../Zotlabs/Module/Setup.php:183
+msgid "$Projectname Server - Setup"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:782 ../../Zotlabs/Module/Settings.php:882
-msgid "inherited"
+#: ../../Zotlabs/Module/Setup.php:187
+msgid "Could not connect to database."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:784
-#, php-format
+#: ../../Zotlabs/Module/Setup.php:191
 msgid ""
-"Please choose the profile you would like to display to %s when viewing your "
-"profile securely."
+"Could not connect to specified site URL. Possible SSL certificate or DNS "
+"issue."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:786 ../../Zotlabs/Module/Settings.php:879
-msgid "Their Settings"
+#: ../../Zotlabs/Module/Setup.php:198
+msgid "Could not create table."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:787 ../../Zotlabs/Module/Settings.php:880
-msgid "My Settings"
+#: ../../Zotlabs/Module/Setup.php:203
+msgid "Your site database has been installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:789 ../../Zotlabs/Module/Settings.php:884
-msgid "Individual Permissions"
+#: ../../Zotlabs/Module/Setup.php:207
+msgid ""
+"You may need to import the file \"install/schema_xxx.sql\" manually using a "
+"database client."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:208 ../../Zotlabs/Module/Setup.php:270
+#: ../../Zotlabs/Module/Setup.php:733
+msgid "Please see the file \"install/INSTALL.txt\"."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:267
+msgid "System check"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:271 ../../Zotlabs/Module/Photos.php:960
+#: ../../Zotlabs/Module/Events.php:676 ../../Zotlabs/Module/Events.php:685
+#: ../../Zotlabs/Module/Cal.php:333 ../../Zotlabs/Module/Cal.php:340
+msgid "Next"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:790 ../../Zotlabs/Module/Settings.php:885
+#: ../../Zotlabs/Module/Setup.php:272
+msgid "Check again"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:294
+msgid "Database connection"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:295
 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."
+"In order to install $Projectname we need to know how to connect to your "
+"database."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:791
+#: ../../Zotlabs/Module/Setup.php:296
 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."
+"Please contact your hosting provider or site administrator if you have "
+"questions about these settings."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connedit.php:792
-msgid "Last update:"
+#: ../../Zotlabs/Module/Setup.php:297
+msgid ""
+"The database you specify below should already exist. If it does not, please "
+"create it before continuing."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:56
-#: ../../Zotlabs/Module/Connections.php:161
-#: ../../Zotlabs/Module/Connections.php:242
-msgid "Blocked"
+#: ../../Zotlabs/Module/Setup.php:301
+msgid "Database Server Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:61
-#: ../../Zotlabs/Module/Connections.php:168
-#: ../../Zotlabs/Module/Connections.php:241
-msgid "Ignored"
+#: ../../Zotlabs/Module/Setup.php:301
+msgid "Default is 127.0.0.1"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:66
-#: ../../Zotlabs/Module/Connections.php:182
-#: ../../Zotlabs/Module/Connections.php:240
-msgid "Hidden"
+#: ../../Zotlabs/Module/Setup.php:302
+msgid "Database Port"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:71
-#: ../../Zotlabs/Module/Connections.php:175
-#: ../../Zotlabs/Module/Connections.php:239
-msgid "Archived"
+#: ../../Zotlabs/Module/Setup.php:302
+msgid "Communication port number - use 0 for default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:76
-#: ../../Zotlabs/Module/Connections.php:86 ../../Zotlabs/Module/Menu.php:116
-#: ../../include/conversation.php:1565
-msgid "New"
+#: ../../Zotlabs/Module/Setup.php:303
+msgid "Database Login Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:138
-msgid "New Connections"
+#: ../../Zotlabs/Module/Setup.php:304
+msgid "Database Login Password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:141
-msgid "Show pending (new) connections"
+#: ../../Zotlabs/Module/Setup.php:305
+msgid "Database Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:145
-#: ../../Zotlabs/Module/Profperm.php:144
-msgid "All Connections"
+#: ../../Zotlabs/Module/Setup.php:306
+msgid "Database Type"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:148
-msgid "Show all connections"
+#: ../../Zotlabs/Module/Setup.php:308 ../../Zotlabs/Module/Setup.php:354
+msgid "Site administrator email address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:164
-msgid "Only show blocked connections"
+#: ../../Zotlabs/Module/Setup.php:308 ../../Zotlabs/Module/Setup.php:354
+msgid ""
+"Your account email address must match this in order to use the web admin "
+"panel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:171
-msgid "Only show ignored connections"
+#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:356
+msgid "Website URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:178
-msgid "Only show archived connections"
+#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:356
+msgid "Please use SSL (https) URL if available."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:185
-msgid "Only show hidden connections"
+#: ../../Zotlabs/Module/Setup.php:310 ../../Zotlabs/Module/Setup.php:360
+msgid "Please select a default timezone for your website"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:238
-msgid "Pending approval"
+#: ../../Zotlabs/Module/Setup.php:335 ../../Zotlabs/Module/Admin.php:489
+msgid "Basic/Minimal Social Networking"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:254
-#, php-format
-msgid "%1$s [%2$s]"
+#: ../../Zotlabs/Module/Setup.php:336 ../../Zotlabs/Module/Admin.php:490
+msgid "Standard Configuration (default)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:255
-msgid "Edit connection"
+#: ../../Zotlabs/Module/Setup.php:337 ../../Zotlabs/Module/Admin.php:491
+msgid "Professional"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:256
-msgid "Delete connection"
+#: ../../Zotlabs/Module/Setup.php:343
+msgid "Site settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:265
-msgid "Channel address"
+#: ../../Zotlabs/Module/Setup.php:358 ../../Zotlabs/Module/Admin.php:512
+msgid "Server Configuration/Role"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:267
-msgid "Network"
+#: ../../Zotlabs/Module/Setup.php:399
+msgid "PHP version 5.5 or greater is required."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:270 ../../Zotlabs/Module/Admin.php:710
-msgid "Status"
+#: ../../Zotlabs/Module/Setup.php:400
+msgid "PHP version"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:272
-msgid "Connected"
+#: ../../Zotlabs/Module/Setup.php:415
+msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:274
-msgid "Approve connection"
+#: ../../Zotlabs/Module/Setup.php:416
+msgid ""
+"If you don't have a command line version of PHP installed on server, you "
+"will not be able to run background polling via cron."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:275
-#: ../../Zotlabs/Module/Admin.php:1037
-msgid "Approve"
+#: ../../Zotlabs/Module/Setup.php:420
+msgid "PHP executable path"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:276
-msgid "Ignore connection"
+#: ../../Zotlabs/Module/Setup.php:420
+msgid ""
+"Enter full path to php executable. You can leave this blank to continue the "
+"installation."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:278
-msgid "Recent activity"
+#: ../../Zotlabs/Module/Setup.php:425
+msgid "Command line PHP"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:302 ../../Zotlabs/Lib/Apps.php:209
-#: ../../include/nav.php:190 ../../include/text.php:855
-msgid "Connections"
+#: ../../Zotlabs/Module/Setup.php:434
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:306 ../../Zotlabs/Module/Search.php:44
-#: ../../Zotlabs/Lib/Apps.php:230 ../../include/nav.php:169
-#: ../../include/text.php:925 ../../include/text.php:937
-#: ../../include/acl_selectors.php:179
-msgid "Search"
+#: ../../Zotlabs/Module/Setup.php:435
+msgid "This is required for message delivery to work."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:307
-msgid "Search your connections"
+#: ../../Zotlabs/Module/Setup.php:438
+msgid "PHP register_argc_argv"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connections.php:308
-msgid "Connections search"
+#: ../../Zotlabs/Module/Setup.php:456
+#, php-format
+msgid ""
+"Your max allowed total upload size is set to %s. Maximum size of one file to "
+"upload is set to %s. You are allowed to upload up to %d files at once."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:58
-#: ../../Zotlabs/Module/Profile_photo.php:61
-msgid "Image uploaded but image cropping failed."
+#: ../../Zotlabs/Module/Setup.php:461
+msgid "You can adjust these settings in the servers php.ini."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:134
-#: ../../Zotlabs/Module/Cover_photo.php:181
-msgid "Cover Photos"
+#: ../../Zotlabs/Module/Setup.php:463
+msgid "PHP upload limits"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:154
-#: ../../Zotlabs/Module/Profile_photo.php:135
-msgid "Image resize failed."
+#: ../../Zotlabs/Module/Setup.php:486
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:168
-#: ../../Zotlabs/Module/Profile_photo.php:196 ../../include/photos.php:148
-msgid "Unable to process image"
+#: ../../Zotlabs/Module/Setup.php:487
+msgid ""
+"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
+"installation.php\"."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:192
-#: ../../Zotlabs/Module/Profile_photo.php:223
-msgid "Image upload failed."
+#: ../../Zotlabs/Module/Setup.php:490
+msgid "Generate encryption keys"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:210
-#: ../../Zotlabs/Module/Profile_photo.php:242
-msgid "Unable to process image."
+#: ../../Zotlabs/Module/Setup.php:502
+msgid "libCurl PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4285
-msgid "female"
+#: ../../Zotlabs/Module/Setup.php:503
+msgid "GD graphics PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4286
-#, php-format
-msgid "%1$s updated her %2$s"
+#: ../../Zotlabs/Module/Setup.php:504
+msgid "OpenSSL PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4287
-msgid "male"
+#: ../../Zotlabs/Module/Setup.php:505
+msgid "mysqli or postgres PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4288
-#, php-format
-msgid "%1$s updated his %2$s"
+#: ../../Zotlabs/Module/Setup.php:506
+msgid "mb_string PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4290
-#, php-format
-msgid "%1$s updated their %2$s"
+#: ../../Zotlabs/Module/Setup.php:507
+msgid "xml PHP module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1710
-msgid "cover photo"
+#: ../../Zotlabs/Module/Setup.php:511 ../../Zotlabs/Module/Setup.php:513
+msgid "Apache mod_rewrite module"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:303
-#: ../../Zotlabs/Module/Cover_photo.php:318
-#: ../../Zotlabs/Module/Profile_photo.php:300
-#: ../../Zotlabs/Module/Profile_photo.php:341
-msgid "Photo not available."
+#: ../../Zotlabs/Module/Setup.php:511
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:354
-#: ../../Zotlabs/Module/Profile_photo.php:387
-msgid "Upload File:"
+#: ../../Zotlabs/Module/Setup.php:517 ../../Zotlabs/Module/Setup.php:520
+msgid "proc_open"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:355
-#: ../../Zotlabs/Module/Profile_photo.php:388
-msgid "Select a profile:"
+#: ../../Zotlabs/Module/Setup.php:517
+msgid ""
+"Error: proc_open is required but is either not installed or has been "
+"disabled in php.ini"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:356
-msgid "Upload Cover Photo"
+#: ../../Zotlabs/Module/Setup.php:525
+msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:396
-#: ../../Zotlabs/Module/Settings.php:1180
-msgid "or"
+#: ../../Zotlabs/Module/Setup.php:529
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:396
-msgid "skip this step"
+#: ../../Zotlabs/Module/Setup.php:533
+msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:361
-#: ../../Zotlabs/Module/Profile_photo.php:396
-msgid "select a photo from your photo albums"
+#: ../../Zotlabs/Module/Setup.php:537
+msgid ""
+"Error: mysqli or postgres PHP module required but neither are installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:377
-#: ../../Zotlabs/Module/Profile_photo.php:415
-msgid "Crop Image"
+#: ../../Zotlabs/Module/Setup.php:541
+msgid "Error: mb_string PHP module required but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:378
-#: ../../Zotlabs/Module/Profile_photo.php:416
-msgid "Please adjust the image cropping for optimum viewing."
+#: ../../Zotlabs/Module/Setup.php:545
+msgid "Error: xml PHP module required for DAV but not installed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Cover_photo.php:380
-#: ../../Zotlabs/Module/Profile_photo.php:418
-msgid "Done Editing"
+#: ../../Zotlabs/Module/Setup.php:563
+msgid ""
+"The web installer needs to be able to create a file called \".htconfig.php\" "
+"in the top folder of your web server and it is unable to do so."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:33
-#, php-format
-msgid "Your service plan only allows %d channels."
+#: ../../Zotlabs/Module/Setup.php:564
+msgid ""
+"This is most often a permission setting, as the web server may not be able "
+"to write files in your folder - even if you can."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:71 ../../Zotlabs/Module/Import_items.php:42
-msgid "Nothing to import."
+#: ../../Zotlabs/Module/Setup.php:565
+msgid ""
+"At the end of this procedure, we will give you a text to save in a file "
+"named .htconfig.php in your Red top folder."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:95 ../../Zotlabs/Module/Import_items.php:66
-msgid "Unable to download data from old server"
+#: ../../Zotlabs/Module/Setup.php:566
+msgid ""
+"You can alternatively skip this procedure and perform a manual installation. "
+"Please see the file \"install/INSTALL.txt\" for instructions."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:101
-#: ../../Zotlabs/Module/Import_items.php:72
-msgid "Imported file is empty."
+#: ../../Zotlabs/Module/Setup.php:569
+msgid ".htconfig.php is writable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:123
-#: ../../Zotlabs/Module/Import_items.php:88
+#: ../../Zotlabs/Module/Setup.php:583
+msgid ""
+"Red uses the Smarty3 template engine to render its web views. Smarty3 "
+"compiles templates to PHP to speed up rendering."
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:584
 #, php-format
-msgid "Warning: Database versions differ by %1$d updates."
+msgid ""
+"In order to store these compiled templates, the web server needs to have "
+"write access to the directory %s under the top level web folder."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:153 ../../include/import.php:107
-msgid "Cloned channel not found. Import failed."
+#: ../../Zotlabs/Module/Setup.php:585 ../../Zotlabs/Module/Setup.php:606
+msgid ""
+"Please ensure that the user that your web server runs as (e.g. www-data) has "
+"write access to this folder."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:163
-msgid "No channel. Import failed."
+#: ../../Zotlabs/Module/Setup.php:586
+#, php-format
+msgid ""
+"Note: as a security measure, you should give the web server write access to "
+"%s only--not the template files (.tpl) that it contains."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:520
-#: ../../include/Import/import_diaspora.php:142
-msgid "Import completed."
+#: ../../Zotlabs/Module/Setup.php:589
+#, php-format
+msgid "%s is writable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:542
-msgid "You must be logged in to use this feature."
+#: ../../Zotlabs/Module/Setup.php:605
+msgid ""
+"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/Import.php:547
-msgid "Import Channel"
+#: ../../Zotlabs/Module/Setup.php:609
+msgid "store is writable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:548
+#: ../../Zotlabs/Module/Setup.php:642
 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."
+"SSL certificate cannot be validated. Fix certificate or disable https access "
+"to this site."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:549
-#: ../../Zotlabs/Module/Import_items.php:121
-msgid "File to Upload"
+#: ../../Zotlabs/Module/Setup.php:643
+msgid ""
+"If you have https access to your website or allow connections to TCP port "
+"443 (the https: port), you MUST use a browser-valid certificate. You MUST "
+"NOT use self-signed certificates!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:550
-msgid "Or provide the old server/hub details"
+#: ../../Zotlabs/Module/Setup.php:644
+msgid ""
+"This restriction is incorporated because public posts from you may for "
+"example contain references to images on your own hub."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:551
-msgid "Your old identity address (xyz@example.com)"
+#: ../../Zotlabs/Module/Setup.php:645
+msgid ""
+"If your certificate is not recognized, members of other sites (who may "
+"themselves have valid certificates) will get a warning message on their own "
+"site complaining about security issues."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:552
-msgid "Your old login email address"
+#: ../../Zotlabs/Module/Setup.php:646
+msgid ""
+"This can cause usability issues elsewhere (not just on your own site) so we "
+"must insist on this requirement."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:553
-msgid "Your old login password"
+#: ../../Zotlabs/Module/Setup.php:647
+msgid ""
+"Providers are available that issue free certificates which are browser-valid."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:554
+#: ../../Zotlabs/Module/Setup.php:649
 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."
+"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/Import.php:555
-msgid "Make this hub my primary location"
+#: ../../Zotlabs/Module/Setup.php:652
+msgid "SSL certificate validation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:556
+#: ../../Zotlabs/Module/Setup.php:658
 msgid ""
-"Import existing posts if possible (experimental - limited by available memory"
+"Url rewrite in .htaccess is not working. Check your server configuration."
+"Test: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Import.php:557
+#: ../../Zotlabs/Module/Setup.php:661
+msgid "Url rewrite is working"
+msgstr ""
+
+#: ../../Zotlabs/Module/Setup.php:670
 msgid ""
-"This process may take several minutes to complete. Please submit the form "
-"only once and leave this page open until finished."
+"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/Mail.php:38
-msgid "Unable to lookup recipient."
+#: ../../Zotlabs/Module/Setup.php:694
+msgid "Errors encountered creating database tables."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:45
-msgid "Unable to communicate with requested channel."
+#: ../../Zotlabs/Module/Setup.php:731
+msgid "<h1>What next</h1>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:52
-msgid "Cannot verify requested channel."
+#: ../../Zotlabs/Module/Setup.php:732
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:70
-msgid "Selected channel has private message restrictions. Send failed."
+#: ../../Zotlabs/Module/Directory.php:243
+#, php-format
+msgid "%d rating"
+msgid_plural "%d ratings"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Directory.php:254
+msgid "Gender: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:135
-msgid "Messages"
+#: ../../Zotlabs/Module/Directory.php:256
+msgid "Status: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:170
-msgid "Message recalled."
+#: ../../Zotlabs/Module/Directory.php:258
+msgid "Homepage: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:183
-msgid "Conversation removed."
+#: ../../Zotlabs/Module/Directory.php:306 ../../include/channel.php:1207
+msgid "Age:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:197 ../../Zotlabs/Module/Mail.php:306
-#: ../../Zotlabs/Module/Chat.php:205 ../../include/conversation.php:1186
-msgid "Please enter a link URL:"
+#: ../../Zotlabs/Module/Directory.php:311 ../../include/channel.php:1049
+#: ../../include/event.php:52 ../../include/event.php:84
+#: ../../include/bb2diaspora.php:507
+msgid "Location:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:198 ../../Zotlabs/Module/Mail.php:307
-msgid "Expires YYYY-MM-DD HH:MM"
+#: ../../Zotlabs/Module/Directory.php:317
+msgid "Description:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:226
-msgid "Requested channel is not in this network"
+#: ../../Zotlabs/Module/Directory.php:322 ../../include/channel.php:1223
+msgid "Hometown:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:234
-msgid "Send Private Message"
+#: ../../Zotlabs/Module/Directory.php:324 ../../include/channel.php:1231
+msgid "About:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:235 ../../Zotlabs/Module/Mail.php:360
-msgid "To:"
+#: ../../Zotlabs/Module/Directory.php:325 ../../Zotlabs/Module/Match.php:68
+#: ../../Zotlabs/Module/Suggest.php:56 ../../include/widgets.php:147
+#: ../../include/widgets.php:184 ../../include/connections.php:78
+#: ../../include/channel.php:1034 ../../include/conversation.php:957
+msgid "Connect"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:238 ../../Zotlabs/Module/Mail.php:362
-msgid "Subject:"
+#: ../../Zotlabs/Module/Directory.php:326
+msgid "Public Forum:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:241 ../../Zotlabs/Module/Invite.php:135
-msgid "Your message:"
+#: ../../Zotlabs/Module/Directory.php:329
+msgid "Keywords: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:243 ../../Zotlabs/Module/Mail.php:368
-#: ../../include/conversation.php:1238
-msgid "Attach file"
+#: ../../Zotlabs/Module/Directory.php:332
+msgid "Don't suggest"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:244 ../../Zotlabs/Module/Mail.php:369
-#: ../../Zotlabs/Module/Editblock.php:111
-#: ../../Zotlabs/Module/Editwebpage.php:146 ../../Zotlabs/Module/Chat.php:207
-#: ../../include/conversation.php:1151
-msgid "Insert web link"
+#: ../../Zotlabs/Module/Directory.php:334
+msgid "Common connections:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:245
-msgid "Send"
+#: ../../Zotlabs/Module/Directory.php:383
+msgid "Global Directory"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:248 ../../Zotlabs/Module/Mail.php:373
-#: ../../include/conversation.php:1281
-msgid "Set expiration date"
+#: ../../Zotlabs/Module/Directory.php:383
+msgid "Local Directory"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:250 ../../Zotlabs/Module/Mail.php:375
-#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Lib/ThreadItem.php:723
-#: ../../include/conversation.php:1286
-msgid "Encrypt text"
+#: ../../Zotlabs/Module/Directory.php:389
+msgid "Finding:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:332
-msgid "Delete message"
+#: ../../Zotlabs/Module/Directory.php:392 ../../Zotlabs/Module/Suggest.php:64
+#: ../../include/contact_widgets.php:24
+msgid "Channel Suggestions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:333
-msgid "Delivery report"
+#: ../../Zotlabs/Module/Directory.php:394
+msgid "next page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:334
-msgid "Recall message"
+#: ../../Zotlabs/Module/Directory.php:394
+msgid "previous page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:336
-msgid "Message has been recalled."
+#: ../../Zotlabs/Module/Directory.php:395
+msgid "Sort options"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:353
-msgid "Delete Conversation"
+#: ../../Zotlabs/Module/Directory.php:396
+msgid "Alphabetic"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:355
-msgid ""
-"No secure communications available. You <strong>may</strong> be able to "
-"respond from the sender's profile page."
+#: ../../Zotlabs/Module/Directory.php:397
+msgid "Reverse Alphabetic"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:359
-msgid "Send Reply"
+#: ../../Zotlabs/Module/Directory.php:398
+msgid "Newest to Oldest"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mail.php:364
-#, php-format
-msgid "Your message for %s (%s):"
+#: ../../Zotlabs/Module/Directory.php:399
+msgid "Oldest to Newest"
+msgstr ""
+
+#: ../../Zotlabs/Module/Directory.php:416
+msgid "No entries (some entries may be hidden)."
 msgstr ""
 
 #: ../../Zotlabs/Module/Dirsearch.php:25 ../../Zotlabs/Module/Regdir.php:49
@@ -1759,7 +1721,14 @@ msgstr ""
 msgid "Block Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1254
+#: ../../Zotlabs/Module/Editblock.php:111
+#: ../../Zotlabs/Module/Editwebpage.php:146 ../../Zotlabs/Module/Mail.php:244
+#: ../../Zotlabs/Module/Mail.php:369 ../../Zotlabs/Module/Chat.php:207
+#: ../../include/conversation.php:1148
+msgid "Insert web link"
+msgstr ""
+
+#: ../../Zotlabs/Module/Editblock.php:124 ../../include/conversation.php:1255
 msgid "Title (optional)"
 msgstr ""
 
@@ -1789,66 +1758,117 @@ msgstr ""
 msgid "Edit Webpage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:181
-msgid "Room not found"
+#: ../../Zotlabs/Module/Menu.php:49
+msgid "Unable to update menu."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:197
-msgid "Leave Room"
+#: ../../Zotlabs/Module/Menu.php:60
+msgid "Unable to create menu."
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:198
-msgid "Delete Room"
+#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110
+msgid "Menu Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:199
-msgid "I am away right now"
+#: ../../Zotlabs/Module/Menu.php:98
+msgid "Unique name (not visible on webpage) - required"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:200
-msgid "I am online"
+#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111
+msgid "Menu Title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:202
-msgid "Bookmark this room"
+#: ../../Zotlabs/Module/Menu.php:99
+msgid "Visible on webpage - leave empty for no title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:218
-msgid "Feature disabled."
+#: ../../Zotlabs/Module/Menu.php:100
+msgid "Allow Bookmarks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:231
-msgid "New Chatroom"
+#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
+msgid "Menu may be used to store saved bookmarks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:232
-msgid "Chatroom name"
+#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159
+msgid "Submit and proceed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:233
-msgid "Expiration of chats (minutes)"
+#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2263
+msgid "Menus"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:249
-#, php-format
-msgid "%1$s's Chatrooms"
+#: ../../Zotlabs/Module/Menu.php:113 ../../Zotlabs/Module/Locs.php:120
+msgid "Drop"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:254
-msgid "No chatrooms available"
+#: ../../Zotlabs/Module/Menu.php:114 ../../Zotlabs/Module/Webpages.php:228
+#: ../../Zotlabs/Module/Blocks.php:157 ../../Zotlabs/Module/Layouts.php:190
+#: ../../include/page_widgets.php:47
+msgid "Created"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:255 ../../Zotlabs/Module/Profiles.php:778
-#: ../../Zotlabs/Module/Manage.php:143
-msgid "Create New"
+#: ../../Zotlabs/Module/Menu.php:115 ../../Zotlabs/Module/Webpages.php:229
+#: ../../Zotlabs/Module/Blocks.php:158 ../../Zotlabs/Module/Layouts.php:191
+#: ../../include/page_widgets.php:48
+msgid "Edited"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:258
-msgid "Expiration"
+#: ../../Zotlabs/Module/Menu.php:117
+msgid "Bookmarks allowed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Chat.php:259
-msgid "min"
+#: ../../Zotlabs/Module/Menu.php:119
+msgid "Delete this menu"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154
+msgid "Edit menu contents"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:121
+msgid "Edit this menu"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:136
+msgid "Menu could not be deleted."
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:144 ../../Zotlabs/Module/Mitem.php:28
+msgid "Menu not found."
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:149
+msgid "Edit Menu"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:153
+msgid "Add or remove entries to this menu"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:155
+msgid "Menu name"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:155
+msgid "Must be unique, only seen by you"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:156
+msgid "Menu title"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:156
+msgid "Menu title as seen by others"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:157
+msgid "Allow bookmarks"
+msgstr ""
+
+#: ../../Zotlabs/Module/Menu.php:166 ../../Zotlabs/Module/Mitem.php:120
+#: ../../Zotlabs/Module/Xchan.php:41
+msgid "Not found."
 msgstr ""
 
 #: ../../Zotlabs/Module/Appman.php:37 ../../Zotlabs/Module/Appman.php:53
@@ -1996,6 +2016,13 @@ msgstr ""
 msgid "Edit file permissions"
 msgstr ""
 
+#: ../../Zotlabs/Module/Filestorage.php:152
+#: ../../Zotlabs/Module/Photos.php:669 ../../Zotlabs/Module/Photos.php:1047
+#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:363
+#: ../../Zotlabs/Module/Chat.php:234 ../../include/acl_selectors.php:179
+msgid "Permissions"
+msgstr ""
+
 #: ../../Zotlabs/Module/Filestorage.php:159
 msgid "Set/edit permissions"
 msgstr ""
@@ -2028,1510 +2055,1538 @@ msgstr ""
 msgid "Notify your contacts about this file"
 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/Settings.php:64
+msgid "Name is required"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:44
-msgid "Profile deleted."
+#: ../../Zotlabs/Module/Settings.php:68
+msgid "Key and Secret are required"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:104
-msgid "Profile-"
+#: ../../Zotlabs/Module/Settings.php:72 ../../Zotlabs/Module/Settings.php:708
+#: ../../Zotlabs/Module/Admin.php:1449 ../../Zotlabs/Lib/Apps.php:334
+msgid "Update"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:89 ../../Zotlabs/Module/Profiles.php:132
-msgid "New profile created."
+#: ../../Zotlabs/Module/Settings.php:138
+#, php-format
+msgid "This channel is limited to %d tokens"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:110
-msgid "Profile unavailable to clone."
+#: ../../Zotlabs/Module/Settings.php:144
+msgid "Name and Password are required."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:151
-msgid "Profile unavailable to export."
+#: ../../Zotlabs/Module/Settings.php:184
+msgid "Token saved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:256
-msgid "Profile Name is required."
+#: ../../Zotlabs/Module/Settings.php:312
+msgid "Not valid email."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:427
-msgid "Marital Status"
+#: ../../Zotlabs/Module/Settings.php:315
+msgid "Protected email address. Cannot change to that email."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:431
-msgid "Romantic Partner"
+#: ../../Zotlabs/Module/Settings.php:324
+msgid "System failure storing new email. Please try again."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:435 ../../Zotlabs/Module/Profiles.php:736
-msgid "Likes"
+#: ../../Zotlabs/Module/Settings.php:341
+msgid "Password verification failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:439 ../../Zotlabs/Module/Profiles.php:737
-msgid "Dislikes"
+#: ../../Zotlabs/Module/Settings.php:348
+msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:443 ../../Zotlabs/Module/Profiles.php:744
-msgid "Work/Employment"
+#: ../../Zotlabs/Module/Settings.php:352
+msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:446
-msgid "Religion"
+#: ../../Zotlabs/Module/Settings.php:366
+msgid "Password changed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:450
-msgid "Political Views"
+#: ../../Zotlabs/Module/Settings.php:368
+msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:454
-msgid "Gender"
+#: ../../Zotlabs/Module/Settings.php:429 ../../Zotlabs/Module/Settings.php:433
+#: ../../Zotlabs/Module/Settings.php:434 ../../Zotlabs/Module/Settings.php:437
+#: ../../Zotlabs/Module/Settings.php:448 ../../Zotlabs/Module/Connedit.php:627
+#: ../../include/widgets.php:495 ../../include/channel.php:402
+#: ../../include/channel.php:403 ../../include/channel.php:410
+#: ../../include/selectors.php:123
+msgid "Friends"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:458
-msgid "Sexual Preference"
+#: ../../Zotlabs/Module/Settings.php:617
+msgid "Settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:462
-msgid "Homepage"
+#: ../../Zotlabs/Module/Settings.php:681 ../../Zotlabs/Module/Settings.php:707
+#: ../../Zotlabs/Module/Settings.php:743
+msgid "Add application"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:466
-msgid "Interests"
+#: ../../Zotlabs/Module/Settings.php:684
+msgid "Name of application"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:470 ../../Zotlabs/Module/Locs.php:118
-#: ../../Zotlabs/Module/Admin.php:1224
-msgid "Address"
+#: ../../Zotlabs/Module/Settings.php:685 ../../Zotlabs/Module/Settings.php:711
+msgid "Consumer Key"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:477 ../../Zotlabs/Module/Profiles.php:698
-#: ../../Zotlabs/Module/Locs.php:117 ../../Zotlabs/Module/Events.php:467
-#: ../../Zotlabs/Module/Pubsites.php:41 ../../include/js_strings.php:25
-msgid "Location"
+#: ../../Zotlabs/Module/Settings.php:685 ../../Zotlabs/Module/Settings.php:686
+msgid "Automatically generated - change if desired. Max length 20"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:560
-msgid "Profile updated."
+#: ../../Zotlabs/Module/Settings.php:686 ../../Zotlabs/Module/Settings.php:712
+msgid "Consumer Secret"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:644
-msgid "Hide your connections list from viewers of this profile"
+#: ../../Zotlabs/Module/Settings.php:687 ../../Zotlabs/Module/Settings.php:713
+msgid "Redirect"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:686
-msgid "Edit Profile Details"
+#: ../../Zotlabs/Module/Settings.php:687
+msgid ""
+"Redirect URI - leave blank unless your application specifically requires this"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:688
-msgid "View this profile"
+#: ../../Zotlabs/Module/Settings.php:688 ../../Zotlabs/Module/Settings.php:714
+msgid "Icon url"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:689 ../../Zotlabs/Module/Profiles.php:771
-#: ../../include/channel.php:981
-msgid "Edit visibility"
+#: ../../Zotlabs/Module/Settings.php:688 ../../Zotlabs/Module/Sources.php:112
+#: ../../Zotlabs/Module/Sources.php:147
+msgid "Optional"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:690
-msgid "Profile Tools"
+#: ../../Zotlabs/Module/Settings.php:699
+msgid "Application not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:691
-msgid "Change cover photo"
+#: ../../Zotlabs/Module/Settings.php:742
+msgid "Connected Apps"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:952
-msgid "Change profile photo"
+#: ../../Zotlabs/Module/Settings.php:746
+msgid "Client key starts with"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:693
-msgid "Create a new profile using these settings"
+#: ../../Zotlabs/Module/Settings.php:747
+msgid "No name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:694
-msgid "Clone this profile"
+#: ../../Zotlabs/Module/Settings.php:748
+msgid "Remove authorization"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:695
-msgid "Delete this profile"
+#: ../../Zotlabs/Module/Settings.php:761
+msgid "No feature settings configured"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:696
-msgid "Add profile things"
+#: ../../Zotlabs/Module/Settings.php:768
+msgid "Feature/Addon Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:697 ../../include/conversation.php:1556
-#: ../../include/widgets.php:105
-msgid "Personal"
+#: ../../Zotlabs/Module/Settings.php:791
+msgid "Account Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:699
-msgid "Relation"
+#: ../../Zotlabs/Module/Settings.php:792
+msgid "Current Password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:700 ../../include/datetime.php:48
-msgid "Miscellaneous"
+#: ../../Zotlabs/Module/Settings.php:793
+msgid "Enter New Password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:702
-msgid "Import profile from file"
+#: ../../Zotlabs/Module/Settings.php:794
+msgid "Confirm New Password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:703
-msgid "Export profile to file"
+#: ../../Zotlabs/Module/Settings.php:794
+msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:704
-msgid "Your gender"
+#: ../../Zotlabs/Module/Settings.php:796
+#: ../../Zotlabs/Module/Settings.php:1236
+msgid "Email Address:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:705
-msgid "Marital status"
+#: ../../Zotlabs/Module/Settings.php:797
+#: ../../Zotlabs/Module/Removeaccount.php:61
+msgid "Remove Account"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:706
-msgid "Sexual preference"
+#: ../../Zotlabs/Module/Settings.php:798
+msgid "Remove this account including all its channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:709
-msgid "Profile name"
+#: ../../Zotlabs/Module/Settings.php:832
+msgid ""
+"Use this form to create temporary access identifiers to share things with "
+"non-members. These identities may be used in Access Control Lists and "
+"visitors may login using these credentials to access private content."
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:711
-msgid "This is your default profile."
+#: ../../Zotlabs/Module/Settings.php:834
+msgid ""
+"You may also provide <em>dropbox</em> style access links to friends and "
+"associates by adding the Login Password to any specific site URL as shown. "
+"Examples:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:713
-msgid "Your full name"
+#: ../../Zotlabs/Module/Settings.php:869 ../../include/widgets.php:614
+msgid "Guest Access Tokens"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:714
-msgid "Title/Description"
+#: ../../Zotlabs/Module/Settings.php:876
+msgid "Login Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:717
-msgid "Street address"
+#: ../../Zotlabs/Module/Settings.php:877
+msgid "Login Password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:718
-msgid "Locality/City"
+#: ../../Zotlabs/Module/Settings.php:878
+msgid "Expires (yyyy-mm-dd)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:719
-msgid "Region/State"
+#: ../../Zotlabs/Module/Settings.php:879 ../../Zotlabs/Module/Connedit.php:782
+msgid "Their Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:720
-msgid "Postal/Zip code"
+#: ../../Zotlabs/Module/Settings.php:880 ../../Zotlabs/Module/Connedit.php:783
+msgid "My Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:721
-msgid "Country"
+#: ../../Zotlabs/Module/Settings.php:882 ../../Zotlabs/Module/Connedit.php:778
+msgid "inherited"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:726
-msgid "Who (if applicable)"
+#: ../../Zotlabs/Module/Settings.php:884 ../../Zotlabs/Module/Connedit.php:785
+msgid "Individual Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:726
-msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
+#: ../../Zotlabs/Module/Settings.php:885 ../../Zotlabs/Module/Connedit.php:786
+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/Profiles.php:727
-msgid "Since (date)"
+#: ../../Zotlabs/Module/Settings.php:903 ../../Zotlabs/Module/Admin.php:690
+#: ../../Zotlabs/Module/Admin.php:691
+msgid "Off"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:730
-msgid "Tell us about yourself"
+#: ../../Zotlabs/Module/Settings.php:903 ../../Zotlabs/Module/Admin.php:690
+#: ../../Zotlabs/Module/Admin.php:691
+msgid "On"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:731
-msgid "Homepage URL"
+#: ../../Zotlabs/Module/Settings.php:910
+msgid "Additional Features"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:732
-msgid "Hometown"
+#: ../../Zotlabs/Module/Settings.php:934
+msgid "Connector Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:733
-msgid "Political views"
+#: ../../Zotlabs/Module/Settings.php:981
+msgid "No special theme for mobile devices"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:734
-msgid "Religious views"
+#: ../../Zotlabs/Module/Settings.php:984
+#, php-format
+msgid "%s - (Experimental)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:735
-msgid "Keywords used in directory listings"
+#: ../../Zotlabs/Module/Settings.php:987 ../../Zotlabs/Module/Admin.php:414
+msgid "mobile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:735
-msgid "Example: fishing photography software"
+#: ../../Zotlabs/Module/Settings.php:1035
+msgid "Display Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:738
-msgid "Musical interests"
+#: ../../Zotlabs/Module/Settings.php:1036
+msgid "Theme Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:739
-msgid "Books, literature"
+#: ../../Zotlabs/Module/Settings.php:1037
+msgid "Custom Theme Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:740
-msgid "Television"
+#: ../../Zotlabs/Module/Settings.php:1038
+msgid "Content Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:741
-msgid "Film/Dance/Culture/Entertainment"
+#: ../../Zotlabs/Module/Settings.php:1044
+msgid "Display Theme:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:742
-msgid "Hobbies/Interests"
+#: ../../Zotlabs/Module/Settings.php:1045
+msgid "Select scheme"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:743
-msgid "Love/Romance"
+#: ../../Zotlabs/Module/Settings.php:1047
+msgid "Mobile Theme:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:745
-msgid "School/Education"
+#: ../../Zotlabs/Module/Settings.php:1048
+msgid "Preload images before rendering the page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:746
-msgid "Contact information and social networks"
+#: ../../Zotlabs/Module/Settings.php:1048
+msgid ""
+"The subjective page load time will be longer but the page will be ready when "
+"displayed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:747
-msgid "My other channels"
+#: ../../Zotlabs/Module/Settings.php:1049
+msgid "Enable user zoom on mobile devices"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:977
-msgid "Profile Image"
+#: ../../Zotlabs/Module/Settings.php:1050
+msgid "Update browser every xx seconds"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profiles.php:777 ../../include/nav.php:90
-#: ../../include/channel.php:959
-msgid "Edit Profiles"
+#: ../../Zotlabs/Module/Settings.php:1050
+msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:40
-msgid "Posts and comments"
+#: ../../Zotlabs/Module/Settings.php:1051
+msgid "Maximum number of conversations to load at any time:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:41
-msgid "Only posts"
+#: ../../Zotlabs/Module/Settings.php:1051
+msgid "Maximum of 100 items"
 msgstr ""
 
-#: ../../Zotlabs/Module/Channel.php:101
-msgid "Insufficient permissions.  Request redirected to profile page."
+#: ../../Zotlabs/Module/Settings.php:1052
+msgid "Show emoticons (smilies) as images"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:24
-msgid "Privacy group created."
+#: ../../Zotlabs/Module/Settings.php:1053
+msgid "Link post titles to source"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:30
-msgid "Could not create privacy group."
+#: ../../Zotlabs/Module/Settings.php:1054
+msgid "System Page Layout Editor - (advanced)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
-#: ../../include/items.php:3904
-msgid "Privacy group not found."
+#: ../../Zotlabs/Module/Settings.php:1057
+msgid "Use blog/list mode on channel page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:58
-msgid "Privacy group updated."
+#: ../../Zotlabs/Module/Settings.php:1057
+#: ../../Zotlabs/Module/Settings.php:1058
+msgid "(comments displayed separately)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:90
-msgid "Create a group of channels."
+#: ../../Zotlabs/Module/Settings.php:1058
+msgid "Use blog/list mode on grid page"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184
-msgid "Privacy group name: "
+#: ../../Zotlabs/Module/Settings.php:1059
+msgid "Channel page max height of content (in pixels)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187
-msgid "Members are visible to other channels"
+#: ../../Zotlabs/Module/Settings.php:1059
+#: ../../Zotlabs/Module/Settings.php:1060
+msgid "click to expand content exceeding this height"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:111
-msgid "Privacy group removed."
+#: ../../Zotlabs/Module/Settings.php:1060
+msgid "Grid page max height of content (in pixels)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:113
-msgid "Unable to remove privacy group."
+#: ../../Zotlabs/Module/Settings.php:1090
+msgid "Nobody except yourself"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:183
-msgid "Privacy group editor"
+#: ../../Zotlabs/Module/Settings.php:1091
+msgid "Only those you specifically allow"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:197
-msgid "Members"
+#: ../../Zotlabs/Module/Settings.php:1092
+msgid "Approved connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:199
-msgid "All Connected Channels"
+#: ../../Zotlabs/Module/Settings.php:1093
+msgid "Any connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Group.php:231
-msgid "Click on a channel to add or remove."
+#: ../../Zotlabs/Module/Settings.php:1094
+msgid "Anybody on this website"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:28 ../../Zotlabs/Module/Menu.php:144
-msgid "Menu not found."
+#: ../../Zotlabs/Module/Settings.php:1095
+msgid "Anybody in this network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:52
-msgid "Unable to create element."
+#: ../../Zotlabs/Module/Settings.php:1096
+msgid "Anybody authenticated"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:76
-msgid "Unable to update menu element."
+#: ../../Zotlabs/Module/Settings.php:1097
+msgid "Anybody on the internet"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:92
-msgid "Unable to add menu element."
+#: ../../Zotlabs/Module/Settings.php:1171
+msgid "Publish your default profile in the network directory"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:120 ../../Zotlabs/Module/Menu.php:166
-#: ../../Zotlabs/Module/Xchan.php:41
-msgid "Not found."
+#: ../../Zotlabs/Module/Settings.php:1176
+msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:230
-msgid "Menu Item Permissions"
+#: ../../Zotlabs/Module/Settings.php:1185
+msgid "Your channel address is"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:231
-#: ../../Zotlabs/Module/Settings.php:1263
-msgid "(click to open/close)"
+#: ../../Zotlabs/Module/Settings.php:1227
+msgid "Channel Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:176
-msgid "Link Name"
+#: ../../Zotlabs/Module/Settings.php:1234
+msgid "Basic Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:161 ../../Zotlabs/Module/Mitem.php:239
-msgid "Link or Submenu Target"
+#: ../../Zotlabs/Module/Settings.php:1235 ../../include/channel.php:1164
+msgid "Full Name:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:161
-msgid "Enter URL of the link or select a menu name to create a submenu"
+#: ../../Zotlabs/Module/Settings.php:1237
+msgid "Your Timezone:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:240
-msgid "Use magic-auth if available"
+#: ../../Zotlabs/Module/Settings.php:1238
+msgid "Default Post Location:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:241
-msgid "Open link in new window"
+#: ../../Zotlabs/Module/Settings.php:1238
+msgid "Geographical location to display on your posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242
-msgid "Order in list"
+#: ../../Zotlabs/Module/Settings.php:1239
+msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242
-msgid "Higher numbers will sink to bottom of listing"
+#: ../../Zotlabs/Module/Settings.php:1241
+msgid "Adult Content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:165
-msgid "Submit and finish"
+#: ../../Zotlabs/Module/Settings.php:1241
+msgid ""
+"This channel frequently or regularly publishes adult content. (Please tag "
+"any adult material and/or nudity with #NSFW)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:166
-msgid "Submit and continue"
+#: ../../Zotlabs/Module/Settings.php:1243
+msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:174
-msgid "Menu:"
+#: ../../Zotlabs/Module/Settings.php:1246
+msgid "Your permissions are already configured. Click to view/adjust"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:177
-msgid "Link Target"
+#: ../../Zotlabs/Module/Settings.php:1248
+msgid "Hide my online presence"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:180
-msgid "Edit menu"
+#: ../../Zotlabs/Module/Settings.php:1248
+msgid "Prevents displaying in your profile that you are online"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:183
-msgid "Edit element"
+#: ../../Zotlabs/Module/Settings.php:1250
+msgid "Simple Privacy Settings:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:184
-msgid "Drop element"
+#: ../../Zotlabs/Module/Settings.php:1251
+msgid ""
+"Very Public - <em>extremely permissive (should be used with caution)</em>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:185
-msgid "New element"
+#: ../../Zotlabs/Module/Settings.php:1252
+msgid ""
+"Typical - <em>default public, privacy when desired (similar to social "
+"network permissions but with improved privacy)</em>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:186
-msgid "Edit this menu container"
+#: ../../Zotlabs/Module/Settings.php:1253
+msgid "Private - <em>default private, never open or public</em>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:187
-msgid "Add menu element"
+#: ../../Zotlabs/Module/Settings.php:1254
+msgid "Blocked - <em>default blocked to/from everybody</em>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:188
-msgid "Delete this menu item"
+#: ../../Zotlabs/Module/Settings.php:1256
+msgid "Allow others to tag your posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:189
-msgid "Edit this menu item"
+#: ../../Zotlabs/Module/Settings.php:1256
+msgid ""
+"Often used by the community to retro-actively flag inappropriate content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:206
-msgid "Menu item not found."
+#: ../../Zotlabs/Module/Settings.php:1258
+msgid "Advanced Privacy Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:219
-msgid "Menu item deleted."
+#: ../../Zotlabs/Module/Settings.php:1260
+msgid "Expire other channel content after this many days"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:221
-msgid "Menu item could not be deleted."
+#: ../../Zotlabs/Module/Settings.php:1260
+msgid "0 or blank to use the website limit."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:228
-msgid "Edit Menu Element"
+#: ../../Zotlabs/Module/Settings.php:1260
+#, php-format
+msgid "This website expires after %d days."
 msgstr ""
 
-#: ../../Zotlabs/Module/Mitem.php:238
-msgid "Link text"
+#: ../../Zotlabs/Module/Settings.php:1260
+msgid "This website does not expire imported content."
 msgstr ""
 
-#: ../../Zotlabs/Module/Follow.php:34
-msgid "Channel added."
+#: ../../Zotlabs/Module/Settings.php:1260
+msgid "The website limit takes precedence if lower than your limit."
 msgstr ""
 
-#: ../../Zotlabs/Module/Import_items.php:104
-msgid "Import completed"
+#: ../../Zotlabs/Module/Settings.php:1261
+msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import_items.php:119
-msgid "Import Items"
+#: ../../Zotlabs/Module/Settings.php:1261
+msgid "May reduce spam activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Import_items.php:120
-msgid "Use this form to import existing posts and content from an export file."
+#: ../../Zotlabs/Module/Settings.php:1262
+msgid "Default Post and Publish Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:29
-msgid "Total invitation limit exceeded."
+#: ../../Zotlabs/Module/Settings.php:1263 ../../Zotlabs/Module/Mitem.php:154
+#: ../../Zotlabs/Module/Mitem.php:231
+msgid "(click to open/close)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:53
-#, php-format
-msgid "%s : Not a valid email address."
+#: ../../Zotlabs/Module/Settings.php:1264
+msgid "Use my default audience setting for the type of object published"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:63
-msgid "Please join us on $Projectname"
+#: ../../Zotlabs/Module/Settings.php:1271
+msgid "Channel permissions category:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:74
-msgid "Invitation limit exceeded. Please contact your site administrator."
+#: ../../Zotlabs/Module/Settings.php:1277
+msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:79
-#, php-format
-msgid "%s : Message delivery failed."
+#: ../../Zotlabs/Module/Settings.php:1277
+msgid "Useful to reduce spamming"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:83
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] ""
-msgstr[1] ""
+#: ../../Zotlabs/Module/Settings.php:1280
+msgid "Notification Settings"
+msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:102
-msgid "You have no more invitations available"
+#: ../../Zotlabs/Module/Settings.php:1281
+msgid "By default post a status message when:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:133
-msgid "Send invitations"
+#: ../../Zotlabs/Module/Settings.php:1282
+msgid "accepting a friend request"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:134
-msgid "Enter email addresses, one per line:"
+#: ../../Zotlabs/Module/Settings.php:1283
+msgid "joining a forum/community"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:136
-msgid "Please join my community on $Projectname."
+#: ../../Zotlabs/Module/Settings.php:1284
+msgid "making an <em>interesting</em> profile change"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:138
-msgid "You will need to supply this invitation code:"
+#: ../../Zotlabs/Module/Settings.php:1285
+msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:139
-msgid "1. Register at any $Projectname location (they are all inter-connected)"
+#: ../../Zotlabs/Module/Settings.php:1286
+msgid "You receive a connection request"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:141
-msgid "2. Enter my $Projectname network address into the site searchbar."
+#: ../../Zotlabs/Module/Settings.php:1287
+msgid "Your connections are confirmed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:142
-msgid "or visit"
+#: ../../Zotlabs/Module/Settings.php:1288
+msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../Zotlabs/Module/Invite.php:144
-msgid "3. Click [Connect]"
+#: ../../Zotlabs/Module/Settings.php:1289
+msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
-msgid "Location not found."
+#: ../../Zotlabs/Module/Settings.php:1290
+msgid "You receive a private message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:62
-msgid "Location lookup failed."
+#: ../../Zotlabs/Module/Settings.php:1291
+msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:66
-msgid ""
-"Please select another location to become primary before removing the primary "
-"location."
+#: ../../Zotlabs/Module/Settings.php:1292
+msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:95
-msgid "Syncing locations"
+#: ../../Zotlabs/Module/Settings.php:1293
+msgid "You are poked/prodded/etc. in a post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:105
-msgid "No locations found."
+#: ../../Zotlabs/Module/Settings.php:1296
+msgid "Show visual notifications including:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:116
-msgid "Manage Channel Locations"
+#: ../../Zotlabs/Module/Settings.php:1298
+msgid "Unseen grid activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:119
-msgid "Primary"
+#: ../../Zotlabs/Module/Settings.php:1299
+msgid "Unseen channel activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:120 ../../Zotlabs/Module/Menu.php:113
-msgid "Drop"
+#: ../../Zotlabs/Module/Settings.php:1300
+msgid "Unseen private messages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:122
-msgid "Sync Now"
+#: ../../Zotlabs/Module/Settings.php:1300
+#: ../../Zotlabs/Module/Settings.php:1305
+#: ../../Zotlabs/Module/Settings.php:1306
+#: ../../Zotlabs/Module/Settings.php:1307
+msgid "Recommended"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:123
-msgid "Please wait several minutes between consecutive operations."
+#: ../../Zotlabs/Module/Settings.php:1301
+msgid "Upcoming events"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:124
-msgid ""
-"When possible, drop a location by logging into that website/hub and removing "
-"your channel."
+#: ../../Zotlabs/Module/Settings.php:1302
+msgid "Events today"
 msgstr ""
 
-#: ../../Zotlabs/Module/Locs.php:125
-msgid "Use this form to drop the location if the hub is no longer operating."
+#: ../../Zotlabs/Module/Settings.php:1303
+msgid "Upcoming birthdays"
 msgstr ""
 
-#: ../../Zotlabs/Module/Magic.php:71
-msgid "Hub not found."
+#: ../../Zotlabs/Module/Settings.php:1303
+msgid "Not available in all themes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:192
-msgid "webpage"
+#: ../../Zotlabs/Module/Settings.php:1304
+msgid "System (personal) notifications"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:198
-msgid "block"
+#: ../../Zotlabs/Module/Settings.php:1305
+msgid "System info messages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:195
-msgid "layout"
+#: ../../Zotlabs/Module/Settings.php:1306
+msgid "System critical alerts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:201
-msgid "menu"
+#: ../../Zotlabs/Module/Settings.php:1307
+msgid "New connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:191
-#, php-format
-msgid "%s element installed"
+#: ../../Zotlabs/Module/Settings.php:1308
+msgid "System Registrations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Impel.php:194
-#, php-format
-msgid "%s element installation failed"
+#: ../../Zotlabs/Module/Settings.php:1309
+msgid ""
+"Also show new wall posts, private messages and connections under Notices"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:25
-msgid "Calendar entries imported."
+#: ../../Zotlabs/Module/Settings.php:1311
+msgid "Notify me of events this many days in advance"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:27
-msgid "No calendar entries found."
+#: ../../Zotlabs/Module/Settings.php:1311
+msgid "Must be greater than 0"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:104
-msgid "Event can not end before it has started."
+#: ../../Zotlabs/Module/Settings.php:1313
+msgid "Advanced Account/Page Type Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:106 ../../Zotlabs/Module/Events.php:115
-#: ../../Zotlabs/Module/Events.php:135
-msgid "Unable to generate preview."
+#: ../../Zotlabs/Module/Settings.php:1314
+msgid "Change the behaviour of this account for special situations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:113
-msgid "Event title and start time are required."
+#: ../../Zotlabs/Module/Settings.php:1317
+msgid ""
+"Please enable expert mode (in <a href=\"settings/features\">Settings > "
+"Additional features</a>) to adjust!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:133 ../../Zotlabs/Module/Events.php:258
-msgid "Event not found."
+#: ../../Zotlabs/Module/Settings.php:1318
+msgid "Miscellaneous Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:452
-msgid "Edit event title"
+#: ../../Zotlabs/Module/Settings.php:1319
+msgid "Default photo upload folder"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:452
-msgid "Event title"
+#: ../../Zotlabs/Module/Settings.php:1319
+#: ../../Zotlabs/Module/Settings.php:1320
+msgid "%Y - current year, %m -  current month"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:454
-msgid "Categories (comma-separated list)"
+#: ../../Zotlabs/Module/Settings.php:1320
+msgid "Default file upload folder"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:455
-msgid "Edit Category"
+#: ../../Zotlabs/Module/Settings.php:1322
+msgid "Personal menu to display in your channel pages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:455
-msgid "Category"
+#: ../../Zotlabs/Module/Settings.php:1323 ../../Zotlabs/Module/Removeme.php:64
+msgid "Remove Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:458
-msgid "Edit start date and time"
+#: ../../Zotlabs/Module/Settings.php:1324
+msgid "Remove this channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:458
-msgid "Start date and time"
+#: ../../Zotlabs/Module/Settings.php:1325
+msgid "Firefox Share $Projectname provider"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:462
-msgid "Finish date and time are not known or not relevant"
+#: ../../Zotlabs/Module/Settings.php:1326
+msgid "Start calendar week on monday"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:461
-msgid "Edit finish date and time"
+#: ../../Zotlabs/Module/Acl.php:313
+msgid "network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:461
-msgid "Finish date and time"
+#: ../../Zotlabs/Module/Acl.php:323
+msgid "RSS"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Events.php:464
-msgid "Adjust for viewer timezone"
+#: ../../Zotlabs/Module/Group.php:24
+msgid "Privacy group created."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:463
-msgid ""
-"Important for events that happen in a particular place. Not practical for "
-"global holidays."
+#: ../../Zotlabs/Module/Group.php:30
+msgid "Could not create privacy group."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:465
-msgid "Edit Description"
+#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141
+#: ../../include/items.php:3931
+msgid "Privacy group not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:467
-msgid "Edit Location"
+#: ../../Zotlabs/Module/Group.php:58
+msgid "Privacy group updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:472
-msgid "Share this event"
+#: ../../Zotlabs/Module/Group.php:90
+msgid "Create a group of channels."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:473 ../../Zotlabs/Module/Photos.php:1099
-#: ../../Zotlabs/Module/Webpages.php:224 ../../Zotlabs/Lib/ThreadItem.php:720
-#: ../../include/conversation.php:1205 ../../include/page_widgets.php:43
-msgid "Preview"
+#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184
+msgid "Privacy group name: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:474 ../../include/conversation.php:1258
-msgid "Permission settings"
+#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187
+msgid "Members are visible to other channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:485
-msgid "Advanced Options"
+#: ../../Zotlabs/Module/Group.php:111
+msgid "Privacy group removed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:597 ../../Zotlabs/Module/Cal.php:259
-msgid "l, F j"
+#: ../../Zotlabs/Module/Group.php:113
+msgid "Unable to remove privacy group."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:619
-msgid "Edit event"
+#: ../../Zotlabs/Module/Group.php:183
+msgid "Privacy group editor"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:621
-msgid "Delete event"
+#: ../../Zotlabs/Module/Group.php:197
+msgid "Members"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:646 ../../Zotlabs/Module/Cal.php:308
-#: ../../include/text.php:1716
-msgid "Link to Source"
+#: ../../Zotlabs/Module/Group.php:199
+msgid "All Connected Channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:655
-msgid "calendar"
+#: ../../Zotlabs/Module/Group.php:231
+msgid "Click on a channel to add or remove."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:674 ../../Zotlabs/Module/Cal.php:331
-msgid "Edit Event"
+#: ../../Zotlabs/Module/Photos.php:82
+msgid "Page owner information could not be retrieved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:674 ../../Zotlabs/Module/Cal.php:331
-msgid "Create Event"
+#: ../../Zotlabs/Module/Photos.php:97 ../../Zotlabs/Module/Photos.php:745
+#: ../../Zotlabs/Module/Profile_photo.php:115
+#: ../../Zotlabs/Module/Profile_photo.php:212
+#: ../../Zotlabs/Module/Profile_photo.php:311
+#: ../../include/photo/photo_driver.php:718
+msgid "Profile Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:675 ../../Zotlabs/Module/Events.php:684
-#: ../../Zotlabs/Module/Cal.php:332 ../../Zotlabs/Module/Cal.php:339
-#: ../../Zotlabs/Module/Photos.php:951
-msgid "Previous"
+#: ../../Zotlabs/Module/Photos.php:103 ../../Zotlabs/Module/Photos.php:147
+msgid "Album not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:676 ../../Zotlabs/Module/Events.php:685
-#: ../../Zotlabs/Module/Setup.php:267 ../../Zotlabs/Module/Cal.php:333
-#: ../../Zotlabs/Module/Cal.php:340 ../../Zotlabs/Module/Photos.php:960
-msgid "Next"
+#: ../../Zotlabs/Module/Photos.php:130
+msgid "Delete Album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:677 ../../Zotlabs/Module/Cal.php:334
-msgid "Export"
+#: ../../Zotlabs/Module/Photos.php:151
+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/Events.php:680 ../../Zotlabs/Module/Blocks.php:166
-#: ../../Zotlabs/Module/Layouts.php:197 ../../Zotlabs/Module/Pubsites.php:47
-#: ../../Zotlabs/Module/Webpages.php:223 ../../include/page_widgets.php:42
-msgid "View"
+#: ../../Zotlabs/Module/Photos.php:208 ../../Zotlabs/Module/Photos.php:1059
+msgid "Delete Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:681
-msgid "Month"
+#: ../../Zotlabs/Module/Photos.php:531
+msgid "No photos selected"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:682
-msgid "Week"
+#: ../../Zotlabs/Module/Photos.php:580
+msgid "Access to this item is restricted."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:683
-msgid "Day"
+#: ../../Zotlabs/Module/Photos.php:619
+#, php-format
+msgid "%1$.2f MB of %2$.2f MB photo storage used."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:686 ../../Zotlabs/Module/Cal.php:341
-msgid "Today"
+#: ../../Zotlabs/Module/Photos.php:622
+#, php-format
+msgid "%1$.2f MB photo storage used."
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:717
-msgid "Event removed"
+#: ../../Zotlabs/Module/Photos.php:658
+msgid "Upload Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Events.php:720
-msgid "Failed to remove event"
+#: ../../Zotlabs/Module/Photos.php:662
+msgid "Enter an album name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:136
-#: ../../Zotlabs/Module/New_channel.php:121
-#, php-format
-msgid "You have created %1$.0f of %2$.0f allowed channels."
+#: ../../Zotlabs/Module/Photos.php:663
+msgid "or select an existing album (doubleclick)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:143
-msgid "Create a new channel"
+#: ../../Zotlabs/Module/Photos.php:664
+msgid "Create a status post for this upload"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:214
-#: ../../include/nav.php:210
-msgid "Channel Manager"
+#: ../../Zotlabs/Module/Photos.php:665
+msgid "Caption (optional):"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:165
-msgid "Current Channel"
+#: ../../Zotlabs/Module/Photos.php:666
+msgid "Description (optional):"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:167
-msgid "Switch to one of your channels by selecting it."
+#: ../../Zotlabs/Module/Photos.php:697
+msgid "Album name could not be decoded"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:168
-msgid "Default Channel"
+#: ../../Zotlabs/Module/Photos.php:745
+msgid "Contact Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:169
-msgid "Make Default"
+#: ../../Zotlabs/Module/Photos.php:768
+msgid "Show Newest First"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:172
-#, php-format
-msgid "%d new messages"
+#: ../../Zotlabs/Module/Photos.php:770
+msgid "Show Oldest First"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:173
-#, php-format
-msgid "%d new introductions"
+#: ../../Zotlabs/Module/Photos.php:794 ../../Zotlabs/Module/Photos.php:1337
+#: ../../Zotlabs/Module/Embedphotos.php:141 ../../include/widgets.php:1607
+msgid "View Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Manage.php:175
-msgid "Delegated Channel"
+#: ../../Zotlabs/Module/Photos.php:825
+#: ../../Zotlabs/Module/Embedphotos.php:157 ../../include/widgets.php:1624
+msgid "Edit Album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:19
-msgid "No valid account found."
+#: ../../Zotlabs/Module/Photos.php:872
+msgid "Permission denied. Access to this item may be restricted."
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:33
-msgid "Password reset request issued. Check your email."
+#: ../../Zotlabs/Module/Photos.php:874
+msgid "Photo not available"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:107
-#, php-format
-msgid "Site Member (%s)"
+#: ../../Zotlabs/Module/Photos.php:932
+msgid "Use as profile photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:44
-#, php-format
-msgid "Password reset requested at %s"
+#: ../../Zotlabs/Module/Photos.php:933
+msgid "Use as cover photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:67
-msgid ""
-"Request could not be verified. (You may have previously submitted it.) "
-"Password reset failed."
+#: ../../Zotlabs/Module/Photos.php:940
+msgid "Private Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1721
-msgid "Password Reset"
+#: ../../Zotlabs/Module/Photos.php:951 ../../Zotlabs/Module/Events.php:675
+#: ../../Zotlabs/Module/Events.php:684 ../../Zotlabs/Module/Cal.php:332
+#: ../../Zotlabs/Module/Cal.php:339
+msgid "Previous"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:91
-msgid "Your password has been reset as requested."
+#: ../../Zotlabs/Module/Photos.php:955
+msgid "View Full Size"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:92
-msgid "Your new password is"
+#: ../../Zotlabs/Module/Photos.php:1000 ../../Zotlabs/Module/Admin.php:1451
+#: ../../Zotlabs/Module/Tagrm.php:137
+msgid "Remove"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:93
-msgid "Save or copy your new password - and then"
+#: ../../Zotlabs/Module/Photos.php:1034
+msgid "Edit photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:94
-msgid "click here to login"
+#: ../../Zotlabs/Module/Photos.php:1036
+msgid "Rotate CW (right)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:95
-msgid ""
-"Your password may be changed from the <em>Settings</em> page after "
-"successful login."
+#: ../../Zotlabs/Module/Photos.php:1037
+msgid "Rotate CCW (left)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:112
-#, php-format
-msgid "Your password has changed at %s"
+#: ../../Zotlabs/Module/Photos.php:1040
+msgid "Enter a new album name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:127
-msgid "Forgot your Password?"
+#: ../../Zotlabs/Module/Photos.php:1041
+msgid "or select an existing one (doubleclick)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:128
-msgid ""
-"Enter your email address and submit to have your password reset. Then check "
-"your email for further instructions."
+#: ../../Zotlabs/Module/Photos.php:1044
+msgid "Caption"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:129
-msgid "Email Address"
+#: ../../Zotlabs/Module/Photos.php:1046
+msgid "Add a Tag"
 msgstr ""
 
-#: ../../Zotlabs/Module/Lostpass.php:130
-msgid "Reset"
+#: ../../Zotlabs/Module/Photos.php:1054
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:260
-#, php-format
-msgctxt "mood"
-msgid "%1$s is %2$s"
+#: ../../Zotlabs/Module/Photos.php:1057
+msgid "Flag as adult in album view"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:227
-msgid "Mood"
+#: ../../Zotlabs/Module/Photos.php:1076 ../../Zotlabs/Lib/ThreadItem.php:262
+msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Mood.php:136
-msgid "Set your current mood and tell your friends"
+#: ../../Zotlabs/Module/Photos.php:1077 ../../Zotlabs/Lib/ThreadItem.php:263
+msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:49
-msgid "Unable to update menu."
+#: ../../Zotlabs/Module/Photos.php:1078 ../../Zotlabs/Module/Webpages.php:218
+#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Layouts.php:193
+#: ../../include/conversation.php:1227
+msgid "Share"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:60
-msgid "Unable to create menu."
+#: ../../Zotlabs/Module/Photos.php:1079 ../../Zotlabs/Lib/ThreadItem.php:398
+#: ../../include/conversation.php:743
+msgid "Please wait"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:98 ../../Zotlabs/Module/Menu.php:110
-msgid "Menu Name"
+#: ../../Zotlabs/Module/Photos.php:1095 ../../Zotlabs/Module/Photos.php:1213
+#: ../../Zotlabs/Lib/ThreadItem.php:708
+msgid "This is you"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:98
-msgid "Unique name (not visible on webpage) - required"
+#: ../../Zotlabs/Module/Photos.php:1097 ../../Zotlabs/Module/Photos.php:1215
+#: ../../Zotlabs/Lib/ThreadItem.php:710 ../../include/js_strings.php:6
+msgid "Comment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:99 ../../Zotlabs/Module/Menu.php:111
-msgid "Menu Title"
+#: ../../Zotlabs/Module/Photos.php:1099 ../../Zotlabs/Module/Webpages.php:224
+#: ../../Zotlabs/Module/Events.php:473 ../../Zotlabs/Lib/ThreadItem.php:720
+#: ../../include/conversation.php:1200 ../../include/page_widgets.php:43
+msgid "Preview"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:99
-msgid "Visible on webpage - leave empty for no title"
+#: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:577
+msgctxt "title"
+msgid "Likes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:100
-msgid "Allow Bookmarks"
+#: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:577
+msgctxt "title"
+msgid "Dislikes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157
-msgid "Menu may be used to store saved bookmarks"
+#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Agree"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:101 ../../Zotlabs/Module/Menu.php:159
-msgid "Submit and proceed"
+#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Disagree"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2263
-msgid "Menus"
+#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:578
+msgctxt "title"
+msgid "Abstain"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:114 ../../Zotlabs/Module/Blocks.php:157
-#: ../../Zotlabs/Module/Layouts.php:190 ../../Zotlabs/Module/Webpages.php:228
-#: ../../include/page_widgets.php:47
-msgid "Created"
+#: ../../Zotlabs/Module/Photos.php:1115 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Attending"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:115 ../../Zotlabs/Module/Blocks.php:158
-#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:229
-#: ../../include/page_widgets.php:48
-msgid "Edited"
+#: ../../Zotlabs/Module/Photos.php:1115 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Not attending"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:117
-msgid "Bookmarks allowed"
+#: ../../Zotlabs/Module/Photos.php:1115 ../../include/conversation.php:579
+msgctxt "title"
+msgid "Might attend"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:119
-msgid "Delete this menu"
+#: ../../Zotlabs/Module/Photos.php:1132 ../../Zotlabs/Module/Photos.php:1144
+#: ../../Zotlabs/Lib/ThreadItem.php:181 ../../Zotlabs/Lib/ThreadItem.php:193
+#: ../../include/conversation.php:1756
+msgid "View all"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:120 ../../Zotlabs/Module/Menu.php:154
-msgid "Edit menu contents"
+#: ../../Zotlabs/Module/Photos.php:1136 ../../Zotlabs/Lib/ThreadItem.php:185
+#: ../../include/channel.php:1182 ../../include/conversation.php:1780
+#: ../../include/taxonomy.php:403
+msgctxt "noun"
+msgid "Like"
+msgid_plural "Likes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Photos.php:1141 ../../Zotlabs/Lib/ThreadItem.php:190
+#: ../../include/conversation.php:1783
+msgctxt "noun"
+msgid "Dislike"
+msgid_plural "Dislikes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Photos.php:1241
+msgid "Photo Tools"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:121
-msgid "Edit this menu"
+#: ../../Zotlabs/Module/Photos.php:1250
+msgid "In This Photo:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:136
-msgid "Menu could not be deleted."
+#: ../../Zotlabs/Module/Photos.php:1255
+msgid "Map"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:149
-msgid "Edit Menu"
+#: ../../Zotlabs/Module/Photos.php:1263 ../../Zotlabs/Lib/ThreadItem.php:387
+msgctxt "noun"
+msgid "Likes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:153
-msgid "Add or remove entries to this menu"
+#: ../../Zotlabs/Module/Photos.php:1264 ../../Zotlabs/Lib/ThreadItem.php:388
+msgctxt "noun"
+msgid "Dislikes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:155
-msgid "Menu name"
+#: ../../Zotlabs/Module/Photos.php:1269 ../../Zotlabs/Lib/ThreadItem.php:393
+#: ../../include/acl_selectors.php:181
+msgid "Close"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:155
-msgid "Must be unique, only seen by you"
+#: ../../Zotlabs/Module/Photos.php:1343
+msgid "View Album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:156
-msgid "Menu title"
+#: ../../Zotlabs/Module/Photos.php:1354 ../../Zotlabs/Module/Photos.php:1367
+#: ../../Zotlabs/Module/Photos.php:1368
+msgid "Recent Photos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:156
-msgid "Menu title as seen by others"
+#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:192
+msgid "webpage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Menu.php:157
-msgid "Allow bookmarks"
+#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:198
+msgid "block"
 msgstr ""
 
-#: ../../Zotlabs/Module/Notify.php:57
-#: ../../Zotlabs/Module/Notifications.php:98
-msgid "No more system notifications."
+#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:195
+msgid "layout"
 msgstr ""
 
-#: ../../Zotlabs/Module/Notify.php:61
-#: ../../Zotlabs/Module/Notifications.php:102
-msgid "System Notifications"
+#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:201
+msgid "menu"
 msgstr ""
 
-#: ../../Zotlabs/Module/Match.php:26
-msgid "Profile Match"
+#: ../../Zotlabs/Module/Impel.php:191
+#, php-format
+msgid "%s element installed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Match.php:35
-msgid "No keywords to match. Please add keywords to your default profile."
+#: ../../Zotlabs/Module/Impel.php:194
+#, php-format
+msgid "%s element installation failed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Match.php:67
-msgid "is interested in:"
+#: ../../Zotlabs/Module/Import_items.php:42 ../../Zotlabs/Module/Import.php:71
+msgid "Nothing to import."
 msgstr ""
 
-#: ../../Zotlabs/Module/Match.php:74
-msgid "No matches"
+#: ../../Zotlabs/Module/Import_items.php:66 ../../Zotlabs/Module/Import.php:95
+msgid "Unable to download data from old server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Probe.php:28 ../../Zotlabs/Module/Probe.php:32
-#, php-format
-msgid "Fetching URL returns error: %1$s"
+#: ../../Zotlabs/Module/Import_items.php:72
+#: ../../Zotlabs/Module/Import.php:101
+msgid "Imported file is empty."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:179
-msgid "$Projectname Server - Setup"
+#: ../../Zotlabs/Module/Import_items.php:88
+#: ../../Zotlabs/Module/Import.php:123
+#, php-format
+msgid "Warning: Database versions differ by %1$d updates."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:183
-msgid "Could not connect to database."
+#: ../../Zotlabs/Module/Import_items.php:104
+msgid "Import completed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:187
-msgid ""
-"Could not connect to specified site URL. Possible SSL certificate or DNS "
-"issue."
+#: ../../Zotlabs/Module/Import_items.php:119
+msgid "Import Items"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:194
-msgid "Could not create table."
+#: ../../Zotlabs/Module/Import_items.php:120
+msgid "Use this form to import existing posts and content from an export file."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:199
-msgid "Your site database has been installed."
+#: ../../Zotlabs/Module/Import_items.php:121
+#: ../../Zotlabs/Module/Import.php:549
+msgid "File to Upload"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:203
-msgid ""
-"You may need to import the file \"install/schema_xxx.sql\" manually using a "
-"database client."
+#: ../../Zotlabs/Module/Invite.php:29
+msgid "Total invitation limit exceeded."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:204 ../../Zotlabs/Module/Setup.php:266
-#: ../../Zotlabs/Module/Setup.php:722
-msgid "Please see the file \"install/INSTALL.txt\"."
+#: ../../Zotlabs/Module/Invite.php:53
+#, php-format
+msgid "%s : Not a valid email address."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:263
-msgid "System check"
+#: ../../Zotlabs/Module/Invite.php:63
+msgid "Please join us on $Projectname"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:268
-msgid "Check again"
+#: ../../Zotlabs/Module/Invite.php:74
+msgid "Invitation limit exceeded. Please contact your site administrator."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:290
-msgid "Database connection"
+#: ../../Zotlabs/Module/Invite.php:79
+#, php-format
+msgid "%s : Message delivery failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:291
-msgid ""
-"In order to install $Projectname we need to know how to connect to your "
-"database."
+#: ../../Zotlabs/Module/Invite.php:83
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../Zotlabs/Module/Invite.php:102
+msgid "You have no more invitations available"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:292
-msgid ""
-"Please contact your hosting provider or site administrator if you have "
-"questions about these settings."
+#: ../../Zotlabs/Module/Invite.php:133
+msgid "Send invitations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:293
-msgid ""
-"The database you specify below should already exist. If it does not, please "
-"create it before continuing."
+#: ../../Zotlabs/Module/Invite.php:134
+msgid "Enter email addresses, one per line:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:297
-msgid "Database Server Name"
+#: ../../Zotlabs/Module/Invite.php:135 ../../Zotlabs/Module/Mail.php:241
+msgid "Your message:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:297
-msgid "Default is 127.0.0.1"
+#: ../../Zotlabs/Module/Invite.php:136
+msgid "Please join my community on $Projectname."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:298
-msgid "Database Port"
+#: ../../Zotlabs/Module/Invite.php:138
+msgid "You will need to supply this invitation code:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:298
-msgid "Communication port number - use 0 for default"
+#: ../../Zotlabs/Module/Invite.php:139
+msgid "1. Register at any $Projectname location (they are all inter-connected)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:299
-msgid "Database Login Name"
+#: ../../Zotlabs/Module/Invite.php:141
+msgid "2. Enter my $Projectname network address into the site searchbar."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:300
-msgid "Database Login Password"
+#: ../../Zotlabs/Module/Invite.php:142
+msgid "or visit"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:301
-msgid "Database Name"
+#: ../../Zotlabs/Module/Invite.php:144
+msgid "3. Click [Connect]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:302
-msgid "Database Type"
+#: ../../Zotlabs/Module/Locs.php:25 ../../Zotlabs/Module/Locs.php:54
+msgid "Location not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:304 ../../Zotlabs/Module/Setup.php:344
-msgid "Site administrator email address"
+#: ../../Zotlabs/Module/Locs.php:62
+msgid "Location lookup failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:304 ../../Zotlabs/Module/Setup.php:344
+#: ../../Zotlabs/Module/Locs.php:66
 msgid ""
-"Your account email address must match this in order to use the web admin "
-"panel."
+"Please select another location to become primary before removing the primary "
+"location."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:305 ../../Zotlabs/Module/Setup.php:346
-msgid "Website URL"
+#: ../../Zotlabs/Module/Locs.php:95
+msgid "Syncing locations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:305 ../../Zotlabs/Module/Setup.php:346
-msgid "Please use SSL (https) URL if available."
+#: ../../Zotlabs/Module/Locs.php:105
+msgid "No locations found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:306 ../../Zotlabs/Module/Setup.php:349
-msgid "Please select a default timezone for your website"
+#: ../../Zotlabs/Module/Locs.php:116
+msgid "Manage Channel Locations"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:333
-msgid "Site settings"
+#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Admin.php:1237
+#: ../../Zotlabs/Module/Profiles.php:470
+msgid "Address"
+msgstr ""
+
+#: ../../Zotlabs/Module/Locs.php:119
+msgid "Primary"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:347
-msgid "Enable $Projectname <strong>advanced</strong> features?"
+#: ../../Zotlabs/Module/Locs.php:122
+msgid "Sync Now"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:347
+#: ../../Zotlabs/Module/Locs.php:123
+msgid "Please wait several minutes between consecutive operations."
+msgstr ""
+
+#: ../../Zotlabs/Module/Locs.php:124
 msgid ""
-"Some advanced features, while useful - may be best suited for technically "
-"proficient audiences"
+"When possible, drop a location by logging into that website/hub and removing "
+"your channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:388
-msgid "PHP version 5.5 or greater is required."
+#: ../../Zotlabs/Module/Locs.php:125
+msgid "Use this form to drop the location if the hub is no longer operating."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:389
-msgid "PHP version"
+#: ../../Zotlabs/Module/Magic.php:71
+msgid "Hub not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:404
-msgid "Could not find a command line version of PHP in the web server PATH."
+#: ../../Zotlabs/Module/Like.php:19
+msgid "Like/Dislike"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:24
+msgid "This action is restricted to members."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:405
+#: ../../Zotlabs/Module/Like.php:25
 msgid ""
-"If you don't have a command line version of PHP installed on server, you "
-"will not be able to run background polling via cron."
+"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/Setup.php:409
-msgid "PHP executable path"
+#: ../../Zotlabs/Module/Like.php:105 ../../Zotlabs/Module/Like.php:131
+#: ../../Zotlabs/Module/Like.php:169
+msgid "Invalid request."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:409
-msgid ""
-"Enter full path to php executable. You can leave this blank to continue the "
-"installation."
+#: ../../Zotlabs/Module/Like.php:117 ../../include/conversation.php:126
+msgid "channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:414
-msgid "Command line PHP"
+#: ../../Zotlabs/Module/Like.php:146
+msgid "thing"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:423
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
+#: ../../Zotlabs/Module/Like.php:192
+msgid "Channel unavailable."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:424
-msgid "This is required for message delivery to work."
+#: ../../Zotlabs/Module/Like.php:240
+msgid "Previous action reversed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:427
-msgid "PHP register_argc_argv"
+#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
+#: ../../Zotlabs/Module/Tagger.php:47 ../../include/text.php:1945
+#: ../../include/conversation.php:120
+msgid "photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:445
+#: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87
+#: ../../include/text.php:1951 ../../include/conversation.php:148
+msgid "status"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:372 ../../Zotlabs/Module/Events.php:253
+#: ../../Zotlabs/Module/Tagger.php:51 ../../include/text.php:1948
+#: ../../include/conversation.php:123 ../../include/event.php:958
+msgid "event"
+msgstr ""
+
+#: ../../Zotlabs/Module/Like.php:419 ../../include/conversation.php:164
 #, php-format
-msgid ""
-"Your max allowed total upload size is set to %s. Maximum size of one file to "
-"upload is set to %s. You are allowed to upload up to %d files at once."
+msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:450
-msgid "You can adjust these settings in the servers php.ini."
+#: ../../Zotlabs/Module/Like.php:421 ../../include/conversation.php:167
+#, php-format
+msgid "%1$s doesn't like %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:452
-msgid "PHP upload limits"
+#: ../../Zotlabs/Module/Like.php:423
+#, php-format
+msgid "%1$s agrees with %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:475
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
+#: ../../Zotlabs/Module/Like.php:425
+#, php-format
+msgid "%1$s doesn't agree with %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:476
-msgid ""
-"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
-"installation.php\"."
+#: ../../Zotlabs/Module/Like.php:427
+#, php-format
+msgid "%1$s abstains from a decision on %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:479
-msgid "Generate encryption keys"
+#: ../../Zotlabs/Module/Like.php:429
+#, php-format
+msgid "%1$s is attending %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:491
-msgid "libCurl PHP module"
+#: ../../Zotlabs/Module/Like.php:431
+#, php-format
+msgid "%1$s is not attending %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:492
-msgid "GD graphics PHP module"
+#: ../../Zotlabs/Module/Like.php:433
+#, php-format
+msgid "%1$s may attend %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:493
-msgid "OpenSSL PHP module"
+#: ../../Zotlabs/Module/Like.php:538
+msgid "Action completed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:494
-msgid "mysqli or postgres PHP module"
+#: ../../Zotlabs/Module/Like.php:539
+msgid "Thank you."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:495
-msgid "mb_string PHP module"
+#: ../../Zotlabs/Module/Manage.php:136
+#: ../../Zotlabs/Module/New_channel.php:121
+#, php-format
+msgid "You have created %1$.0f of %2$.0f allowed channels."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:496
-msgid "xml PHP module"
+#: ../../Zotlabs/Module/Manage.php:143
+msgid "Create a new channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:500 ../../Zotlabs/Module/Setup.php:502
-msgid "Apache mod_rewrite module"
+#: ../../Zotlabs/Module/Manage.php:143 ../../Zotlabs/Module/Profiles.php:778
+#: ../../Zotlabs/Module/Chat.php:255
+msgid "Create New"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:500
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
+#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:214
+#: ../../include/nav.php:210
+msgid "Channel Manager"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:506 ../../Zotlabs/Module/Setup.php:509
-msgid "proc_open"
+#: ../../Zotlabs/Module/Manage.php:165
+msgid "Current Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:506
-msgid ""
-"Error: proc_open is required but is either not installed or has been "
-"disabled in php.ini"
+#: ../../Zotlabs/Module/Manage.php:167
+msgid "Switch to one of your channels by selecting it."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:514
-msgid "Error: libCURL PHP module required but not installed."
+#: ../../Zotlabs/Module/Manage.php:168
+msgid "Default Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:518
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
+#: ../../Zotlabs/Module/Manage.php:169
+msgid "Make Default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:522
-msgid "Error: openssl PHP module required but not installed."
+#: ../../Zotlabs/Module/Manage.php:172
+#, php-format
+msgid "%d new messages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:526
-msgid ""
-"Error: mysqli or postgres PHP module required but neither are installed."
+#: ../../Zotlabs/Module/Manage.php:173
+#, php-format
+msgid "%d new introductions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:530
-msgid "Error: mb_string PHP module required but not installed."
+#: ../../Zotlabs/Module/Manage.php:175
+msgid "Delegated Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:534
-msgid "Error: xml PHP module required for DAV but not installed."
+#: ../../Zotlabs/Module/Mitem.php:52
+msgid "Unable to create element."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:552
-msgid ""
-"The web installer needs to be able to create a file called \".htconfig.php\" "
-"in the top folder of your web server and it is unable to do so."
+#: ../../Zotlabs/Module/Mitem.php:76
+msgid "Unable to update menu element."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:553
-msgid ""
-"This is most often a permission setting, as the web server may not be able "
-"to write files in your folder - even if you can."
+#: ../../Zotlabs/Module/Mitem.php:92
+msgid "Unable to add menu element."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:554
-msgid ""
-"At the end of this procedure, we will give you a text to save in a file "
-"named .htconfig.php in your Red top folder."
+#: ../../Zotlabs/Module/Mitem.php:153 ../../Zotlabs/Module/Mitem.php:230
+msgid "Menu Item Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:555
-msgid ""
-"You can alternatively skip this procedure and perform a manual installation. "
-"Please see the file \"install/INSTALL.txt\" for instructions."
+#: ../../Zotlabs/Module/Mitem.php:160 ../../Zotlabs/Module/Mitem.php:176
+msgid "Link Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:558
-msgid ".htconfig.php is writable"
+#: ../../Zotlabs/Module/Mitem.php:161 ../../Zotlabs/Module/Mitem.php:239
+msgid "Link or Submenu Target"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:572
-msgid ""
-"Red uses the Smarty3 template engine to render its web views. Smarty3 "
-"compiles templates to PHP to speed up rendering."
+#: ../../Zotlabs/Module/Mitem.php:161
+msgid "Enter URL of the link or select a menu name to create a submenu"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:573
-#, php-format
-msgid ""
-"In order to store these compiled templates, the web server needs to have "
-"write access to the directory %s under the top level web folder."
+#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:240
+msgid "Use magic-auth if available"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:574 ../../Zotlabs/Module/Setup.php:595
-msgid ""
-"Please ensure that the user that your web server runs as (e.g. www-data) has "
-"write access to this folder."
+#: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:241
+msgid "Open link in new window"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:575
-#, php-format
-msgid ""
-"Note: as a security measure, you should give the web server write access to "
-"%s only--not the template files (.tpl) that it contains."
+#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242
+msgid "Order in list"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:578
-#, php-format
-msgid "%s is writable"
+#: ../../Zotlabs/Module/Mitem.php:164 ../../Zotlabs/Module/Mitem.php:242
+msgid "Higher numbers will sink to bottom of listing"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:594
-msgid ""
-"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"
+#: ../../Zotlabs/Module/Mitem.php:165
+msgid "Submit and finish"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:598
-msgid "store is writable"
+#: ../../Zotlabs/Module/Mitem.php:166
+msgid "Submit and continue"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:631
-msgid ""
-"SSL certificate cannot be validated. Fix certificate or disable https access "
-"to this site."
+#: ../../Zotlabs/Module/Mitem.php:174
+msgid "Menu:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:632
-msgid ""
-"If you have https access to your website or allow connections to TCP port "
-"443 (the https: port), you MUST use a browser-valid certificate. You MUST "
-"NOT use self-signed certificates!"
+#: ../../Zotlabs/Module/Mitem.php:177
+msgid "Link Target"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:633
-msgid ""
-"This restriction is incorporated because public posts from you may for "
-"example contain references to images on your own hub."
+#: ../../Zotlabs/Module/Mitem.php:180
+msgid "Edit menu"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:634
-msgid ""
-"If your certificate is not recognized, members of other sites (who may "
-"themselves have valid certificates) will get a warning message on their own "
-"site complaining about security issues."
+#: ../../Zotlabs/Module/Mitem.php:183
+msgid "Edit element"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:635
-msgid ""
-"This can cause usability issues elsewhere (not just on your own site) so we "
-"must insist on this requirement."
+#: ../../Zotlabs/Module/Mitem.php:184
+msgid "Drop element"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:636
-msgid ""
-"Providers are available that issue free certificates which are browser-valid."
+#: ../../Zotlabs/Module/Mitem.php:185
+msgid "New element"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:638
-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."
+#: ../../Zotlabs/Module/Mitem.php:186
+msgid "Edit this menu container"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:641
-msgid "SSL certificate validation"
+#: ../../Zotlabs/Module/Mitem.php:187
+msgid "Add menu element"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:647
-msgid ""
-"Url rewrite in .htaccess is not working. Check your server configuration."
-"Test: "
+#: ../../Zotlabs/Module/Mitem.php:188
+msgid "Delete this menu item"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:650
-msgid "Url rewrite is working"
+#: ../../Zotlabs/Module/Mitem.php:189
+msgid "Edit this menu item"
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:659
-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."
+#: ../../Zotlabs/Module/Mitem.php:206
+msgid "Menu item not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:683
-msgid "Errors encountered creating database tables."
+#: ../../Zotlabs/Module/Mitem.php:219
+msgid "Menu item deleted."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:720
-msgid "<h1>What next</h1>"
+#: ../../Zotlabs/Module/Mitem.php:221
+msgid "Menu item could not be deleted."
 msgstr ""
 
-#: ../../Zotlabs/Module/Setup.php:721
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
+#: ../../Zotlabs/Module/Mitem.php:228
+msgid "Edit Menu Element"
+msgstr ""
+
+#: ../../Zotlabs/Module/Mitem.php:238
+msgid "Link text"
 msgstr ""
 
 #: ../../Zotlabs/Module/Admin.php:77
@@ -3574,12 +3629,12 @@ msgstr ""
 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
+#: ../../Zotlabs/Module/Admin.php:241 ../../Zotlabs/Module/Admin.php:500
+#: ../../Zotlabs/Module/Admin.php:724 ../../Zotlabs/Module/Admin.php:768
+#: ../../Zotlabs/Module/Admin.php:1043 ../../Zotlabs/Module/Admin.php:1222
+#: ../../Zotlabs/Module/Admin.php:1342 ../../Zotlabs/Module/Admin.php:1433
+#: ../../Zotlabs/Module/Admin.php:1626 ../../Zotlabs/Module/Admin.php:1660
+#: ../../Zotlabs/Module/Admin.php:1745
 msgid "Administration"
 msgstr ""
 
@@ -3591,7 +3646,7 @@ msgstr ""
 msgid "Registered accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:246 ../../Zotlabs/Module/Admin.php:715
+#: ../../Zotlabs/Module/Admin.php:246 ../../Zotlabs/Module/Admin.php:728
 msgid "Pending registrations"
 msgstr ""
 
@@ -3599,7 +3654,7 @@ msgstr ""
 msgid "Registered channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:248 ../../Zotlabs/Module/Admin.php:716
+#: ../../Zotlabs/Module/Admin.php:248 ../../Zotlabs/Module/Admin.php:729
 msgid "Active plugins"
 msgstr ""
 
@@ -3615,2870 +3670,2822 @@ msgstr ""
 msgid "Repository version (dev)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:373
+#: ../../Zotlabs/Module/Admin.php:377
 msgid "Site settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:400 ../../include/text.php:2888
+#: ../../Zotlabs/Module/Admin.php:404 ../../include/text.php:2888
 msgid "Default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:410 ../../Zotlabs/Module/Settings.php:987
-msgid "mobile"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:412
+#: ../../Zotlabs/Module/Admin.php:416
 msgid "experimental"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:414
+#: ../../Zotlabs/Module/Admin.php:418
 msgid "unsupported"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:460
+#: ../../Zotlabs/Module/Admin.php:464
 msgid "Yes - with approval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:466
+#: ../../Zotlabs/Module/Admin.php:470
 msgid "My site is not a public server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:467
+#: ../../Zotlabs/Module/Admin.php:471
 msgid "My site has paid access only"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:468
+#: ../../Zotlabs/Module/Admin.php:472
 msgid "My site has free access only"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:469
+#: ../../Zotlabs/Module/Admin.php:473
 msgid "My site offers free accounts with optional paid upgrades"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:491 ../../include/widgets.php:1490
+#: ../../Zotlabs/Module/Admin.php:501 ../../include/widgets.php:1490
 msgid "Site"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:493 ../../Zotlabs/Module/Register.php:248
-msgid "Registration"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:494
+#: ../../Zotlabs/Module/Admin.php:504
 msgid "File upload"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:495
+#: ../../Zotlabs/Module/Admin.php:505
 msgid "Policies"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:496 ../../include/contact_widgets.php:16
+#: ../../Zotlabs/Module/Admin.php:506 ../../include/contact_widgets.php:16
 msgid "Advanced"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:500
+#: ../../Zotlabs/Module/Admin.php:510
 msgid "Site name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:501
+#: ../../Zotlabs/Module/Admin.php:514
 msgid "Banner/Logo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:502
+#: ../../Zotlabs/Module/Admin.php:515
 msgid "Administrator Information"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:502
+#: ../../Zotlabs/Module/Admin.php:515
 msgid ""
 "Contact information for site administrators.  Displayed on siteinfo page.  "
 "BBCode can be used here"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:503
+#: ../../Zotlabs/Module/Admin.php:516
 msgid "System language"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:504
+#: ../../Zotlabs/Module/Admin.php:517
 msgid "System theme"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:504
+#: ../../Zotlabs/Module/Admin.php:517
 msgid ""
 "Default system theme - may be over-ridden by user profiles - <a href='#' "
 "id='cnftheme'>change theme settings</a>"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:505
+#: ../../Zotlabs/Module/Admin.php:518
 msgid "Mobile system theme"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:505
+#: ../../Zotlabs/Module/Admin.php:518
 msgid "Theme for mobile devices"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:507
+#: ../../Zotlabs/Module/Admin.php:520
 msgid "Allow Feeds as Connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:507
+#: ../../Zotlabs/Module/Admin.php:520
 msgid "(Heavy system resource usage)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:508
+#: ../../Zotlabs/Module/Admin.php:521
 msgid "Maximum image size"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:508
+#: ../../Zotlabs/Module/Admin.php:521
 msgid ""
 "Maximum size in bytes of uploaded images. Default is 0, which means no "
 "limits."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:509
+#: ../../Zotlabs/Module/Admin.php:522
 msgid "Does this site allow new member registration?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:510
+#: ../../Zotlabs/Module/Admin.php:523
 msgid "Invitation only"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:510
+#: ../../Zotlabs/Module/Admin.php:523
 msgid ""
 "Only allow new member registrations with an invitation code. Above register "
 "policy must be set to Yes."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:511
+#: ../../Zotlabs/Module/Admin.php:524
 msgid "Which best describes the types of account offered by this hub?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:512
+#: ../../Zotlabs/Module/Admin.php:525
 msgid "Register text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:512
+#: ../../Zotlabs/Module/Admin.php:525
 msgid "Will be displayed prominently on the registration page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:513
+#: ../../Zotlabs/Module/Admin.php:526
 msgid "Site homepage to show visitors (default: login box)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:513
+#: ../../Zotlabs/Module/Admin.php:526
 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/Admin.php:514
+#: ../../Zotlabs/Module/Admin.php:527
 msgid "Preserve site homepage URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:514
+#: ../../Zotlabs/Module/Admin.php:527
 msgid ""
 "Present the site homepage in a frame at the original location instead of "
 "redirecting"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:515
+#: ../../Zotlabs/Module/Admin.php:528
 msgid "Accounts abandoned after x days"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:515
+#: ../../Zotlabs/Module/Admin.php:528
 msgid ""
 "Will not waste system resources polling external sites for abandonded "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:516
+#: ../../Zotlabs/Module/Admin.php:529
 msgid "Allowed friend domains"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:516
+#: ../../Zotlabs/Module/Admin.php:529
 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/Admin.php:517
+#: ../../Zotlabs/Module/Admin.php:530
 msgid "Allowed email domains"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:517
+#: ../../Zotlabs/Module/Admin.php:530
 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/Admin.php:518
+#: ../../Zotlabs/Module/Admin.php:531
 msgid "Not allowed email domains"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:518
+#: ../../Zotlabs/Module/Admin.php:531
 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/Admin.php:519
+#: ../../Zotlabs/Module/Admin.php:532
 msgid "Verify Email Addresses"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:519
+#: ../../Zotlabs/Module/Admin.php:532
 msgid ""
 "Check to verify email addresses used in account registration (recommended)."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:520
+#: ../../Zotlabs/Module/Admin.php:533
 msgid "Force publish"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:520
+#: ../../Zotlabs/Module/Admin.php:533
 msgid ""
 "Check to force all profiles on this site to be listed in the site directory."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:521
+#: ../../Zotlabs/Module/Admin.php:534
 msgid "Import Public Streams"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:521
+#: ../../Zotlabs/Module/Admin.php:534
 msgid ""
 "Import and allow access to public content pulled from other sites. Warning: "
 "this content is unmoderated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:522
+#: ../../Zotlabs/Module/Admin.php:535
 msgid "Login on Homepage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:522
+#: ../../Zotlabs/Module/Admin.php:535
 msgid ""
 "Present a login box to visitors on the home page if no other content has "
 "been configured."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:523
+#: ../../Zotlabs/Module/Admin.php:536
 msgid "Enable context help"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:523
+#: ../../Zotlabs/Module/Admin.php:536
 msgid ""
 "Display contextual help for the current page when the help button is pressed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:525
+#: ../../Zotlabs/Module/Admin.php:538
 msgid "Directory Server URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:525
+#: ../../Zotlabs/Module/Admin.php:538
 msgid "Default directory server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:527
+#: ../../Zotlabs/Module/Admin.php:540
 msgid "Proxy user"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:528
+#: ../../Zotlabs/Module/Admin.php:541
 msgid "Proxy URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:529
+#: ../../Zotlabs/Module/Admin.php:542
 msgid "Network timeout"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:529
+#: ../../Zotlabs/Module/Admin.php:542
 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:530
+#: ../../Zotlabs/Module/Admin.php:543
 msgid "Delivery interval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:530
+#: ../../Zotlabs/Module/Admin.php:543
 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/Admin.php:531
+#: ../../Zotlabs/Module/Admin.php:544
 msgid "Deliveries per process"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:531
+#: ../../Zotlabs/Module/Admin.php:544
 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/Admin.php:532
+#: ../../Zotlabs/Module/Admin.php:545
 msgid "Poll interval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:532
+#: ../../Zotlabs/Module/Admin.php:545
 msgid ""
 "Delay background polling processes by this many seconds to reduce system "
 "load. If 0, use delivery interval."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:533
+#: ../../Zotlabs/Module/Admin.php:546
 msgid "Maximum Load Average"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:533
+#: ../../Zotlabs/Module/Admin.php:546
 msgid ""
 "Maximum system load before delivery and poll processes are deferred - "
 "default 50."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:534
+#: ../../Zotlabs/Module/Admin.php:547
 msgid "Expiration period in days for imported (grid/network) content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:534
+#: ../../Zotlabs/Module/Admin.php:547
 msgid "0 for no expiration of imported content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678
-#: ../../Zotlabs/Module/Settings.php:903
-msgid "Off"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:677 ../../Zotlabs/Module/Admin.php:678
-#: ../../Zotlabs/Module/Settings.php:903
-msgid "On"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:678
+#: ../../Zotlabs/Module/Admin.php:691
 #, php-format
 msgid "Lock feature %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:686
+#: ../../Zotlabs/Module/Admin.php:699
 msgid "Manage Additional Features"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:703
+#: ../../Zotlabs/Module/Admin.php:716
 msgid "No server found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:710 ../../Zotlabs/Module/Admin.php:1046
+#: ../../Zotlabs/Module/Admin.php:723 ../../Zotlabs/Module/Admin.php:1059
 msgid "ID"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:710
+#: ../../Zotlabs/Module/Admin.php:723
 msgid "for channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:710
+#: ../../Zotlabs/Module/Admin.php:723
 msgid "on server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:712
+#: ../../Zotlabs/Module/Admin.php:725
 msgid "Server"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:746
+#: ../../Zotlabs/Module/Admin.php:759
 msgid ""
 "By default, unfiltered HTML is allowed in embedded media. This is inherently "
 "insecure."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:749
+#: ../../Zotlabs/Module/Admin.php:762
 msgid ""
 "The recommended setting is to only allow unfiltered HTML from the following "
 "sites:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:750
+#: ../../Zotlabs/Module/Admin.php:763
 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/Admin.php:751
+#: ../../Zotlabs/Module/Admin.php:764
 msgid ""
 "All other embedded content will be filtered, <strong>unless</strong> "
 "embedded content from that site is explicitly blocked."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:756 ../../include/widgets.php:1493
+#: ../../Zotlabs/Module/Admin.php:769 ../../include/widgets.php:1493
 msgid "Security"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:758
+#: ../../Zotlabs/Module/Admin.php:771
 msgid "Block public"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:758
+#: ../../Zotlabs/Module/Admin.php:771
 msgid ""
 "Check to block public access to all otherwise public personal pages on this "
 "site unless you are currently authenticated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:759
+#: ../../Zotlabs/Module/Admin.php:772
 msgid "Set \"Transport Security\" HTTP header"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:760
+#: ../../Zotlabs/Module/Admin.php:773
 msgid "Set \"Content Security Policy\" HTTP header"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:761
+#: ../../Zotlabs/Module/Admin.php:774
 msgid "Allow communications only from these sites"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:761
+#: ../../Zotlabs/Module/Admin.php:774
 msgid ""
 "One site per line. Leave empty to allow communication from anywhere by "
 "default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:762
+#: ../../Zotlabs/Module/Admin.php:775
 msgid "Block communications from these sites"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:763
+#: ../../Zotlabs/Module/Admin.php:776
 msgid "Allow communications only from these channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:763
+#: ../../Zotlabs/Module/Admin.php:776
 msgid ""
 "One channel (hash) per line. Leave empty to allow from any channel by default"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:764
+#: ../../Zotlabs/Module/Admin.php:777
 msgid "Block communications from these channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:765
+#: ../../Zotlabs/Module/Admin.php:778
 msgid "Only allow embeds from secure (SSL) websites and links."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:766
+#: ../../Zotlabs/Module/Admin.php:779
 msgid "Allow unfiltered embedded HTML content only from these domains"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:766
+#: ../../Zotlabs/Module/Admin.php:779
 msgid "One site per line. By default embedded content is filtered."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:767
+#: ../../Zotlabs/Module/Admin.php:780
 msgid "Block embedded HTML from these domains"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:785
+#: ../../Zotlabs/Module/Admin.php:798
 msgid "Update has been marked successful"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:795
+#: ../../Zotlabs/Module/Admin.php:808
 #, php-format
 msgid "Executing %s failed. Check system logs."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:798
+#: ../../Zotlabs/Module/Admin.php:811
 #, php-format
 msgid "Update %s was successfully applied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:802
+#: ../../Zotlabs/Module/Admin.php:815
 #, php-format
 msgid "Update %s did not return a status. Unknown if it succeeded."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:805
+#: ../../Zotlabs/Module/Admin.php:818
 #, php-format
 msgid "Update function %s could not be found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:821
+#: ../../Zotlabs/Module/Admin.php:834
 msgid "No failed updates."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:825
+#: ../../Zotlabs/Module/Admin.php:838
 msgid "Failed Updates"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:827
+#: ../../Zotlabs/Module/Admin.php:840
 msgid "Mark success (if update was manually applied)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:828
+#: ../../Zotlabs/Module/Admin.php:841
 msgid "Attempt to execute this update step automatically"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:859
+#: ../../Zotlabs/Module/Admin.php:872
 msgid "Queue Statistics"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:860
+#: ../../Zotlabs/Module/Admin.php:873
 msgid "Total Entries"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:861
+#: ../../Zotlabs/Module/Admin.php:874
 msgid "Priority"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:862
+#: ../../Zotlabs/Module/Admin.php:875
 msgid "Destination URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:863
+#: ../../Zotlabs/Module/Admin.php:876
 msgid "Mark hub permanently offline"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:864
+#: ../../Zotlabs/Module/Admin.php:877
 msgid "Empty queue for this hub"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:865
+#: ../../Zotlabs/Module/Admin.php:878
 msgid "Last known contact"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:901
+#: ../../Zotlabs/Module/Admin.php:914
 #, php-format
 msgid "%s account blocked/unblocked"
 msgid_plural "%s account blocked/unblocked"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../Zotlabs/Module/Admin.php:908
+#: ../../Zotlabs/Module/Admin.php:921
 #, php-format
 msgid "%s account deleted"
 msgid_plural "%s accounts deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../Zotlabs/Module/Admin.php:944
+#: ../../Zotlabs/Module/Admin.php:957
 msgid "Account not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:955
+#: ../../Zotlabs/Module/Admin.php:968
 #, php-format
 msgid "Account '%s' deleted"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:963
+#: ../../Zotlabs/Module/Admin.php:976
 #, php-format
 msgid "Account '%s' blocked"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:971
+#: ../../Zotlabs/Module/Admin.php:984
 #, php-format
 msgid "Account '%s' unblocked"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1031 ../../Zotlabs/Module/Admin.php:1044
+#: ../../Zotlabs/Module/Admin.php:1044 ../../Zotlabs/Module/Admin.php:1057
 #: ../../include/widgets.php:1491
 msgid "Accounts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1033 ../../Zotlabs/Module/Admin.php:1212
+#: ../../Zotlabs/Module/Admin.php:1046 ../../Zotlabs/Module/Admin.php:1225
 msgid "select all"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1034
+#: ../../Zotlabs/Module/Admin.php:1047
 msgid "Registrations waiting for confirm"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1035
+#: ../../Zotlabs/Module/Admin.php:1048
 msgid "Request date"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1035 ../../Zotlabs/Module/Admin.php:1047
+#: ../../Zotlabs/Module/Admin.php:1048 ../../Zotlabs/Module/Admin.php:1060
 #: ../../include/network.php:2208
 msgid "Email"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1036
+#: ../../Zotlabs/Module/Admin.php:1049
 msgid "No registrations."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1038
+#: ../../Zotlabs/Module/Admin.php:1051
 msgid "Deny"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1048 ../../include/group.php:267
+#: ../../Zotlabs/Module/Admin.php:1053 ../../Zotlabs/Module/Connedit.php:575
+msgid "Block"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1054 ../../Zotlabs/Module/Connedit.php:575
+msgid "Unblock"
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1061 ../../include/group.php:267
 msgid "All Channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1049
+#: ../../Zotlabs/Module/Admin.php:1062
 msgid "Register date"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1050
+#: ../../Zotlabs/Module/Admin.php:1063
 msgid "Last login"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1051
+#: ../../Zotlabs/Module/Admin.php:1064
 msgid "Expires"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1052
+#: ../../Zotlabs/Module/Admin.php:1065
 msgid "Service Class"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1054
+#: ../../Zotlabs/Module/Admin.php:1067
 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/Admin.php:1055
+#: ../../Zotlabs/Module/Admin.php:1068
 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/Admin.php:1091
+#: ../../Zotlabs/Module/Admin.php:1104
 #, php-format
 msgid "%s channel censored/uncensored"
 msgid_plural "%s channels censored/uncensored"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../Zotlabs/Module/Admin.php:1100
+#: ../../Zotlabs/Module/Admin.php:1113
 #, php-format
 msgid "%s channel code allowed/disallowed"
 msgid_plural "%s channels code allowed/disallowed"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../Zotlabs/Module/Admin.php:1106
+#: ../../Zotlabs/Module/Admin.php:1119
 #, php-format
 msgid "%s channel deleted"
 msgid_plural "%s channels deleted"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../Zotlabs/Module/Admin.php:1126
+#: ../../Zotlabs/Module/Admin.php:1139
 msgid "Channel not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1136
+#: ../../Zotlabs/Module/Admin.php:1149
 #, php-format
 msgid "Channel '%s' deleted"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1148
+#: ../../Zotlabs/Module/Admin.php:1161
 #, php-format
 msgid "Channel '%s' censored"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1148
+#: ../../Zotlabs/Module/Admin.php:1161
 #, php-format
 msgid "Channel '%s' uncensored"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1159
+#: ../../Zotlabs/Module/Admin.php:1172
 #, php-format
 msgid "Channel '%s' code allowed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1159
+#: ../../Zotlabs/Module/Admin.php:1172
 #, php-format
 msgid "Channel '%s' code disallowed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1210 ../../include/widgets.php:1492
+#: ../../Zotlabs/Module/Admin.php:1223 ../../include/widgets.php:1492
 msgid "Channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1214
+#: ../../Zotlabs/Module/Admin.php:1227
 msgid "Censor"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1215
+#: ../../Zotlabs/Module/Admin.php:1228
 msgid "Uncensor"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1216
+#: ../../Zotlabs/Module/Admin.php:1229
 msgid "Allow Code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1217
+#: ../../Zotlabs/Module/Admin.php:1230
 msgid "Disallow Code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1218 ../../include/conversation.php:1641
+#: ../../Zotlabs/Module/Admin.php:1231 ../../include/conversation.php:1644
 msgid "Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1222
+#: ../../Zotlabs/Module/Admin.php:1235
 msgid "UID"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1226
+#: ../../Zotlabs/Module/Admin.php:1239
 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
+#: ../../Zotlabs/Module/Admin.php:1240
 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
+#: ../../Zotlabs/Module/Admin.php:1297
 #, php-format
 msgid "Plugin %s disabled."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1288
+#: ../../Zotlabs/Module/Admin.php:1301
 #, php-format
 msgid "Plugin %s enabled."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1298 ../../Zotlabs/Module/Admin.php:1585
+#: ../../Zotlabs/Module/Admin.php:1311 ../../Zotlabs/Module/Admin.php:1599
 msgid "Disable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1301 ../../Zotlabs/Module/Admin.php:1587
+#: ../../Zotlabs/Module/Admin.php:1314 ../../Zotlabs/Module/Admin.php:1601
 msgid "Enable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1330 ../../Zotlabs/Module/Admin.php:1420
+#: ../../Zotlabs/Module/Admin.php:1343 ../../Zotlabs/Module/Admin.php:1434
 #: ../../include/widgets.php:1495
 msgid "Plugins"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1331 ../../Zotlabs/Module/Admin.php:1614
+#: ../../Zotlabs/Module/Admin.php:1344 ../../Zotlabs/Module/Admin.php:1628
 msgid "Toggle"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1332 ../../Zotlabs/Module/Admin.php:1615
+#: ../../Zotlabs/Module/Admin.php:1345 ../../Zotlabs/Module/Admin.php:1629
 #: ../../Zotlabs/Lib/Apps.php:216 ../../include/widgets.php:647
 #: ../../include/nav.php:212
 msgid "Settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1339 ../../Zotlabs/Module/Admin.php:1624
+#: ../../Zotlabs/Module/Admin.php:1352 ../../Zotlabs/Module/Admin.php:1638
 msgid "Author: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1340 ../../Zotlabs/Module/Admin.php:1625
+#: ../../Zotlabs/Module/Admin.php:1353 ../../Zotlabs/Module/Admin.php:1639
 msgid "Maintainer: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1341
+#: ../../Zotlabs/Module/Admin.php:1354
 msgid "Minimum project version: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1342
+#: ../../Zotlabs/Module/Admin.php:1355
 msgid "Maximum project version: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1343
+#: ../../Zotlabs/Module/Admin.php:1356
 msgid "Minimum PHP version: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1344
+#: ../../Zotlabs/Module/Admin.php:1357
+msgid "Compatible Server Roles: "
+msgstr ""
+
+#: ../../Zotlabs/Module/Admin.php:1358
 msgid "Requires: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1345 ../../Zotlabs/Module/Admin.php:1425
+#: ../../Zotlabs/Module/Admin.php:1359 ../../Zotlabs/Module/Admin.php:1439
 msgid "Disabled - version incompatibility"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1394
+#: ../../Zotlabs/Module/Admin.php:1408
 msgid "Enter the public git repository URL of the plugin repo."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1395
+#: ../../Zotlabs/Module/Admin.php:1409
 msgid "Plugin repo git URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1396
+#: ../../Zotlabs/Module/Admin.php:1410
 msgid "Custom repo name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1396
+#: ../../Zotlabs/Module/Admin.php:1410
 msgid "(optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1397
+#: ../../Zotlabs/Module/Admin.php:1411
 msgid "Download Plugin Repo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1404
+#: ../../Zotlabs/Module/Admin.php:1418
 msgid "Install new repo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1405 ../../Zotlabs/Lib/Apps.php:334
+#: ../../Zotlabs/Module/Admin.php:1419 ../../Zotlabs/Lib/Apps.php:334
 msgid "Install"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1427
+#: ../../Zotlabs/Module/Admin.php:1441
 msgid "Manage Repos"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1428
+#: ../../Zotlabs/Module/Admin.php:1442
 msgid "Installed Plugin Repositories"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1429
+#: ../../Zotlabs/Module/Admin.php:1443
 msgid "Install a New Plugin Repository"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1435 ../../Zotlabs/Module/Settings.php:72
-#: ../../Zotlabs/Module/Settings.php:708 ../../Zotlabs/Lib/Apps.php:334
-msgid "Update"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1436
+#: ../../Zotlabs/Module/Admin.php:1450
 msgid "Switch branch"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1437 ../../Zotlabs/Module/Photos.php:1000
-#: ../../Zotlabs/Module/Tagrm.php:137
-msgid "Remove"
-msgstr ""
-
-#: ../../Zotlabs/Module/Admin.php:1550
+#: ../../Zotlabs/Module/Admin.php:1564
 msgid "No themes found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1606
+#: ../../Zotlabs/Module/Admin.php:1620
 msgid "Screenshot"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1613 ../../Zotlabs/Module/Admin.php:1647
+#: ../../Zotlabs/Module/Admin.php:1627 ../../Zotlabs/Module/Admin.php:1661
 #: ../../include/widgets.php:1496
 msgid "Themes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1652
+#: ../../Zotlabs/Module/Admin.php:1666
 msgid "[Experimental]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1653
+#: ../../Zotlabs/Module/Admin.php:1667
 msgid "[Unsupported]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1677
+#: ../../Zotlabs/Module/Admin.php:1691
 msgid "Log settings updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1732 ../../include/widgets.php:1517
+#: ../../Zotlabs/Module/Admin.php:1746 ../../include/widgets.php:1517
 #: ../../include/widgets.php:1527
 msgid "Logs"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1734
+#: ../../Zotlabs/Module/Admin.php:1748
 msgid "Clear"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1740
+#: ../../Zotlabs/Module/Admin.php:1754
 msgid "Debugging"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1741
+#: ../../Zotlabs/Module/Admin.php:1755
 msgid "Log file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1741
+#: ../../Zotlabs/Module/Admin.php:1755
 msgid ""
 "Must be writable by web server. Relative to your top-level webserver "
 "directory."
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:1742
+#: ../../Zotlabs/Module/Admin.php:1756
 msgid "Log level"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2028
+#: ../../Zotlabs/Module/Admin.php:2042
 msgid "New Profile Field"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2029 ../../Zotlabs/Module/Admin.php:2049
+#: ../../Zotlabs/Module/Admin.php:2043 ../../Zotlabs/Module/Admin.php:2063
 msgid "Field nickname"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2029 ../../Zotlabs/Module/Admin.php:2049
+#: ../../Zotlabs/Module/Admin.php:2043 ../../Zotlabs/Module/Admin.php:2063
 msgid "System name of field"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2030 ../../Zotlabs/Module/Admin.php:2050
+#: ../../Zotlabs/Module/Admin.php:2044 ../../Zotlabs/Module/Admin.php:2064
 msgid "Input type"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2031 ../../Zotlabs/Module/Admin.php:2051
+#: ../../Zotlabs/Module/Admin.php:2045 ../../Zotlabs/Module/Admin.php:2065
 msgid "Field Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2031 ../../Zotlabs/Module/Admin.php:2051
+#: ../../Zotlabs/Module/Admin.php:2045 ../../Zotlabs/Module/Admin.php:2065
 msgid "Label on profile pages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2032 ../../Zotlabs/Module/Admin.php:2052
+#: ../../Zotlabs/Module/Admin.php:2046 ../../Zotlabs/Module/Admin.php:2066
 msgid "Help text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2032 ../../Zotlabs/Module/Admin.php:2052
+#: ../../Zotlabs/Module/Admin.php:2046 ../../Zotlabs/Module/Admin.php:2066
 msgid "Additional info (optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2042
+#: ../../Zotlabs/Module/Admin.php:2056
 msgid "Field definition not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2048
+#: ../../Zotlabs/Module/Admin.php:2062
 msgid "Edit Profile Field"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2106 ../../include/widgets.php:1498
+#: ../../Zotlabs/Module/Admin.php:2120 ../../include/widgets.php:1498
 msgid "Profile Fields"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2107
+#: ../../Zotlabs/Module/Admin.php:2121
 msgid "Basic Profile Fields"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2108
+#: ../../Zotlabs/Module/Admin.php:2122
 msgid "Advanced Profile Fields"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2108
+#: ../../Zotlabs/Module/Admin.php:2122
 msgid "(In addition to basic fields)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2110
+#: ../../Zotlabs/Module/Admin.php:2124
 msgid "All available fields"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2111
+#: ../../Zotlabs/Module/Admin.php:2125
 msgid "Custom Fields"
 msgstr ""
 
-#: ../../Zotlabs/Module/Admin.php:2115
+#: ../../Zotlabs/Module/Admin.php:2129
 msgid "Create Custom Field"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:128
-#: ../../Zotlabs/Module/Register.php:231
-msgid "Name or caption"
+#: ../../Zotlabs/Module/Lostpass.php:19
+msgid "No valid account found."
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:128
-#: ../../Zotlabs/Module/Register.php:231
-msgid ""
-"Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation "
-"Group\""
+#: ../../Zotlabs/Module/Lostpass.php:33
+msgid "Password reset request issued. Check your email."
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:130
-#: ../../Zotlabs/Module/Register.php:233
-msgid "Choose a short nickname"
+#: ../../Zotlabs/Module/Lostpass.php:39 ../../Zotlabs/Module/Lostpass.php:107
+#, php-format
+msgid "Site Member (%s)"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:130
-#: ../../Zotlabs/Module/Register.php:233
+#: ../../Zotlabs/Module/Lostpass.php:44
 #, php-format
+msgid "Password reset requested at %s"
+msgstr ""
+
+#: ../../Zotlabs/Module/Lostpass.php:67
 msgid ""
-"Your nickname will be used to create an easy to remember channel address e."
-"g. nickname%s"
+"Request could not be verified. (You may have previously submitted it.) "
+"Password reset failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:235
-msgid "Channel role and privacy"
+#: ../../Zotlabs/Module/Lostpass.php:90 ../../boot.php:1746
+msgid "Password Reset"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:235
-msgid "Select a channel role with your privacy requirements."
+#: ../../Zotlabs/Module/Lostpass.php:91
+msgid "Your password has been reset as requested."
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:132
-#: ../../Zotlabs/Module/Register.php:235
-msgid "Read more about roles"
+#: ../../Zotlabs/Module/Lostpass.php:92
+msgid "Your new password is"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:135
-msgid "Create Channel"
+#: ../../Zotlabs/Module/Lostpass.php:93
+msgid "Save or copy your new password - and then"
 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/Lostpass.php:94
+msgid "click here to login"
 msgstr ""
 
-#: ../../Zotlabs/Module/New_channel.php:137
+#: ../../Zotlabs/Module/Lostpass.php:95
 msgid ""
-"or <a href=\"import\">import an existing channel</a> from another location."
+"Your password may be changed from the <em>Settings</em> page after "
+"successful login."
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:265
-msgid "sent you a private message"
+#: ../../Zotlabs/Module/Lostpass.php:112
+#, php-format
+msgid "Your password has changed at %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:313
-msgid "added your channel"
+#: ../../Zotlabs/Module/Lostpass.php:127
+msgid "Forgot your Password?"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:323
-msgid "g A l F d"
+#: ../../Zotlabs/Module/Lostpass.php:128
+msgid ""
+"Enter your email address and submit to have your password reset. Then check "
+"your email for further instructions."
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:346
-msgid "[today]"
+#: ../../Zotlabs/Module/Lostpass.php:129
+msgid "Email Address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ping.php:355
-msgid "posted an event"
+#: ../../Zotlabs/Module/Lostpass.php:130
+msgid "Reset"
 msgstr ""
 
-#: ../../Zotlabs/Module/Notifications.php:30
-msgid "Invalid request identifier."
+#: ../../Zotlabs/Module/Mood.php:67 ../../include/conversation.php:260
+#, php-format
+msgctxt "mood"
+msgid "%1$s is %2$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Notifications.php:39
-msgid "Discard"
+#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:227
+msgid "Mood"
 msgstr ""
 
-#: ../../Zotlabs/Module/Notifications.php:103 ../../include/nav.php:195
-msgid "Mark all system notifications seen"
+#: ../../Zotlabs/Module/Mood.php:136
+msgid "Set your current mood and tell your friends"
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:228
-#: ../../include/conversation.php:964
-msgid "Poke"
+#: ../../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/Poke.php:169
-msgid "Poke somebody"
+#: ../../Zotlabs/Module/Profiles.php:44
+msgid "Profile deleted."
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:172
-msgid "Poke/Prod"
+#: ../../Zotlabs/Module/Profiles.php:68 ../../Zotlabs/Module/Profiles.php:104
+msgid "Profile-"
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:173
-msgid "Poke, prod or do other things to somebody"
+#: ../../Zotlabs/Module/Profiles.php:89 ../../Zotlabs/Module/Profiles.php:132
+msgid "New profile created."
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:180
-msgid "Recipient"
+#: ../../Zotlabs/Module/Profiles.php:110
+msgid "Profile unavailable to clone."
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:181
-msgid "Choose what you wish to do to recipient"
+#: ../../Zotlabs/Module/Profiles.php:151
+msgid "Profile unavailable to export."
 msgstr ""
 
-#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185
-msgid "Make this post private"
+#: ../../Zotlabs/Module/Profiles.php:256
+msgid "Profile Name is required."
 msgstr ""
 
-#: ../../Zotlabs/Module/Oexchange.php:27
-msgid "Unable to find your hub."
+#: ../../Zotlabs/Module/Profiles.php:427
+msgid "Marital Status"
 msgstr ""
 
-#: ../../Zotlabs/Module/Oexchange.php:41
-msgid "Post successful."
+#: ../../Zotlabs/Module/Profiles.php:431
+msgid "Romantic Partner"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
-msgid "Invalid profile identifier."
+#: ../../Zotlabs/Module/Profiles.php:435 ../../Zotlabs/Module/Profiles.php:736
+msgid "Likes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:115
-msgid "Profile Visibility Editor"
+#: ../../Zotlabs/Module/Profiles.php:439 ../../Zotlabs/Module/Profiles.php:737
+msgid "Dislikes"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1274
-msgid "Profile"
+#: ../../Zotlabs/Module/Profiles.php:443 ../../Zotlabs/Module/Profiles.php:744
+msgid "Work/Employment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:119
-msgid "Click on a contact to add or remove."
+#: ../../Zotlabs/Module/Profiles.php:446
+msgid "Religion"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profperm.php:128
-msgid "Visible To"
+#: ../../Zotlabs/Module/Profiles.php:450
+msgid "Political Views"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
-msgid "This setting requires special processing and editing has been blocked."
+#: ../../Zotlabs/Module/Profiles.php:454
+msgid "Gender"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pconfig.php:48
-msgid "Configuration Editor"
+#: ../../Zotlabs/Module/Profiles.php:458
+msgid "Sexual Preference"
 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/Profiles.php:462
+msgid "Homepage"
 msgstr ""
 
-#: ../../Zotlabs/Module/Api.php:60 ../../Zotlabs/Module/Api.php:81
-msgid "Authorize application connection"
+#: ../../Zotlabs/Module/Profiles.php:466
+msgid "Interests"
 msgstr ""
 
-#: ../../Zotlabs/Module/Api.php:61
-msgid "Return to your app and insert this Security Code:"
+#: ../../Zotlabs/Module/Profiles.php:560
+msgid "Profile updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Api.php:71
-msgid "Please login to continue."
+#: ../../Zotlabs/Module/Profiles.php:644
+msgid "Hide your connections list from viewers of this profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Api.php:83
-msgid ""
-"Do you want to authorize this application to access your posts and contacts, "
-"and/or create new posts for you?"
+#: ../../Zotlabs/Module/Profiles.php:686
+msgid "Edit Profile Details"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:19
-#, php-format
-msgid "Version %s"
+#: ../../Zotlabs/Module/Profiles.php:688
+msgid "View this profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:34
-msgid "Installed plugins/addons/apps:"
+#: ../../Zotlabs/Module/Profiles.php:689 ../../Zotlabs/Module/Profiles.php:771
+#: ../../include/channel.php:981
+msgid "Edit visibility"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:36
-msgid "No installed plugins/addons/apps"
+#: ../../Zotlabs/Module/Profiles.php:690
+msgid "Profile Tools"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:49
-msgid ""
-"This is a hub of $Projectname - a global cooperative network of "
-"decentralized privacy enhanced websites."
+#: ../../Zotlabs/Module/Profiles.php:691
+msgid "Change cover photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:51
-msgid "Tag: "
+#: ../../Zotlabs/Module/Profiles.php:692 ../../include/channel.php:952
+msgid "Change profile photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:53
-msgid "Last background fetch: "
+#: ../../Zotlabs/Module/Profiles.php:693
+msgid "Create a new profile using these settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:55
-msgid "Current load average: "
+#: ../../Zotlabs/Module/Profiles.php:694
+msgid "Clone this profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:58
-msgid "Running at web location"
+#: ../../Zotlabs/Module/Profiles.php:695
+msgid "Delete this 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/Profiles.php:696
+msgid "Add profile things"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:60
-msgid "Bug reports and issues: please visit"
+#: ../../Zotlabs/Module/Profiles.php:697 ../../include/widgets.php:105
+#: ../../include/conversation.php:1559
+msgid "Personal"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:62
-msgid "$projectname issues"
+#: ../../Zotlabs/Module/Profiles.php:699
+msgid "Relation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:63
-msgid ""
-"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"
+#: ../../Zotlabs/Module/Profiles.php:700 ../../include/datetime.php:48
+msgid "Miscellaneous"
 msgstr ""
 
-#: ../../Zotlabs/Module/Siteinfo.php:65
-msgid "Site Administrators"
+#: ../../Zotlabs/Module/Profiles.php:702
+msgid "Import profile from file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2262
-msgid "Blocks"
+#: ../../Zotlabs/Module/Profiles.php:703
+msgid "Export profile to file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:156
-msgid "Block Title"
+#: ../../Zotlabs/Module/Profiles.php:704
+msgid "Your gender"
 msgstr ""
 
-#: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Layouts.php:193
-#: ../../Zotlabs/Module/Photos.php:1078 ../../Zotlabs/Module/Webpages.php:218
-#: ../../include/conversation.php:1226
-msgid "Share"
+#: ../../Zotlabs/Module/Profiles.php:705
+msgid "Marital status"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:183 ../../include/text.php:2264
-msgid "Layouts"
+#: ../../Zotlabs/Module/Profiles.php:706
+msgid "Sexual preference"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:185
-msgid "Comanche page description language help"
+#: ../../Zotlabs/Module/Profiles.php:709
+msgid "Profile name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:189
-msgid "Layout Description"
+#: ../../Zotlabs/Module/Profiles.php:711
+msgid "This is your default profile."
 msgstr ""
 
-#: ../../Zotlabs/Module/Layouts.php:194
-msgid "Download PDL file"
+#: ../../Zotlabs/Module/Profiles.php:713
+msgid "Your full name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:22 ../../include/widgets.php:1351
-msgid "Public Hubs"
+#: ../../Zotlabs/Module/Profiles.php:714
+msgid "Title/Description"
 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/Profiles.php:717
+msgid "Street address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Hub URL"
+#: ../../Zotlabs/Module/Profiles.php:718
+msgid "Locality/City"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Access Type"
+#: ../../Zotlabs/Module/Profiles.php:719
+msgid "Region/State"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Registration Policy"
+#: ../../Zotlabs/Module/Profiles.php:720
+msgid "Postal/Zip code"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Stats"
+#: ../../Zotlabs/Module/Profiles.php:721
+msgid "Country"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:31
-msgid "Software"
+#: ../../Zotlabs/Module/Profiles.php:726
+msgid "Who (if applicable)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:31 ../../Zotlabs/Module/Ratings.php:103
-#: ../../include/conversation.php:963
-msgid "Ratings"
+#: ../../Zotlabs/Module/Profiles.php:726
+msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: ../../Zotlabs/Module/Pubsites.php:38
-msgid "Rate"
+#: ../../Zotlabs/Module/Profiles.php:727
+msgid "Since (date)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:115
-#: ../../Zotlabs/Module/Profile_photo.php:212
-#: ../../Zotlabs/Module/Profile_photo.php:311
-#: ../../Zotlabs/Module/Photos.php:97 ../../Zotlabs/Module/Photos.php:745
-#: ../../include/photo/photo_driver.php:718
-msgid "Profile Photos"
+#: ../../Zotlabs/Module/Profiles.php:730
+msgid "Tell us about yourself"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:186
-msgid ""
-"Shift-reload the page or clear browser cache if the new photo does not "
-"display immediately."
+#: ../../Zotlabs/Module/Profiles.php:731
+msgid "Homepage URL"
 msgstr ""
 
-#: ../../Zotlabs/Module/Profile_photo.php:389
-msgid "Upload Profile Photo"
+#: ../../Zotlabs/Module/Profiles.php:732
+msgid "Hometown"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:69
-msgid "Permissions denied."
+#: ../../Zotlabs/Module/Profiles.php:733
+msgid "Political views"
 msgstr ""
 
-#: ../../Zotlabs/Module/Cal.php:337 ../../include/text.php:2286
-msgid "Import"
+#: ../../Zotlabs/Module/Profiles.php:734
+msgid "Religious views"
 msgstr ""
 
-#: ../../Zotlabs/Module/Common.php:14
-msgid "No channel."
+#: ../../Zotlabs/Module/Profiles.php:735
+msgid "Keywords used in directory listings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Common.php:43
-msgid "Common connections"
+#: ../../Zotlabs/Module/Profiles.php:735
+msgid "Example: fishing photography software"
 msgstr ""
 
-#: ../../Zotlabs/Module/Common.php:48
-msgid "No connections in common."
+#: ../../Zotlabs/Module/Profiles.php:738
+msgid "Musical interests"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:35
-msgid "Authentication failed."
+#: ../../Zotlabs/Module/Profiles.php:739
+msgid "Books, literature"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:75
-msgid "Remote Authentication"
+#: ../../Zotlabs/Module/Profiles.php:740
+msgid "Television"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:76
-msgid "Enter your channel address (e.g. channel@example.com)"
+#: ../../Zotlabs/Module/Profiles.php:741
+msgid "Film/Dance/Culture/Entertainment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rmagic.php:77
-msgid "Authenticate"
+#: ../../Zotlabs/Module/Profiles.php:742
+msgid "Hobbies/Interests"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ratings.php:73
-msgid "No ratings"
+#: ../../Zotlabs/Module/Profiles.php:743
+msgid "Love/Romance"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ratings.php:104
-msgid "Rating: "
+#: ../../Zotlabs/Module/Profiles.php:745
+msgid "School/Education"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ratings.php:105
-msgid "Website: "
+#: ../../Zotlabs/Module/Profiles.php:746
+msgid "Contact information and social networks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Ratings.php:107
-msgid "Description: "
+#: ../../Zotlabs/Module/Profiles.php:747
+msgid "My other channels"
 msgstr ""
 
-#: ../../Zotlabs/Module/Apps.php:47 ../../include/widgets.php:102
-#: ../../include/nav.php:167
-msgid "Apps"
+#: ../../Zotlabs/Module/Profiles.php:767 ../../include/channel.php:977
+msgid "Profile Image"
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:94
-msgid "No such group"
+#: ../../Zotlabs/Module/Profiles.php:777 ../../include/channel.php:959
+#: ../../include/nav.php:90
+msgid "Edit Profiles"
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:134
-msgid "No such channel"
+#: ../../Zotlabs/Module/Notify.php:57
+#: ../../Zotlabs/Module/Notifications.php:98
+msgid "No more system notifications."
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:139
-msgid "forum"
+#: ../../Zotlabs/Module/Notify.php:61
+#: ../../Zotlabs/Module/Notifications.php:102
+msgid "System Notifications"
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:151
-msgid "Search Results For:"
+#: ../../Zotlabs/Module/Match.php:26
+msgid "Profile Match"
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:216
-msgid "Privacy group is empty"
+#: ../../Zotlabs/Module/Match.php:35
+msgid "No keywords to match. Please add keywords to your default profile."
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:225
-msgid "Privacy group: "
+#: ../../Zotlabs/Module/Match.php:67
+msgid "is interested in:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Network.php:251
-msgid "Invalid connection."
+#: ../../Zotlabs/Module/Match.php:74
+msgid "No matches"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
-msgid "Continue"
+#: ../../Zotlabs/Module/Webpages.php:53
+msgid "Import Webpage Elements"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:90
-msgid "Premium Channel Setup"
+#: ../../Zotlabs/Module/Webpages.php:54
+msgid "Import selected"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:92
-msgid "Enable premium channel connection restrictions"
+#: ../../Zotlabs/Module/Webpages.php:214 ../../Zotlabs/Lib/Apps.php:218
+#: ../../include/conversation.php:1718 ../../include/nav.php:108
+msgid "Webpages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:93
-msgid ""
-"Please enter your restrictions or conditions, such as paypal receipt, usage "
-"guidelines, etc."
+#: ../../Zotlabs/Module/Webpages.php:225 ../../include/page_widgets.php:44
+msgid "Actions"
 msgstr ""
 
-#: ../../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:"
+#: ../../Zotlabs/Module/Webpages.php:226 ../../include/page_widgets.php:45
+msgid "Page Link"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:96
-msgid ""
-"Potential connections will then see the following text before proceeding:"
+#: ../../Zotlabs/Module/Webpages.php:227
+msgid "Page Title"
 msgstr ""
 
-#: ../../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."
+#: ../../Zotlabs/Module/Webpages.php:258
+msgid "Invalid file type."
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:106
-msgid "(No specific instructions have been provided by the channel owner.)"
+#: ../../Zotlabs/Module/Webpages.php:270
+msgid "Error opening zip file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Connect.php:114
-msgid "Restricted or Premium Channel"
+#: ../../Zotlabs/Module/Webpages.php:281
+msgid "Invalid folder path."
 msgstr ""
 
-#: ../../Zotlabs/Module/Rbmark.php:94
-msgid "Select a bookmark folder"
+#: ../../Zotlabs/Module/Webpages.php:308
+msgid "No webpage elements detected."
 msgstr ""
 
-#: ../../Zotlabs/Module/Rbmark.php:99
-msgid "Save Bookmark"
+#: ../../Zotlabs/Module/Webpages.php:382
+msgid "Import complete."
 msgstr ""
 
-#: ../../Zotlabs/Module/Rbmark.php:100
-msgid "URL of bookmark"
+#: ../../Zotlabs/Module/Events.php:25
+msgid "Calendar entries imported."
 msgstr ""
 
-#: ../../Zotlabs/Module/Rbmark.php:105
-msgid "Or enter new bookmark folder name"
+#: ../../Zotlabs/Module/Events.php:27
+msgid "No calendar entries found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:82
-msgid "Page owner information could not be retrieved."
+#: ../../Zotlabs/Module/Events.php:104
+msgid "Event can not end before it has started."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:103 ../../Zotlabs/Module/Photos.php:147
-msgid "Album not found."
+#: ../../Zotlabs/Module/Events.php:106 ../../Zotlabs/Module/Events.php:115
+#: ../../Zotlabs/Module/Events.php:135
+msgid "Unable to generate preview."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:130
-msgid "Delete Album"
+#: ../../Zotlabs/Module/Events.php:113
+msgid "Event title and start time are required."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:151
-msgid ""
-"Multiple storage folders exist with this album name, but within different "
-"directories. Please remove the desired folder or folders using the Files "
-"manager"
+#: ../../Zotlabs/Module/Events.php:133 ../../Zotlabs/Module/Events.php:258
+msgid "Event not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:208 ../../Zotlabs/Module/Photos.php:1059
-msgid "Delete Photo"
+#: ../../Zotlabs/Module/Events.php:452
+msgid "Edit event title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:531
-msgid "No photos selected"
+#: ../../Zotlabs/Module/Events.php:452
+msgid "Event title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:580
-msgid "Access to this item is restricted."
+#: ../../Zotlabs/Module/Events.php:454
+msgid "Categories (comma-separated list)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:619
-#, php-format
-msgid "%1$.2f MB of %2$.2f MB photo storage used."
+#: ../../Zotlabs/Module/Events.php:455
+msgid "Edit Category"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:622
-#, php-format
-msgid "%1$.2f MB photo storage used."
+#: ../../Zotlabs/Module/Events.php:455
+msgid "Category"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:658
-msgid "Upload Photos"
+#: ../../Zotlabs/Module/Events.php:458
+msgid "Edit start date and time"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:662
-msgid "Enter an album name"
+#: ../../Zotlabs/Module/Events.php:458
+msgid "Start date and time"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:663
-msgid "or select an existing album (doubleclick)"
+#: ../../Zotlabs/Module/Events.php:459 ../../Zotlabs/Module/Events.php:462
+msgid "Finish date and time are not known or not relevant"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:664
-msgid "Create a status post for this upload"
+#: ../../Zotlabs/Module/Events.php:461
+msgid "Edit finish date and time"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:665
-msgid "Caption (optional):"
+#: ../../Zotlabs/Module/Events.php:461
+msgid "Finish date and time"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:666
-msgid "Description (optional):"
+#: ../../Zotlabs/Module/Events.php:463 ../../Zotlabs/Module/Events.php:464
+msgid "Adjust for viewer timezone"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:697
-msgid "Album name could not be decoded"
+#: ../../Zotlabs/Module/Events.php:463
+msgid ""
+"Important for events that happen in a particular place. Not practical for "
+"global holidays."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:745
-msgid "Contact Photos"
+#: ../../Zotlabs/Module/Events.php:465
+msgid "Edit Description"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:768
-msgid "Show Newest First"
+#: ../../Zotlabs/Module/Events.php:467
+msgid "Edit Location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:770
-msgid "Show Oldest First"
+#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:472
+msgid "Share this event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:794 ../../Zotlabs/Module/Photos.php:1337
-#: ../../Zotlabs/Module/Embedphotos.php:141 ../../include/widgets.php:1607
-msgid "View Photo"
+#: ../../Zotlabs/Module/Events.php:474 ../../include/conversation.php:1259
+msgid "Permission settings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:825
-#: ../../Zotlabs/Module/Embedphotos.php:157 ../../include/widgets.php:1624
-msgid "Edit Album"
+#: ../../Zotlabs/Module/Events.php:485
+msgid "Advanced Options"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:872
-msgid "Permission denied. Access to this item may be restricted."
+#: ../../Zotlabs/Module/Events.php:597 ../../Zotlabs/Module/Cal.php:259
+msgid "l, F j"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:874
-msgid "Photo not available"
+#: ../../Zotlabs/Module/Events.php:619
+msgid "Edit event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:932
-msgid "Use as profile photo"
+#: ../../Zotlabs/Module/Events.php:621
+msgid "Delete event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:933
-msgid "Use as cover photo"
+#: ../../Zotlabs/Module/Events.php:646 ../../Zotlabs/Module/Cal.php:308
+#: ../../include/text.php:1716
+msgid "Link to Source"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:940
-msgid "Private Photo"
+#: ../../Zotlabs/Module/Events.php:655
+msgid "calendar"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:955
-msgid "View Full Size"
+#: ../../Zotlabs/Module/Events.php:674 ../../Zotlabs/Module/Cal.php:331
+msgid "Edit Event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1034
-msgid "Edit photo"
+#: ../../Zotlabs/Module/Events.php:674 ../../Zotlabs/Module/Cal.php:331
+msgid "Create Event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1036
-msgid "Rotate CW (right)"
+#: ../../Zotlabs/Module/Events.php:677 ../../Zotlabs/Module/Cal.php:334
+msgid "Export"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1037
-msgid "Rotate CCW (left)"
+#: ../../Zotlabs/Module/Events.php:681
+msgid "Month"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1040
-msgid "Enter a new album name"
+#: ../../Zotlabs/Module/Events.php:682
+msgid "Week"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1041
-msgid "or select an existing one (doubleclick)"
+#: ../../Zotlabs/Module/Events.php:683
+msgid "Day"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1044
-msgid "Caption"
+#: ../../Zotlabs/Module/Events.php:686 ../../Zotlabs/Module/Cal.php:341
+msgid "Today"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1046
-msgid "Add a Tag"
+#: ../../Zotlabs/Module/Events.php:717
+msgid "Event removed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1054
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
+#: ../../Zotlabs/Module/Events.php:720
+msgid "Failed to remove event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1057
-msgid "Flag as adult in album view"
+#: ../../Zotlabs/Module/Import.php:33
+#, php-format
+msgid "Your service plan only allows %d channels."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1076 ../../Zotlabs/Lib/ThreadItem.php:262
-msgid "I like this (toggle)"
+#: ../../Zotlabs/Module/Import.php:153 ../../include/import.php:107
+msgid "Cloned channel not found. Import failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1077 ../../Zotlabs/Lib/ThreadItem.php:263
-msgid "I don't like this (toggle)"
+#: ../../Zotlabs/Module/Import.php:163
+msgid "No channel. Import failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1079 ../../Zotlabs/Lib/ThreadItem.php:398
-#: ../../include/conversation.php:743
-msgid "Please wait"
+#: ../../Zotlabs/Module/Import.php:520
+#: ../../include/Import/import_diaspora.php:142
+msgid "Import completed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1095 ../../Zotlabs/Module/Photos.php:1213
-#: ../../Zotlabs/Lib/ThreadItem.php:708
-msgid "This is you"
+#: ../../Zotlabs/Module/Import.php:542
+msgid "You must be logged in to use this feature."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1097 ../../Zotlabs/Module/Photos.php:1215
-#: ../../Zotlabs/Lib/ThreadItem.php:710 ../../include/js_strings.php:6
-msgid "Comment"
+#: ../../Zotlabs/Module/Import.php:547
+msgid "Import Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:577
-msgctxt "title"
-msgid "Likes"
+#: ../../Zotlabs/Module/Import.php:548
+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/Photos.php:1113 ../../include/conversation.php:577
-msgctxt "title"
-msgid "Dislikes"
+#: ../../Zotlabs/Module/Import.php:550
+msgid "Or provide the old server/hub details"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:578
-msgctxt "title"
-msgid "Agree"
+#: ../../Zotlabs/Module/Import.php:551
+msgid "Your old identity address (xyz@example.com)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:578
-msgctxt "title"
-msgid "Disagree"
+#: ../../Zotlabs/Module/Import.php:552
+msgid "Your old login email address"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:578
-msgctxt "title"
-msgid "Abstain"
+#: ../../Zotlabs/Module/Import.php:553
+msgid "Your old login password"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1115 ../../include/conversation.php:579
-msgctxt "title"
-msgid "Attending"
+#: ../../Zotlabs/Module/Import.php:554
+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/Photos.php:1115 ../../include/conversation.php:579
-msgctxt "title"
-msgid "Not attending"
+#: ../../Zotlabs/Module/Import.php:555
+msgid "Make this hub my primary location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1115 ../../include/conversation.php:579
-msgctxt "title"
-msgid "Might attend"
+#: ../../Zotlabs/Module/Import.php:556
+msgid ""
+"Import existing posts if possible (experimental - limited by available memory"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1132 ../../Zotlabs/Module/Photos.php:1144
-#: ../../Zotlabs/Lib/ThreadItem.php:181 ../../Zotlabs/Lib/ThreadItem.php:193
-#: ../../include/conversation.php:1753
-msgid "View all"
+#: ../../Zotlabs/Module/Import.php:557
+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/Photos.php:1136 ../../Zotlabs/Lib/ThreadItem.php:185
-#: ../../include/conversation.php:1777 ../../include/taxonomy.php:403
-#: ../../include/channel.php:1182
-msgctxt "noun"
-msgid "Like"
-msgid_plural "Likes"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../Zotlabs/Module/New_channel.php:135
+msgid "Create Channel"
+msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1141 ../../Zotlabs/Lib/ThreadItem.php:190
-#: ../../include/conversation.php:1780
-msgctxt "noun"
-msgid "Dislike"
-msgid_plural "Dislikes"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../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/Photos.php:1241
-msgid "Photo Tools"
+#: ../../Zotlabs/Module/New_channel.php:137
+msgid ""
+"or <a href=\"import\">import an existing channel</a> from another location."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1250
-msgid "In This Photo:"
+#: ../../Zotlabs/Module/Ping.php:265
+msgid "sent you a private message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1255
-msgid "Map"
+#: ../../Zotlabs/Module/Ping.php:313
+msgid "added your channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1263 ../../Zotlabs/Lib/ThreadItem.php:387
-msgctxt "noun"
-msgid "Likes"
+#: ../../Zotlabs/Module/Ping.php:323
+msgid "g A l F d"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1264 ../../Zotlabs/Lib/ThreadItem.php:388
-msgctxt "noun"
-msgid "Dislikes"
+#: ../../Zotlabs/Module/Ping.php:346
+msgid "[today]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1269 ../../Zotlabs/Lib/ThreadItem.php:393
-#: ../../include/acl_selectors.php:188
-msgid "Close"
+#: ../../Zotlabs/Module/Ping.php:355
+msgid "posted an event"
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1343
-msgid "View Album"
+#: ../../Zotlabs/Module/Notifications.php:30
+msgid "Invalid request identifier."
 msgstr ""
 
-#: ../../Zotlabs/Module/Photos.php:1354 ../../Zotlabs/Module/Photos.php:1367
-#: ../../Zotlabs/Module/Photos.php:1368
-msgid "Recent Photos"
+#: ../../Zotlabs/Module/Notifications.php:39
+msgid "Discard"
 msgstr ""
 
-#: ../../Zotlabs/Module/Regmod.php:15
-msgid "Please login."
+#: ../../Zotlabs/Module/Notifications.php:103 ../../include/nav.php:195
+msgid "Mark all system notifications seen"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:35
-msgid ""
-"Account removals are not allowed within 48 hours of changing the account "
-"password."
+#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:228
+#: ../../include/conversation.php:961
+msgid "Poke"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:57
-msgid "Remove This Account"
+#: ../../Zotlabs/Module/Poke.php:169
+msgid "Poke somebody"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:58
-#: ../../Zotlabs/Module/Removeme.php:61
-msgid "WARNING: "
+#: ../../Zotlabs/Module/Poke.php:172
+msgid "Poke/Prod"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:58
-msgid ""
-"This account and all its channels will be completely removed from the "
-"network. "
+#: ../../Zotlabs/Module/Poke.php:173
+msgid "Poke, prod or do other things to somebody"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:58
-#: ../../Zotlabs/Module/Removeme.php:61
-msgid "This action is permanent and can not be undone!"
+#: ../../Zotlabs/Module/Poke.php:180
+msgid "Recipient"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:59
-#: ../../Zotlabs/Module/Removeme.php:62
-msgid "Please enter your password for verification:"
+#: ../../Zotlabs/Module/Poke.php:181
+msgid "Choose what you wish to do to recipient"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:60
-msgid ""
-"Remove this account, all its channels and all its channel clones from the "
-"network"
+#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185
+msgid "Make this post private"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:60
-msgid ""
-"By default only the instances of the channels located on this hub will be "
-"removed from the network"
+#: ../../Zotlabs/Module/Oexchange.php:27
+msgid "Unable to find your hub."
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeaccount.php:61
-#: ../../Zotlabs/Module/Settings.php:797
-msgid "Remove Account"
+#: ../../Zotlabs/Module/Oexchange.php:41
+msgid "Post successful."
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeme.php:35
-msgid ""
-"Channel removals are not allowed within 48 hours of changing the account "
-"password."
+#: ../../Zotlabs/Module/Profperm.php:34 ../../Zotlabs/Module/Profperm.php:63
+msgid "Invalid profile identifier."
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeme.php:60
-msgid "Remove This Channel"
+#: ../../Zotlabs/Module/Profperm.php:115
+msgid "Profile Visibility Editor"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeme.php:61
-msgid "This channel will be completely removed from the network. "
+#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1274
+msgid "Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeme.php:63
-msgid "Remove this channel and all its clones from the network"
+#: ../../Zotlabs/Module/Profperm.php:119
+msgid "Click on a contact to add or remove."
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeme.php:63
-msgid ""
-"By default only the instance of the channel located on this hub will be "
-"removed from the network"
+#: ../../Zotlabs/Module/Profperm.php:128
+msgid "Visible To"
 msgstr ""
 
-#: ../../Zotlabs/Module/Removeme.php:64 ../../Zotlabs/Module/Settings.php:1323
-msgid "Remove Channel"
+#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59
+msgid "This setting requires special processing and editing has been blocked."
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:55 ../../Zotlabs/Module/Uexport.php:56
-msgid "Export Channel"
+#: ../../Zotlabs/Module/Pconfig.php:48
+msgid "Configuration Editor"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:57
+#: ../../Zotlabs/Module/Pconfig.php:49
 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."
+"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/Uexport.php:58
-msgid "Export Content"
+#: ../../Zotlabs/Module/Channel.php:28 ../../Zotlabs/Module/Wiki.php:20
+#: ../../Zotlabs/Module/Chat.php:25
+msgid "You must be logged in to see this page."
 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/Channel.php:40
+msgid "Posts and comments"
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:60
-msgid "Export your posts from a given year."
+#: ../../Zotlabs/Module/Channel.php:41
+msgid "Only posts"
 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/Channel.php:101
+msgid "Insufficient permissions.  Request redirected to profile page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Uexport.php:63
+#: ../../Zotlabs/Module/Siteinfo.php:19
 #, php-format
-msgid ""
-"To select all posts for a given year, such as this year, visit <a href=\"%1$s"
-"\">%2$s</a>"
+msgid "Version %s"
 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/Siteinfo.php:34
+msgid "Installed plugins/addons/apps:"
 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/Siteinfo.php:36
+msgid "No installed plugins/addons/apps"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:53
-msgid "Import Webpage Elements"
+#: ../../Zotlabs/Module/Siteinfo.php:49
+msgid ""
+"This is a hub of $Projectname - a global cooperative network of "
+"decentralized privacy enhanced websites."
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:54
-msgid "Import selected"
+#: ../../Zotlabs/Module/Siteinfo.php:51
+msgid "Tag: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:214 ../../Zotlabs/Lib/Apps.php:218
-#: ../../include/conversation.php:1715 ../../include/nav.php:108
-msgid "Webpages"
+#: ../../Zotlabs/Module/Siteinfo.php:53
+msgid "Last background fetch: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:225 ../../include/page_widgets.php:44
-msgid "Actions"
+#: ../../Zotlabs/Module/Siteinfo.php:55
+msgid "Current load average: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:226 ../../include/page_widgets.php:45
-msgid "Page Link"
+#: ../../Zotlabs/Module/Siteinfo.php:58
+msgid "Running at web location"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:227
-msgid "Page Title"
+#: ../../Zotlabs/Module/Siteinfo.php:59
+msgid ""
+"Please visit <a href=\"http://hubzilla.org\">hubzilla.org</a> to learn more "
+"about $Projectname."
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:258
-msgid "Invalid file type."
+#: ../../Zotlabs/Module/Siteinfo.php:60
+msgid "Bug reports and issues: please visit"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:270
-msgid "Error opening zip file"
+#: ../../Zotlabs/Module/Siteinfo.php:62
+msgid "$projectname issues"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:281
-msgid "Invalid folder path."
+#: ../../Zotlabs/Module/Siteinfo.php:63
+msgid ""
+"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:308
-msgid "No webpage elements detected."
+#: ../../Zotlabs/Module/Siteinfo.php:65
+msgid "Site Administrators"
 msgstr ""
 
-#: ../../Zotlabs/Module/Webpages.php:382
-msgid "Import complete."
+#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2262
+msgid "Blocks"
 msgstr ""
 
-#: ../../Zotlabs/Module/Search.php:216
-#, php-format
-msgid "Items tagged with: %s"
+#: ../../Zotlabs/Module/Blocks.php:156
+msgid "Block Title"
 msgstr ""
 
-#: ../../Zotlabs/Module/Search.php:218
-#, php-format
-msgid "Search results for: %s"
+#: ../../Zotlabs/Module/Layouts.php:183 ../../include/text.php:2264
+msgid "Layouts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Service_limits.php:23
-msgid "No service class restrictions found."
+#: ../../Zotlabs/Module/Layouts.php:185
+msgid "Comanche page description language help"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:49
-msgid "Maximum daily site registrations exceeded. Please try again tomorrow."
+#: ../../Zotlabs/Module/Layouts.php:189
+msgid "Layout Description"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:55
-msgid ""
-"Please indicate acceptance of the Terms of Service. Registration failed."
+#: ../../Zotlabs/Module/Layouts.php:194
+msgid "Download PDL file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:89
-msgid "Passwords do not match."
+#: ../../Zotlabs/Module/Ratings.php:70
+msgid "No ratings"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:131
-msgid ""
-"Registration successful. Please check your email for validation instructions."
+#: ../../Zotlabs/Module/Ratings.php:98
+msgid "Rating: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:137
-msgid "Your registration is pending approval by the site owner."
+#: ../../Zotlabs/Module/Ratings.php:99
+msgid "Website: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:140
-msgid "Your registration can not be processed."
+#: ../../Zotlabs/Module/Ratings.php:101
+msgid "Description: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:184
-msgid "Registration on this hub is disabled."
+#: ../../Zotlabs/Module/Profile_photo.php:186
+msgid ""
+"Shift-reload the page or clear browser cache if the new photo does not "
+"display immediately."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:193
-msgid "Registration on this hub is by approval only."
+#: ../../Zotlabs/Module/Profile_photo.php:389
+msgid "Upload Profile Photo"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:194
-msgid "<a href=\"pubsites\">Register at another affiliated hub.</a>"
+#: ../../Zotlabs/Module/Cal.php:69
+msgid "Permissions denied."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:204
-msgid ""
-"This site has exceeded the number of allowed daily account registrations. "
-"Please try again tomorrow."
+#: ../../Zotlabs/Module/Cal.php:337 ../../include/text.php:2286
+msgid "Import"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:215
-msgid "Terms of Service"
+#: ../../Zotlabs/Module/Common.php:14
+msgid "No channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:221
-#, php-format
-msgid "I accept the %s for this website"
+#: ../../Zotlabs/Module/Common.php:43
+msgid "Common connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:223
-#, php-format
-msgid "I am over 13 years of age and accept the %s for this website"
+#: ../../Zotlabs/Module/Common.php:48
+msgid "No connections in common."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:227
-msgid "Your email address"
+#: ../../Zotlabs/Module/Mail.php:38
+msgid "Unable to lookup recipient."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:228
-msgid "Choose a password"
+#: ../../Zotlabs/Module/Mail.php:45
+msgid "Unable to communicate with requested channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:229
-msgid "Please re-enter your password"
+#: ../../Zotlabs/Module/Mail.php:52
+msgid "Cannot verify requested channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:230
-msgid "Please enter your invitation code"
+#: ../../Zotlabs/Module/Mail.php:70
+msgid "Selected channel has private message restrictions. Send failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:236
-msgid "no"
+#: ../../Zotlabs/Module/Mail.php:135
+msgid "Messages"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:236
-msgid "yes"
+#: ../../Zotlabs/Module/Mail.php:170
+msgid "Message recalled."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:253
-msgid "Membership on this site is by invitation only."
+#: ../../Zotlabs/Module/Mail.php:183
+msgid "Conversation removed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:265 ../../include/nav.php:151
-#: ../../boot.php:1695
-msgid "Register"
+#: ../../Zotlabs/Module/Mail.php:197 ../../Zotlabs/Module/Mail.php:306
+#: ../../Zotlabs/Module/Chat.php:205 ../../include/conversation.php:1183
+msgid "Please enter a link URL:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Register.php:266
-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."
+#: ../../Zotlabs/Module/Mail.php:198 ../../Zotlabs/Module/Mail.php:307
+msgid "Expires YYYY-MM-DD HH:MM"
 msgstr ""
 
-#: ../../Zotlabs/Module/Rpost.php:135 ../../Zotlabs/Module/Editpost.php:106
-msgid "Edit post"
+#: ../../Zotlabs/Module/Mail.php:226
+msgid "Requested channel is not in this network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sharedwithme.php:98
-msgid "Files: shared with me"
+#: ../../Zotlabs/Module/Mail.php:234
+msgid "Send Private Message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sharedwithme.php:100
-msgid "NEW"
+#: ../../Zotlabs/Module/Mail.php:235 ../../Zotlabs/Module/Mail.php:360
+msgid "To:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sharedwithme.php:103
-msgid "Remove all files"
+#: ../../Zotlabs/Module/Mail.php:238 ../../Zotlabs/Module/Mail.php:362
+msgid "Subject:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sharedwithme.php:104
-msgid "Remove this file"
+#: ../../Zotlabs/Module/Mail.php:243 ../../Zotlabs/Module/Mail.php:368
+#: ../../include/conversation.php:1239
+msgid "Attach file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Acl.php:312
-msgid "network"
+#: ../../Zotlabs/Module/Mail.php:245
+msgid "Send"
 msgstr ""
 
-#: ../../Zotlabs/Module/Acl.php:322
-msgid "RSS"
+#: ../../Zotlabs/Module/Mail.php:248 ../../Zotlabs/Module/Mail.php:373
+#: ../../include/conversation.php:1284
+msgid "Set expiration date"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:37
-msgid "Failed to create source. No channel selected."
+#: ../../Zotlabs/Module/Mail.php:250 ../../Zotlabs/Module/Mail.php:375
+#: ../../Zotlabs/Module/Chat.php:206 ../../Zotlabs/Lib/ThreadItem.php:723
+#: ../../include/conversation.php:1289
+msgid "Encrypt text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:51
-msgid "Source created."
+#: ../../Zotlabs/Module/Mail.php:332
+msgid "Delete message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:64
-msgid "Source updated."
+#: ../../Zotlabs/Module/Mail.php:333
+msgid "Delivery report"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:90
-msgid "*"
+#: ../../Zotlabs/Module/Mail.php:334
+msgid "Recall message"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:96 ../../include/features.php:74
-#: ../../include/widgets.php:639
-msgid "Channel Sources"
+#: ../../Zotlabs/Module/Mail.php:336
+msgid "Message has been recalled."
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:97
-msgid "Manage remote sources of content for your channel."
+#: ../../Zotlabs/Module/Mail.php:353
+msgid "Delete Conversation"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:98 ../../Zotlabs/Module/Sources.php:108
-msgid "New Source"
+#: ../../Zotlabs/Module/Mail.php:355
+msgid ""
+"No secure communications available. You <strong>may</strong> be able to "
+"respond from the sender's profile page."
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:109 ../../Zotlabs/Module/Sources.php:143
-msgid ""
-"Import all or selected content from the following channel into this channel "
-"and distribute it according to your channel settings."
+#: ../../Zotlabs/Module/Mail.php:359
+msgid "Send Reply"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
-msgid "Only import content with these words (one per line)"
+#: ../../Zotlabs/Module/Mail.php:364
+#, php-format
+msgid "Your message for %s (%s):"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
-msgid "Leave blank to import all public content"
+#: ../../Zotlabs/Module/Connedit.php:80
+msgid "Could not access contact record."
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:111 ../../Zotlabs/Module/Sources.php:148
-msgid "Channel Name"
+#: ../../Zotlabs/Module/Connedit.php:104
+msgid "Could not locate selected profile."
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147
-msgid ""
-"Add the following categories to posts imported from this source (comma "
-"separated)"
+#: ../../Zotlabs/Module/Connedit.php:256
+msgid "Connection updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147
-#: ../../Zotlabs/Module/Settings.php:688
-msgid "Optional"
+#: ../../Zotlabs/Module/Connedit.php:258
+msgid "Failed to update connection record."
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:133 ../../Zotlabs/Module/Sources.php:161
-msgid "Source not found."
+#: ../../Zotlabs/Module/Connedit.php:308
+msgid "is now connected to"
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:140
-msgid "Edit Source"
+#: ../../Zotlabs/Module/Connedit.php:440
+msgid "Could not access address book record."
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:141
-msgid "Delete Source"
+#: ../../Zotlabs/Module/Connedit.php:460
+msgid "Refresh failed - channel is currently unavailable."
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:169
-msgid "Source removed"
+#: ../../Zotlabs/Module/Connedit.php:475 ../../Zotlabs/Module/Connedit.php:484
+#: ../../Zotlabs/Module/Connedit.php:493 ../../Zotlabs/Module/Connedit.php:502
+#: ../../Zotlabs/Module/Connedit.php:515
+msgid "Unable to set address book parameters."
 msgstr ""
 
-#: ../../Zotlabs/Module/Sources.php:171
-msgid "Unable to remove source."
+#: ../../Zotlabs/Module/Connedit.php:538
+msgid "Connection has been removed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Subthread.php:118
-#, php-format
-msgid "%1$s is following %2$s's %3$s"
+#: ../../Zotlabs/Module/Connedit.php:554 ../../Zotlabs/Lib/Apps.php:221
+#: ../../include/conversation.php:955 ../../include/nav.php:88
+msgid "View Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Subthread.php:120
+#: ../../Zotlabs/Module/Connedit.php:557
 #, php-format
-msgid "%1$s stopped following %2$s's %3$s"
+msgid "View %s's profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Suggest.php:39
-msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
+#: ../../Zotlabs/Module/Connedit.php:561
+msgid "Refresh Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Suggest.php:58 ../../include/widgets.php:149
-msgid "Ignore/Hide"
+#: ../../Zotlabs/Module/Connedit.php:564
+msgid "Fetch updated permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:263
-msgid "post"
+#: ../../Zotlabs/Module/Connedit.php:568
+msgid "Recent Activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:150
-#: ../../include/text.php:1953
-msgid "comment"
+#: ../../Zotlabs/Module/Connedit.php:571
+msgid "View recent posts and comments"
 msgstr ""
 
-#: ../../Zotlabs/Module/Tagger.php:100
-#, php-format
-msgid "%1$s tagged %2$s's %3$s with %4$s"
+#: ../../Zotlabs/Module/Connedit.php:578
+msgid "Block (or Unblock) all communications with this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98
-msgid "Tag removed"
+#: ../../Zotlabs/Module/Connedit.php:579
+msgid "This connection is blocked!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Tagrm.php:123
-msgid "Remove Item Tag"
+#: ../../Zotlabs/Module/Connedit.php:583
+msgid "Unignore"
 msgstr ""
 
-#: ../../Zotlabs/Module/Tagrm.php:125
-msgid "Select a tag to remove: "
+#: ../../Zotlabs/Module/Connedit.php:586
+msgid "Ignore (or Unignore) all inbound communications from this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:44
-msgid "Invalid message"
+#: ../../Zotlabs/Module/Connedit.php:587
+msgid "This connection is ignored!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:76
-msgid "no results"
+#: ../../Zotlabs/Module/Connedit.php:591
+msgid "Unarchive"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:91
-msgid "channel sync processed"
+#: ../../Zotlabs/Module/Connedit.php:591
+msgid "Archive"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:95
-msgid "queued"
+#: ../../Zotlabs/Module/Connedit.php:594
+msgid ""
+"Archive (or Unarchive) this connection - mark channel dead but keep content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:99
-msgid "posted"
+#: ../../Zotlabs/Module/Connedit.php:595
+msgid "This connection is archived!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:103
-msgid "accepted for delivery"
+#: ../../Zotlabs/Module/Connedit.php:599
+msgid "Unhide"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:107
-msgid "updated"
+#: ../../Zotlabs/Module/Connedit.php:599
+msgid "Hide"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:110
-msgid "update ignored"
+#: ../../Zotlabs/Module/Connedit.php:602
+msgid "Hide or Unhide this connection from your other connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:113
-msgid "permission denied"
+#: ../../Zotlabs/Module/Connedit.php:603
+msgid "This connection is hidden!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:117
-msgid "recipient not found"
+#: ../../Zotlabs/Module/Connedit.php:610
+msgid "Delete this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:120
-msgid "mail recalled"
+#: ../../Zotlabs/Module/Connedit.php:625 ../../include/widgets.php:493
+msgid "Me"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:123
-msgid "duplicate mail received"
+#: ../../Zotlabs/Module/Connedit.php:626 ../../include/widgets.php:494
+msgid "Family"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:126
-msgid "mail delivered"
+#: ../../Zotlabs/Module/Connedit.php:628 ../../include/widgets.php:496
+msgid "Acquaintances"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:146
-#, php-format
-msgid "Delivery report for %1$s"
+#: ../../Zotlabs/Module/Connedit.php:686
+msgid "Approve this connection"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:149
-msgid "Options"
+#: ../../Zotlabs/Module/Connedit.php:686
+msgid "Accept connection to allow communication"
 msgstr ""
 
-#: ../../Zotlabs/Module/Dreport.php:150
-msgid "Redeliver"
+#: ../../Zotlabs/Module/Connedit.php:691
+msgid "Set Affinity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:64
-msgid "Name is required"
+#: ../../Zotlabs/Module/Connedit.php:694
+msgid "Set Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:68
-msgid "Key and Secret are required"
+#: ../../Zotlabs/Module/Connedit.php:697
+msgid "Set Affinity & Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:138
-#, php-format
-msgid "This channel is limited to %d tokens"
+#: ../../Zotlabs/Module/Connedit.php:746
+msgid "none"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:144
-msgid "Name and Password are required."
+#: ../../Zotlabs/Module/Connedit.php:750 ../../include/widgets.php:623
+msgid "Connection Default Permissions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:184
-msgid "Token saved."
+#: ../../Zotlabs/Module/Connedit.php:750 ../../include/items.php:3964
+#, php-format
+msgid "Connection: %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:312
-msgid "Not valid email."
+#: ../../Zotlabs/Module/Connedit.php:751
+msgid "Apply these permissions automatically"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:315
-msgid "Protected email address. Cannot change to that email."
+#: ../../Zotlabs/Module/Connedit.php:751
+msgid "Connection requests will be approved without your interaction"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:324
-msgid "System failure storing new email. Please try again."
+#: ../../Zotlabs/Module/Connedit.php:753
+msgid "This connection's primary address is"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:341
-msgid "Password verification failed."
+#: ../../Zotlabs/Module/Connedit.php:754
+msgid "Available locations:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:348
-msgid "Passwords do not match. Password unchanged."
+#: ../../Zotlabs/Module/Connedit.php:758
+msgid ""
+"The permissions indicated on this page will be applied to all new "
+"connections."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:352
-msgid "Empty passwords are not allowed. Password unchanged."
+#: ../../Zotlabs/Module/Connedit.php:759
+msgid "Connection Tools"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:366
-msgid "Password changed."
+#: ../../Zotlabs/Module/Connedit.php:761
+msgid "Slide to adjust your degree of friendship"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:368
-msgid "Password update failed. Please try again."
+#: ../../Zotlabs/Module/Connedit.php:763
+msgid "Slide to adjust your rating"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:617
-msgid "Settings updated."
+#: ../../Zotlabs/Module/Connedit.php:764 ../../Zotlabs/Module/Connedit.php:769
+msgid "Optionally explain your rating"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:681 ../../Zotlabs/Module/Settings.php:707
-#: ../../Zotlabs/Module/Settings.php:743
-msgid "Add application"
+#: ../../Zotlabs/Module/Connedit.php:766
+msgid "Custom Filter"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:684
-msgid "Name of application"
+#: ../../Zotlabs/Module/Connedit.php:767
+msgid "Only import posts with this text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:685 ../../Zotlabs/Module/Settings.php:711
-msgid "Consumer Key"
+#: ../../Zotlabs/Module/Connedit.php:767 ../../Zotlabs/Module/Connedit.php:768
+msgid ""
+"words one per line or #tags or /patterns/ or lang=xx, leave blank to import "
+"all posts"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:685 ../../Zotlabs/Module/Settings.php:686
-msgid "Automatically generated - change if desired. Max length 20"
+#: ../../Zotlabs/Module/Connedit.php:768
+msgid "Do not import posts with this text"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:686 ../../Zotlabs/Module/Settings.php:712
-msgid "Consumer Secret"
+#: ../../Zotlabs/Module/Connedit.php:770
+msgid "This information is public!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:687 ../../Zotlabs/Module/Settings.php:713
-msgid "Redirect"
+#: ../../Zotlabs/Module/Connedit.php:775
+msgid "Connection Pending Approval"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:687
+#: ../../Zotlabs/Module/Connedit.php:780
+#, php-format
 msgid ""
-"Redirect URI - leave blank unless your application specifically requires this"
+"Please choose the profile you would like to display to %s when viewing your "
+"profile securely."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:688 ../../Zotlabs/Module/Settings.php:714
-msgid "Icon url"
+#: ../../Zotlabs/Module/Connedit.php:787
+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/Settings.php:699
-msgid "Application not found."
+#: ../../Zotlabs/Module/Connedit.php:788
+msgid "Last update:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:742
-msgid "Connected Apps"
+#: ../../Zotlabs/Module/Apps.php:47 ../../include/widgets.php:102
+#: ../../include/nav.php:167
+msgid "Apps"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:746
-msgid "Client key starts with"
+#: ../../Zotlabs/Module/Connect.php:61 ../../Zotlabs/Module/Connect.php:109
+msgid "Continue"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:747
-msgid "No name"
+#: ../../Zotlabs/Module/Connect.php:90
+msgid "Premium Channel Setup"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:748
-msgid "Remove authorization"
+#: ../../Zotlabs/Module/Connect.php:92
+msgid "Enable premium channel connection restrictions"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:761
-msgid "No feature settings configured"
+#: ../../Zotlabs/Module/Connect.php:93
+msgid ""
+"Please enter your restrictions or conditions, such as paypal receipt, usage "
+"guidelines, etc."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:768
-msgid "Feature/Addon Settings"
+#: ../../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/Settings.php:791
-msgid "Account Settings"
+#: ../../Zotlabs/Module/Connect.php:96
+msgid ""
+"Potential connections will then see the following text before proceeding:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:792
-msgid "Current Password"
+#: ../../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/Settings.php:793
-msgid "Enter New Password"
+#: ../../Zotlabs/Module/Connect.php:106
+msgid "(No specific instructions have been provided by the channel owner.)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:794
-msgid "Confirm New Password"
+#: ../../Zotlabs/Module/Connect.php:114
+msgid "Restricted or Premium Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:794
-msgid "Leave password fields blank unless changing"
+#: ../../Zotlabs/Module/Rbmark.php:94
+msgid "Select a bookmark folder"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:796
-#: ../../Zotlabs/Module/Settings.php:1236
-msgid "Email Address:"
+#: ../../Zotlabs/Module/Rbmark.php:99
+msgid "Save Bookmark"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:798
-msgid "Remove this account including all its channels"
+#: ../../Zotlabs/Module/Rbmark.php:100
+msgid "URL of bookmark"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:832
-msgid ""
-"Use this form to create temporary access identifiers to share things with "
-"non-members. These identities may be used in Access Control Lists and "
-"visitors may login using these credentials to access private content."
+#: ../../Zotlabs/Module/Rbmark.php:105
+msgid "Or enter new bookmark folder name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:834
-msgid ""
-"You may also provide <em>dropbox</em> style access links to friends and "
-"associates by adding the Login Password to any specific site URL as shown. "
-"Examples:"
+#: ../../Zotlabs/Module/Rmagic.php:35
+msgid "Authentication failed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:869 ../../include/widgets.php:614
-msgid "Guest Access Tokens"
+#: ../../Zotlabs/Module/Rmagic.php:75
+msgid "Remote Authentication"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:876
-msgid "Login Name"
+#: ../../Zotlabs/Module/Rmagic.php:76
+msgid "Enter your channel address (e.g. channel@example.com)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:877
-msgid "Login Password"
+#: ../../Zotlabs/Module/Rmagic.php:77
+msgid "Authenticate"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:878
-msgid "Expires (yyyy-mm-dd)"
+#: ../../Zotlabs/Module/Regmod.php:15
+msgid "Please login."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:910
-msgid "Additional Features"
+#: ../../Zotlabs/Module/Removeaccount.php:35
+msgid ""
+"Account removals are not allowed within 48 hours of changing the account "
+"password."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:934
-msgid "Connector Settings"
+#: ../../Zotlabs/Module/Removeaccount.php:57
+msgid "Remove This Account"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:981
-msgid "No special theme for mobile devices"
+#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Zotlabs/Module/Removeme.php:61
+msgid "WARNING: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:984
-#, php-format
-msgid "%s - (Experimental)"
+#: ../../Zotlabs/Module/Removeaccount.php:58
+msgid ""
+"This account and all its channels will be completely removed from the "
+"network. "
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1035
-msgid "Display Settings"
+#: ../../Zotlabs/Module/Removeaccount.php:58
+#: ../../Zotlabs/Module/Removeme.php:61
+msgid "This action is permanent and can not be undone!"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1036
-msgid "Theme Settings"
+#: ../../Zotlabs/Module/Removeaccount.php:59
+#: ../../Zotlabs/Module/Removeme.php:62
+msgid "Please enter your password for verification:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1037
-msgid "Custom Theme Settings"
+#: ../../Zotlabs/Module/Removeaccount.php:60
+msgid ""
+"Remove this account, all its channels and all its channel clones from the "
+"network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1038
-msgid "Content Settings"
+#: ../../Zotlabs/Module/Removeaccount.php:60
+msgid ""
+"By default only the instances of the channels located on this hub will be "
+"removed from the network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1044
-msgid "Display Theme:"
+#: ../../Zotlabs/Module/Removeme.php:35
+msgid ""
+"Channel removals are not allowed within 48 hours of changing the account "
+"password."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1045
-msgid "Select scheme"
+#: ../../Zotlabs/Module/Removeme.php:60
+msgid "Remove This Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1047
-msgid "Mobile Theme:"
+#: ../../Zotlabs/Module/Removeme.php:61
+msgid "This channel will be completely removed from the network. "
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1048
-msgid "Preload images before rendering the page"
+#: ../../Zotlabs/Module/Removeme.php:63
+msgid "Remove this channel and all its clones from the network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1048
+#: ../../Zotlabs/Module/Removeme.php:63
 msgid ""
-"The subjective page load time will be longer but the page will be ready when "
-"displayed"
-msgstr ""
-
-#: ../../Zotlabs/Module/Settings.php:1049
-msgid "Enable user zoom on mobile devices"
+"By default only the instance of the channel located on this hub will be "
+"removed from the network"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1050
-msgid "Update browser every xx seconds"
+#: ../../Zotlabs/Module/Uexport.php:55 ../../Zotlabs/Module/Uexport.php:56
+msgid "Export Channel"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1050
-msgid "Minimum of 10 seconds, no maximum"
+#: ../../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."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1051
-msgid "Maximum number of conversations to load at any time:"
+#: ../../Zotlabs/Module/Uexport.php:58
+msgid "Export Content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1051
-msgid "Maximum of 100 items"
+#: ../../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/Settings.php:1052
-msgid "Show emoticons (smilies) as images"
+#: ../../Zotlabs/Module/Uexport.php:60
+msgid "Export your posts from a given year."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1053
-msgid "Link post titles to source"
+#: ../../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/Settings.php:1054
-msgid "System Page Layout Editor - (advanced)"
+#: ../../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/Settings.php:1057
-msgid "Use blog/list mode on channel page"
+#: ../../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/Settings.php:1057
-#: ../../Zotlabs/Module/Settings.php:1058
-msgid "(comments displayed separately)"
+#: ../../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/Settings.php:1058
-msgid "Use blog/list mode on grid page"
+#: ../../Zotlabs/Module/Editpost.php:35
+msgid "Item is not editable"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1059
-msgid "Channel page max height of content (in pixels)"
+#: ../../Zotlabs/Module/Editpost.php:106 ../../Zotlabs/Module/Rpost.php:138
+msgid "Edit post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1059
-#: ../../Zotlabs/Module/Settings.php:1060
-msgid "click to expand content exceeding this height"
+#: ../../Zotlabs/Module/Search.php:216
+#, php-format
+msgid "Items tagged with: %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1060
-msgid "Grid page max height of content (in pixels)"
+#: ../../Zotlabs/Module/Search.php:218
+#, php-format
+msgid "Search results for: %s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1090
-msgid "Nobody except yourself"
+#: ../../Zotlabs/Module/Service_limits.php:23
+msgid "No service class restrictions found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1091
-msgid "Only those you specifically allow"
+#: ../../Zotlabs/Module/Thing.php:114
+msgid "Thing updated"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1092
-msgid "Approved connections"
+#: ../../Zotlabs/Module/Thing.php:166
+msgid "Object store: failed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1093
-msgid "Any connections"
+#: ../../Zotlabs/Module/Thing.php:170
+msgid "Thing added"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1094
-msgid "Anybody on this website"
+#: ../../Zotlabs/Module/Thing.php:196
+#, php-format
+msgid "OBJ: %1$s %2$s %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1095
-msgid "Anybody in this network"
+#: ../../Zotlabs/Module/Thing.php:259
+msgid "Show Thing"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1096
-msgid "Anybody authenticated"
+#: ../../Zotlabs/Module/Thing.php:266
+msgid "item not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1097
-msgid "Anybody on the internet"
+#: ../../Zotlabs/Module/Thing.php:299
+msgid "Edit Thing"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1171
-msgid "Publish your default profile in the network directory"
+#: ../../Zotlabs/Module/Thing.php:301 ../../Zotlabs/Module/Thing.php:355
+msgid "Select a profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1176
-msgid "Allow us to suggest you as a potential friend to new members?"
+#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:358
+msgid "Post an activity"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1185
-msgid "Your channel address is"
+#: ../../Zotlabs/Module/Thing.php:305 ../../Zotlabs/Module/Thing.php:358
+msgid "Only sends to viewers of the applicable profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1227
-msgid "Channel Settings"
+#: ../../Zotlabs/Module/Thing.php:307 ../../Zotlabs/Module/Thing.php:360
+msgid "Name of thing e.g. something"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1234
-msgid "Basic Settings"
+#: ../../Zotlabs/Module/Thing.php:309 ../../Zotlabs/Module/Thing.php:361
+msgid "URL of thing (optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1235 ../../include/channel.php:1164
-msgid "Full Name:"
+#: ../../Zotlabs/Module/Thing.php:311 ../../Zotlabs/Module/Thing.php:362
+msgid "URL for photo of thing (optional)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1237
-msgid "Your Timezone:"
+#: ../../Zotlabs/Module/Thing.php:353
+msgid "Add Thing to your Profile"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1238
-msgid "Default Post Location:"
+#: ../../Zotlabs/Module/Item.php:180
+msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1238
-msgid "Geographical location to display on your posts"
+#: ../../Zotlabs/Module/Item.php:433
+msgid "Empty post discarded."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1239
-msgid "Use Browser Location:"
+#: ../../Zotlabs/Module/Item.php:473
+msgid "Executable content type not permitted to this channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1241
-msgid "Adult Content"
+#: ../../Zotlabs/Module/Item.php:858
+msgid "Duplicate post suppressed."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1241
-msgid ""
-"This channel frequently or regularly publishes adult content. (Please tag "
-"any adult material and/or nudity with #NSFW)"
+#: ../../Zotlabs/Module/Item.php:991
+msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1243
-msgid "Security and Privacy Settings"
+#: ../../Zotlabs/Module/Item.php:1112
+msgid "Unable to obtain post information from database."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1246
-msgid "Your permissions are already configured. Click to view/adjust"
+#: ../../Zotlabs/Module/Item.php:1119
+#, php-format
+msgid "You have reached your limit of %1$.0f top level posts."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1248
-msgid "Hide my online presence"
+#: ../../Zotlabs/Module/Item.php:1126
+#, php-format
+msgid "You have reached your limit of %1$.0f webpages."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1248
-msgid "Prevents displaying in your profile that you are online"
+#: ../../Zotlabs/Module/Sharedwithme.php:98
+msgid "Files: shared with me"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1250
-msgid "Simple Privacy Settings:"
+#: ../../Zotlabs/Module/Sharedwithme.php:100
+msgid "NEW"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1251
-msgid ""
-"Very Public - <em>extremely permissive (should be used with caution)</em>"
+#: ../../Zotlabs/Module/Sharedwithme.php:103
+msgid "Remove all files"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1252
-msgid ""
-"Typical - <em>default public, privacy when desired (similar to social "
-"network permissions but with improved privacy)</em>"
+#: ../../Zotlabs/Module/Sharedwithme.php:104
+msgid "Remove this file"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1253
-msgid "Private - <em>default private, never open or public</em>"
+#: ../../Zotlabs/Module/Wiki.php:34
+msgid "Not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1254
-msgid "Blocked - <em>default blocked to/from everybody</em>"
+#: ../../Zotlabs/Module/Wiki.php:97 ../../Zotlabs/Lib/Apps.php:219
+#: ../../include/conversation.php:1728 ../../include/conversation.php:1731
+#: ../../include/features.php:57 ../../include/nav.php:110
+msgid "Wiki"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1256
-msgid "Allow others to tag your posts"
+#: ../../Zotlabs/Module/Wiki.php:98
+msgid "Sandbox"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1256
+#: ../../Zotlabs/Module/Wiki.php:100
 msgid ""
-"Often used by the community to retro-actively flag inappropriate content"
+"\"# Wiki Sandbox\\n\\nContent you **edit** and **preview** here *will not be "
+"saved*.\""
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1258
-msgid "Advanced Privacy Settings"
+#: ../../Zotlabs/Module/Wiki.php:169
+msgid "Revision Comparison"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1260
-msgid "Expire other channel content after this many days"
+#: ../../Zotlabs/Module/Wiki.php:170
+msgid "Revert"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1260
-msgid "0 or blank to use the website limit."
+#: ../../Zotlabs/Module/Wiki.php:201
+msgid "Enter the name of your new wiki:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1260
-#, php-format
-msgid "This website expires after %d days."
+#: ../../Zotlabs/Module/Wiki.php:202
+msgid "Enter the name of the new page:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1260
-msgid "This website does not expire imported content."
+#: ../../Zotlabs/Module/Wiki.php:203
+msgid "Enter the new name:"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1260
-msgid "The website limit takes precedence if lower than your limit."
+#: ../../Zotlabs/Module/Wiki.php:209 ../../include/conversation.php:1152
+msgid "Embed image from photo albums"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1261
-msgid "Maximum Friend Requests/Day:"
+#: ../../Zotlabs/Module/Wiki.php:210 ../../include/conversation.php:1242
+msgid "Embed an image from your albums"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1261
-msgid "May reduce spam activity"
+#: ../../Zotlabs/Module/Wiki.php:212 ../../include/conversation.php:1244
+#: ../../include/conversation.php:1291
+msgid "OK"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1262
-msgid "Default Post and Publish Permissions"
+#: ../../Zotlabs/Module/Wiki.php:213 ../../include/conversation.php:1188
+msgid "Choose images to embed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1264
-msgid "Use my default audience setting for the type of object published"
+#: ../../Zotlabs/Module/Wiki.php:214 ../../include/conversation.php:1189
+msgid "Choose an album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1271
-msgid "Channel permissions category:"
+#: ../../Zotlabs/Module/Wiki.php:215 ../../include/conversation.php:1190
+msgid "Choose a different album..."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1277
-msgid "Maximum private messages per day from unknown people:"
+#: ../../Zotlabs/Module/Wiki.php:216 ../../include/conversation.php:1191
+msgid "Error getting album list"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1277
-msgid "Useful to reduce spamming"
+#: ../../Zotlabs/Module/Wiki.php:217 ../../include/conversation.php:1192
+msgid "Error getting photo link"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1280
-msgid "Notification Settings"
+#: ../../Zotlabs/Module/Wiki.php:218 ../../include/conversation.php:1193
+msgid "Error getting album"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1281
-msgid "By default post a status message when:"
+#: ../../Zotlabs/Module/Sources.php:37
+msgid "Failed to create source. No channel selected."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1282
-msgid "accepting a friend request"
+#: ../../Zotlabs/Module/Sources.php:51
+msgid "Source created."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1283
-msgid "joining a forum/community"
+#: ../../Zotlabs/Module/Sources.php:64
+msgid "Source updated."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1284
-msgid "making an <em>interesting</em> profile change"
+#: ../../Zotlabs/Module/Sources.php:90
+msgid "*"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1285
-msgid "Send a notification email when:"
+#: ../../Zotlabs/Module/Sources.php:96 ../../include/widgets.php:639
+#: ../../include/features.php:71
+msgid "Channel Sources"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1286
-msgid "You receive a connection request"
+#: ../../Zotlabs/Module/Sources.php:97
+msgid "Manage remote sources of content for your channel."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1287
-msgid "Your connections are confirmed"
+#: ../../Zotlabs/Module/Sources.php:98 ../../Zotlabs/Module/Sources.php:108
+msgid "New Source"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1288
-msgid "Someone writes on your profile wall"
+#: ../../Zotlabs/Module/Sources.php:109 ../../Zotlabs/Module/Sources.php:143
+msgid ""
+"Import all or selected content from the following channel into this channel "
+"and distribute it according to your channel settings."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1289
-msgid "Someone writes a followup comment"
+#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
+msgid "Only import content with these words (one per line)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1290
-msgid "You receive a private message"
+#: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144
+msgid "Leave blank to import all public content"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1291
-msgid "You receive a friend suggestion"
+#: ../../Zotlabs/Module/Sources.php:111 ../../Zotlabs/Module/Sources.php:148
+msgid "Channel Name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1292
-msgid "You are tagged in a post"
+#: ../../Zotlabs/Module/Sources.php:112 ../../Zotlabs/Module/Sources.php:147
+msgid ""
+"Add the following categories to posts imported from this source (comma "
+"separated)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1293
-msgid "You are poked/prodded/etc. in a post"
+#: ../../Zotlabs/Module/Sources.php:133 ../../Zotlabs/Module/Sources.php:161
+msgid "Source not found."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1296
-msgid "Show visual notifications including:"
+#: ../../Zotlabs/Module/Sources.php:140
+msgid "Edit Source"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1298
-msgid "Unseen grid activity"
+#: ../../Zotlabs/Module/Sources.php:141
+msgid "Delete Source"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1299
-msgid "Unseen channel activity"
+#: ../../Zotlabs/Module/Sources.php:169
+msgid "Source removed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1300
-msgid "Unseen private messages"
+#: ../../Zotlabs/Module/Sources.php:171
+msgid "Unable to remove source."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1300
-#: ../../Zotlabs/Module/Settings.php:1305
-#: ../../Zotlabs/Module/Settings.php:1306
-#: ../../Zotlabs/Module/Settings.php:1307
-msgid "Recommended"
+#: ../../Zotlabs/Module/Subthread.php:118
+#, php-format
+msgid "%1$s is following %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1301
-msgid "Upcoming events"
+#: ../../Zotlabs/Module/Subthread.php:120
+#, php-format
+msgid "%1$s stopped following %2$s's %3$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1302
-msgid "Events today"
+#: ../../Zotlabs/Module/Suggest.php:39
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1303
-msgid "Upcoming birthdays"
+#: ../../Zotlabs/Module/Suggest.php:58 ../../include/widgets.php:149
+msgid "Ignore/Hide"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1303
-msgid "Not available in all themes"
+#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:263
+msgid "post"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1304
-msgid "System (personal) notifications"
+#: ../../Zotlabs/Module/Tagger.php:57 ../../include/text.php:1953
+#: ../../include/conversation.php:150
+msgid "comment"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1305
-msgid "System info messages"
+#: ../../Zotlabs/Module/Tagger.php:100
+#, php-format
+msgid "%1$s tagged %2$s's %3$s with %4$s"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1306
-msgid "System critical alerts"
+#: ../../Zotlabs/Module/Tagrm.php:48 ../../Zotlabs/Module/Tagrm.php:98
+msgid "Tag removed"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1307
-msgid "New connections"
+#: ../../Zotlabs/Module/Tagrm.php:123
+msgid "Remove Item Tag"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1308
-msgid "System Registrations"
+#: ../../Zotlabs/Module/Tagrm.php:125
+msgid "Select a tag to remove: "
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1309
-msgid ""
-"Also show new wall posts, private messages and connections under Notices"
+#: ../../Zotlabs/Module/Follow.php:34
+msgid "Channel added."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1311
-msgid "Notify me of events this many days in advance"
+#: ../../Zotlabs/Module/Viewconnections.php:65
+msgid "No connections."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1311
-msgid "Must be greater than 0"
+#: ../../Zotlabs/Module/Viewconnections.php:78
+#, php-format
+msgid "Visit %s's profile [%s]"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1313
-msgid "Advanced Account/Page Type Settings"
+#: ../../Zotlabs/Module/Viewconnections.php:107
+msgid "View Connections"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1314
-msgid "Change the behaviour of this account for special situations"
+#: ../../Zotlabs/Module/Viewsrc.php:44
+msgid "Source of Item"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1317
-msgid ""
-"Please enable expert mode (in <a href=\"settings/features\">Settings > "
-"Additional features</a>) to adjust!"
+#: ../../Zotlabs/Module/Chat.php:181
+msgid "Room not found"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1318
-msgid "Miscellaneous Settings"
+#: ../../Zotlabs/Module/Chat.php:197
+msgid "Leave Room"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1319
-msgid "Default photo upload folder"
+#: ../../Zotlabs/Module/Chat.php:198
+msgid "Delete Room"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1319
-#: ../../Zotlabs/Module/Settings.php:1320
-msgid "%Y - current year, %m -  current month"
+#: ../../Zotlabs/Module/Chat.php:199
+msgid "I am away right now"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1320
-msgid "Default file upload folder"
+#: ../../Zotlabs/Module/Chat.php:200
+msgid "I am online"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1322
-msgid "Personal menu to display in your channel pages"
+#: ../../Zotlabs/Module/Chat.php:202
+msgid "Bookmark this room"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1324
-msgid "Remove this channel."
+#: ../../Zotlabs/Module/Chat.php:218
+msgid "Feature disabled."
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1325
-msgid "Firefox Share $Projectname provider"
+#: ../../Zotlabs/Module/Chat.php:231
+msgid "New Chatroom"
 msgstr ""
 
-#: ../../Zotlabs/Module/Settings.php:1326
-msgid "Start calendar week on monday"
+#: ../../Zotlabs/Module/Chat.php:232
+msgid "Chatroom name"
 msgstr ""
 
-#: ../../Zotlabs/Module/Viewconnections.php:65
-msgid "No connections."
+#: ../../Zotlabs/Module/Chat.php:233
+msgid "Expiration of chats (minutes)"
 msgstr ""
 
-#: ../../Zotlabs/Module/Viewconnections.php:78
+#: ../../Zotlabs/Module/Chat.php:249
 #, php-format
-msgid "Visit %s's profile [%s]"
+msgid "%1$s's Chatrooms"
 msgstr ""
 
-#: ../../Zotlabs/Module/Viewconnections.php:107
-msgid "View Connections"
+#: ../../Zotlabs/Module/Chat.php:254
+msgid "No chatrooms available"
 msgstr ""
 
-#: ../../Zotlabs/Module/Viewsrc.php:44
-msgid "Source of Item"
+#: ../../Zotlabs/Module/Chat.php:258
+msgid "Expiration"
 msgstr ""
 
-#: ../../Zotlabs/Module/Editpost.php:35
-msgid "Item is not editable"
+#: ../../Zotlabs/Module/Chat.php:259
+msgid "min"
 msgstr ""
 
 #: ../../Zotlabs/Module/Xchan.php:10
@@ -6737,12 +6744,12 @@ msgstr ""
 msgid "Remote Diagnostics"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:212 ../../include/features.php:93
+#: ../../Zotlabs/Lib/Apps.php:212 ../../include/features.php:90
 msgid "Suggest Channels"
 msgstr ""
 
 #: ../../Zotlabs/Lib/Apps.php:213 ../../include/nav.php:114
-#: ../../boot.php:1713
+#: ../../boot.php:1738
 msgid "Login"
 msgstr ""
 
@@ -6754,8 +6761,8 @@ msgstr ""
 msgid "Channel Home"
 msgstr ""
 
-#: ../../Zotlabs/Lib/Apps.php:223 ../../include/conversation.php:1679
-#: ../../include/conversation.php:1682 ../../include/nav.php:205
+#: ../../Zotlabs/Lib/Apps.php:223 ../../include/conversation.php:1682
+#: ../../include/conversation.php:1685 ../../include/nav.php:205
 msgid "Events"
 msgstr ""
 
@@ -6813,7 +6820,7 @@ msgid "Visible to your default audience"
 msgstr ""
 
 #: ../../Zotlabs/Lib/PermissionDescription.php:106
-#: ../../include/acl_selectors.php:170
+#: ../../include/acl_selectors.php:165
 msgid "Only me"
 msgstr ""
 
@@ -7014,23 +7021,23 @@ msgstr ""
 msgid "%s show all"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:712 ../../include/conversation.php:1233
+#: ../../Zotlabs/Lib/ThreadItem.php:712 ../../include/conversation.php:1234
 msgid "Bold"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:713 ../../include/conversation.php:1234
+#: ../../Zotlabs/Lib/ThreadItem.php:713 ../../include/conversation.php:1235
 msgid "Italic"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:714 ../../include/conversation.php:1235
+#: ../../Zotlabs/Lib/ThreadItem.php:714 ../../include/conversation.php:1236
 msgid "Underline"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:715 ../../include/conversation.php:1236
+#: ../../Zotlabs/Lib/ThreadItem.php:715 ../../include/conversation.php:1237
 msgid "Quote"
 msgstr ""
 
-#: ../../Zotlabs/Lib/ThreadItem.php:716 ../../include/conversation.php:1237
+#: ../../Zotlabs/Lib/ThreadItem.php:716 ../../include/conversation.php:1238
 msgid "Code"
 msgstr ""
 
@@ -7054,696 +7061,956 @@ msgstr ""
 msgid "Unable to create a unique channel address. Import failed."
 msgstr ""
 
-#: ../../include/dba/dba_driver.php:171
+#: ../../include/dba/dba_driver.php:173
 #, php-format
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: ../../include/auth.php:148
-msgid "Logged out."
+#: ../../include/network.php:704
+msgid "view full size"
 msgstr ""
 
-#: ../../include/auth.php:275
-msgid "Failed authentication"
+#: ../../include/network.php:1935 ../../include/account.php:317
+#: ../../include/account.php:344 ../../include/account.php:404
+msgid "Administrator"
 msgstr ""
 
-#: ../../include/auth.php:286
-msgid "Login failed."
+#: ../../include/network.php:1949
+msgid "No Subject"
 msgstr ""
 
-#: ../../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"
+#: ../../include/network.php:2203 ../../include/network.php:2204
+msgid "Friendica"
 msgstr ""
 
-#: ../../include/bbcode.php:162 ../../include/bbcode.php:928
-msgid "Encrypted content"
+#: ../../include/network.php:2205
+msgid "OStatus"
 msgstr ""
 
-#: ../../include/bbcode.php:178
-#, php-format
-msgid "Install %s element: "
+#: ../../include/network.php:2206
+msgid "GNU-Social"
 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."
+#: ../../include/network.php:2207
+msgid "RSS/Atom"
 msgstr ""
 
-#: ../../include/bbcode.php:261
-#, php-format
-msgid "%1$s wrote the following %2$s %3$s"
+#: ../../include/network.php:2209
+msgid "Diaspora"
 msgstr ""
 
-#: ../../include/bbcode.php:338 ../../include/bbcode.php:346
-msgid "Click to open/close"
+#: ../../include/network.php:2210
+msgid "Facebook"
 msgstr ""
 
-#: ../../include/bbcode.php:346
-msgid "spoiler"
+#: ../../include/network.php:2211
+msgid "Zot"
 msgstr ""
 
-#: ../../include/bbcode.php:619 ../../include/wiki.php:525
-msgid "Different viewers will see this text differently"
+#: ../../include/network.php:2212
+msgid "LinkedIn"
 msgstr ""
 
-#: ../../include/bbcode.php:866
-msgid "$1 wrote:"
+#: ../../include/network.php:2213
+msgid "XMPP/IM"
 msgstr ""
 
-#: ../../include/follow.php:27
-msgid "Channel is blocked on this site."
+#: ../../include/network.php:2214
+msgid "MySpace"
 msgstr ""
 
-#: ../../include/follow.php:32
-msgid "Channel location missing."
+#: ../../include/oembed.php:340
+msgid "Embedded content"
 msgstr ""
 
-#: ../../include/follow.php:80
-msgid "Response from remote channel was incomplete."
+#: ../../include/oembed.php:349
+msgid "Embedding disabled"
 msgstr ""
 
-#: ../../include/follow.php:97
-msgid "Channel was deleted and no longer exists."
+#: ../../include/permissions.php:29
+msgid "Can view my normal stream and posts"
 msgstr ""
 
-#: ../../include/follow.php:147 ../../include/follow.php:183
-msgid "Protocol disabled."
+#: ../../include/permissions.php:33
+msgid "Can view my webpages"
 msgstr ""
 
-#: ../../include/follow.php:171
-msgid "Channel discovery failed."
+#: ../../include/permissions.php:37
+msgid "Can post on my channel page (\"wall\")"
 msgstr ""
 
-#: ../../include/follow.php:210
-msgid "Cannot connect to yourself."
+#: ../../include/permissions.php:40
+msgid "Can like/dislike stuff"
 msgstr ""
 
-#: ../../include/api.php:1330
-msgid "Public Timeline"
+#: ../../include/permissions.php:40
+msgid "Profiles and things other than posts/comments"
 msgstr ""
 
-#: ../../include/conversation.php:204
+#: ../../include/permissions.php:42
+msgid "Can forward to all my channel contacts via post @mentions"
+msgstr ""
+
+#: ../../include/permissions.php:42
+msgid "Advanced - useful for creating group forum channels"
+msgstr ""
+
+#: ../../include/permissions.php:43
+msgid "Can chat with me (when available)"
+msgstr ""
+
+#: ../../include/permissions.php:44
+msgid "Can write to my file storage and photos"
+msgstr ""
+
+#: ../../include/permissions.php:45
+msgid "Can edit my webpages"
+msgstr ""
+
+#: ../../include/permissions.php:47
+msgid "Somewhat advanced - very useful in open communities"
+msgstr ""
+
+#: ../../include/permissions.php:49
+msgid "Can administer my channel resources"
+msgstr ""
+
+#: ../../include/permissions.php:49
+msgid "Extremely advanced. Leave this alone unless you know what you are doing"
+msgstr ""
+
+#: ../../include/items.php:899 ../../include/items.php:944
+msgid "(Unknown)"
+msgstr ""
+
+#: ../../include/items.php:1143
+msgid "Visible to anybody on the internet."
+msgstr ""
+
+#: ../../include/items.php:1145
+msgid "Visible to you only."
+msgstr ""
+
+#: ../../include/items.php:1147
+msgid "Visible to anybody in this network."
+msgstr ""
+
+#: ../../include/items.php:1149
+msgid "Visible to anybody authenticated."
+msgstr ""
+
+#: ../../include/items.php:1151
 #, php-format
-msgid "%1$s is now connected with %2$s"
+msgid "Visible to anybody on %s."
 msgstr ""
 
-#: ../../include/conversation.php:239
+#: ../../include/items.php:1153
+msgid "Visible to all connections."
+msgstr ""
+
+#: ../../include/items.php:1155
+msgid "Visible to approved connections."
+msgstr ""
+
+#: ../../include/items.php:1157
+msgid "Visible to specific connections."
+msgstr ""
+
+#: ../../include/items.php:3947
+msgid "Privacy group is empty."
+msgstr ""
+
+#: ../../include/items.php:3954
 #, php-format
-msgid "%1$s poked %2$s"
+msgid "Privacy group: %s"
 msgstr ""
 
-#: ../../include/conversation.php:243 ../../include/text.php:1013
-#: ../../include/text.php:1018
-msgid "poked"
+#: ../../include/items.php:3966
+msgid "Connection not found."
 msgstr ""
 
-#: ../../include/conversation.php:694
+#: ../../include/items.php:4319
+msgid "profile photo"
+msgstr ""
+
+#: ../../include/text.php:404
+msgid "prev"
+msgstr ""
+
+#: ../../include/text.php:406
+msgid "first"
+msgstr ""
+
+#: ../../include/text.php:435
+msgid "last"
+msgstr ""
+
+#: ../../include/text.php:438
+msgid "next"
+msgstr ""
+
+#: ../../include/text.php:448
+msgid "older"
+msgstr ""
+
+#: ../../include/text.php:450
+msgid "newer"
+msgstr ""
+
+#: ../../include/text.php:843
+msgid "No connections"
+msgstr ""
+
+#: ../../include/text.php:868
 #, php-format
-msgid "View %s's profile @ %s"
+msgid "View all %s connections"
 msgstr ""
 
-#: ../../include/conversation.php:713
-msgid "Categories:"
+#: ../../include/text.php:1013 ../../include/text.php:1018
+msgid "poke"
 msgstr ""
 
-#: ../../include/conversation.php:714
-msgid "Filed under:"
+#: ../../include/text.php:1013 ../../include/text.php:1018
+#: ../../include/conversation.php:243
+msgid "poked"
 msgstr ""
 
-#: ../../include/conversation.php:741
-msgid "View in context"
+#: ../../include/text.php:1019
+msgid "ping"
 msgstr ""
 
-#: ../../include/conversation.php:851
-msgid "remove"
+#: ../../include/text.php:1019
+msgid "pinged"
 msgstr ""
 
-#: ../../include/conversation.php:855 ../../include/nav.php:251
-msgid "Loading..."
+#: ../../include/text.php:1020
+msgid "prod"
 msgstr ""
 
-#: ../../include/conversation.php:856
-msgid "Delete Selected Items"
+#: ../../include/text.php:1020
+msgid "prodded"
 msgstr ""
 
-#: ../../include/conversation.php:952
-msgid "View Source"
+#: ../../include/text.php:1021
+msgid "slap"
 msgstr ""
 
-#: ../../include/conversation.php:953
-msgid "Follow Thread"
+#: ../../include/text.php:1021
+msgid "slapped"
 msgstr ""
 
-#: ../../include/conversation.php:954
-msgid "Unfollow Thread"
+#: ../../include/text.php:1022
+msgid "finger"
 msgstr ""
 
-#: ../../include/conversation.php:959
-msgid "Activity/Posts"
+#: ../../include/text.php:1022
+msgid "fingered"
 msgstr ""
 
-#: ../../include/conversation.php:961
-msgid "Edit Connection"
+#: ../../include/text.php:1023
+msgid "rebuff"
 msgstr ""
 
-#: ../../include/conversation.php:962
-msgid "Message"
+#: ../../include/text.php:1023
+msgid "rebuffed"
 msgstr ""
 
-#: ../../include/conversation.php:1079
-#, php-format
-msgid "%s likes this."
+#: ../../include/text.php:1035
+msgid "happy"
 msgstr ""
 
-#: ../../include/conversation.php:1079
-#, php-format
-msgid "%s doesn't like this."
+#: ../../include/text.php:1036
+msgid "sad"
 msgstr ""
 
-#: ../../include/conversation.php:1083
-#, 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/text.php:1037
+msgid "mellow"
+msgstr ""
 
-#: ../../include/conversation.php:1085
-#, 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/text.php:1038
+msgid "tired"
+msgstr ""
 
-#: ../../include/conversation.php:1091
-msgid "and"
+#: ../../include/text.php:1039
+msgid "perky"
 msgstr ""
 
-#: ../../include/conversation.php:1094
-#, php-format
-msgid ", and %d other people"
-msgid_plural ", and %d other people"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/text.php:1040
+msgid "angry"
+msgstr ""
 
-#: ../../include/conversation.php:1095
-#, php-format
-msgid "%s like this."
+#: ../../include/text.php:1041
+msgid "stupefied"
 msgstr ""
 
-#: ../../include/conversation.php:1095
-#, php-format
-msgid "%s don't like this."
+#: ../../include/text.php:1042
+msgid "puzzled"
 msgstr ""
 
-#: ../../include/conversation.php:1138
-msgid "Set your location"
+#: ../../include/text.php:1043
+msgid "interested"
 msgstr ""
 
-#: ../../include/conversation.php:1139
-msgid "Clear browser location"
+#: ../../include/text.php:1044
+msgid "bitter"
 msgstr ""
 
-#: ../../include/conversation.php:1187
-msgid "Tag term:"
+#: ../../include/text.php:1045
+msgid "cheerful"
 msgstr ""
 
-#: ../../include/conversation.php:1188
-msgid "Where are you right now?"
+#: ../../include/text.php:1046
+msgid "alive"
 msgstr ""
 
-#: ../../include/conversation.php:1197
-msgid "Comments enabled"
+#: ../../include/text.php:1047
+msgid "annoyed"
 msgstr ""
 
-#: ../../include/conversation.php:1198
-msgid "Comments disabled"
+#: ../../include/text.php:1048
+msgid "anxious"
 msgstr ""
 
-#: ../../include/conversation.php:1228
-msgid "Page link name"
+#: ../../include/text.php:1049
+msgid "cranky"
 msgstr ""
 
-#: ../../include/conversation.php:1231
-msgid "Post as"
+#: ../../include/text.php:1050
+msgid "disturbed"
 msgstr ""
 
-#: ../../include/conversation.php:1245
-msgid "Toggle voting"
+#: ../../include/text.php:1051
+msgid "frustrated"
 msgstr ""
 
-#: ../../include/conversation.php:1248
-msgid "Disable comments"
+#: ../../include/text.php:1052
+msgid "depressed"
 msgstr ""
 
-#: ../../include/conversation.php:1249
-msgid "Toggle comments"
+#: ../../include/text.php:1053
+msgid "motivated"
 msgstr ""
 
-#: ../../include/conversation.php:1257
-msgid "Categories (optional, comma-separated list)"
+#: ../../include/text.php:1054
+msgid "relaxed"
 msgstr ""
 
-#: ../../include/conversation.php:1284
-msgid "Set publish date"
+#: ../../include/text.php:1055
+msgid "surprised"
 msgstr ""
 
-#: ../../include/conversation.php:1533
-msgid "Discover"
+#: ../../include/text.php:1239 ../../include/js_strings.php:70
+msgid "Monday"
 msgstr ""
 
-#: ../../include/conversation.php:1536
-msgid "Imported public streams"
+#: ../../include/text.php:1239 ../../include/js_strings.php:71
+msgid "Tuesday"
 msgstr ""
 
-#: ../../include/conversation.php:1541
-msgid "Commented Order"
+#: ../../include/text.php:1239 ../../include/js_strings.php:72
+msgid "Wednesday"
 msgstr ""
 
-#: ../../include/conversation.php:1544
-msgid "Sort by Comment Date"
+#: ../../include/text.php:1239 ../../include/js_strings.php:73
+msgid "Thursday"
 msgstr ""
 
-#: ../../include/conversation.php:1548
-msgid "Posted Order"
+#: ../../include/text.php:1239 ../../include/js_strings.php:74
+msgid "Friday"
 msgstr ""
 
-#: ../../include/conversation.php:1551
-msgid "Sort by Post Date"
+#: ../../include/text.php:1239 ../../include/js_strings.php:75
+msgid "Saturday"
 msgstr ""
 
-#: ../../include/conversation.php:1559
-msgid "Posts that mention or involve you"
+#: ../../include/text.php:1239 ../../include/js_strings.php:69
+msgid "Sunday"
 msgstr ""
 
-#: ../../include/conversation.php:1568
-msgid "Activity Stream - by date"
+#: ../../include/text.php:1243 ../../include/js_strings.php:45
+msgid "January"
 msgstr ""
 
-#: ../../include/conversation.php:1574
-msgid "Starred"
+#: ../../include/text.php:1243 ../../include/js_strings.php:46
+msgid "February"
 msgstr ""
 
-#: ../../include/conversation.php:1577
-msgid "Favourite Posts"
+#: ../../include/text.php:1243 ../../include/js_strings.php:47
+msgid "March"
 msgstr ""
 
-#: ../../include/conversation.php:1584
-msgid "Spam"
+#: ../../include/text.php:1243 ../../include/js_strings.php:48
+msgid "April"
 msgstr ""
 
-#: ../../include/conversation.php:1587
-msgid "Posts flagged as SPAM"
+#: ../../include/text.php:1243
+msgid "May"
 msgstr ""
 
-#: ../../include/conversation.php:1644
-msgid "Status Messages and Posts"
+#: ../../include/text.php:1243 ../../include/js_strings.php:50
+msgid "June"
 msgstr ""
 
-#: ../../include/conversation.php:1653
-msgid "About"
+#: ../../include/text.php:1243 ../../include/js_strings.php:51
+msgid "July"
 msgstr ""
 
-#: ../../include/conversation.php:1656
-msgid "Profile Details"
+#: ../../include/text.php:1243 ../../include/js_strings.php:52
+msgid "August"
 msgstr ""
 
-#: ../../include/conversation.php:1665 ../../include/photos.php:506
-msgid "Photo Albums"
+#: ../../include/text.php:1243 ../../include/js_strings.php:53
+msgid "September"
 msgstr ""
 
-#: ../../include/conversation.php:1672
-msgid "Files and Storage"
+#: ../../include/text.php:1243 ../../include/js_strings.php:54
+msgid "October"
 msgstr ""
 
-#: ../../include/conversation.php:1692 ../../include/conversation.php:1695
-#: ../../include/widgets.php:850
-msgid "Chatrooms"
+#: ../../include/text.php:1243 ../../include/js_strings.php:55
+msgid "November"
 msgstr ""
 
-#: ../../include/conversation.php:1705 ../../include/nav.php:104
-msgid "Bookmarks"
+#: ../../include/text.php:1243 ../../include/js_strings.php:56
+msgid "December"
 msgstr ""
 
-#: ../../include/conversation.php:1708
-msgid "Saved Bookmarks"
+#: ../../include/text.php:1320 ../../include/text.php:1324
+msgid "Unknown Attachment"
 msgstr ""
 
-#: ../../include/conversation.php:1718
-msgid "Manage Webpages"
+#: ../../include/text.php:1326
+msgid "unknown"
 msgstr ""
 
-#: ../../include/conversation.php:1783
-msgctxt "noun"
-msgid "Attending"
-msgid_plural "Attending"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/text.php:1362
+msgid "remove category"
+msgstr ""
 
-#: ../../include/conversation.php:1786
-msgctxt "noun"
-msgid "Not Attending"
-msgid_plural "Not Attending"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/text.php:1439
+msgid "remove from file"
+msgstr ""
 
-#: ../../include/conversation.php:1789
-msgctxt "noun"
-msgid "Undecided"
-msgid_plural "Undecided"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/text.php:1738 ../../include/text.php:1809
+msgid "default"
+msgstr ""
 
-#: ../../include/conversation.php:1792
-msgctxt "noun"
-msgid "Agree"
-msgid_plural "Agrees"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/text.php:1746
+msgid "Page layout"
+msgstr ""
 
-#: ../../include/conversation.php:1795
-msgctxt "noun"
-msgid "Disagree"
-msgid_plural "Disagrees"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/text.php:1746
+msgid "You can create your own with the layouts tool"
+msgstr ""
 
-#: ../../include/conversation.php:1798
-msgctxt "noun"
-msgid "Abstain"
-msgid_plural "Abstains"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../include/text.php:1788
+msgid "Page content type"
+msgstr ""
 
-#: ../../include/features.php:50
-msgid "General Features"
+#: ../../include/text.php:1821
+msgid "Select an alternate language"
 msgstr ""
 
-#: ../../include/features.php:52
-msgid "Content Expiration"
+#: ../../include/text.php:1958
+msgid "activity"
 msgstr ""
 
-#: ../../include/features.php:52
-msgid "Remove posts/comments and/or private messages at a future time"
+#: ../../include/text.php:2259
+msgid "Design Tools"
 msgstr ""
 
-#: ../../include/features.php:53
-msgid "Multiple Profiles"
+#: ../../include/text.php:2265
+msgid "Pages"
 msgstr ""
 
-#: ../../include/features.php:53
-msgid "Ability to create multiple profiles"
+#: ../../include/text.php:2287
+msgid "Import website..."
 msgstr ""
 
-#: ../../include/features.php:54
-msgid "Advanced Profiles"
+#: ../../include/text.php:2288
+msgid "Select folder to import"
 msgstr ""
 
-#: ../../include/features.php:54
-msgid "Additional profile sections and selections"
+#: ../../include/text.php:2289
+msgid "Import from a zipped folder:"
 msgstr ""
 
-#: ../../include/features.php:55
-msgid "Profile Import/Export"
+#: ../../include/text.php:2290
+msgid "Import from cloud files:"
 msgstr ""
 
-#: ../../include/features.php:55
-msgid "Save and load profile details across sites/channels"
+#: ../../include/text.php:2291
+msgid "/cloud/channel/path/to/folder"
 msgstr ""
 
-#: ../../include/features.php:56
-msgid "Web Pages"
+#: ../../include/text.php:2292
+msgid "Enter path to website files"
 msgstr ""
 
-#: ../../include/features.php:56
-msgid "Provide managed web pages on your channel"
+#: ../../include/text.php:2293
+msgid "Select folder"
 msgstr ""
 
-#: ../../include/features.php:57
-msgid "Provide a wiki for your channel"
+#: ../../include/widgets.php:46 ../../include/widgets.php:429
+#: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270
+#: ../../include/contact_widgets.php:91
+msgid "Categories"
 msgstr ""
 
-#: ../../include/features.php:58
-msgid "Hide Rating"
+#: ../../include/widgets.php:103
+msgid "System"
 msgstr ""
 
-#: ../../include/features.php:58
-msgid ""
-"Hide the rating buttons on your channel and profile pages. Note: People can "
-"still rate you somewhere else."
+#: ../../include/widgets.php:106
+msgid "New App"
 msgstr ""
 
-#: ../../include/features.php:59
-msgid "Private Notes"
+#: ../../include/widgets.php:154
+msgid "Suggestions"
 msgstr ""
 
-#: ../../include/features.php:59
-msgid "Enables a tool to store notes and reminders (note: not encrypted)"
+#: ../../include/widgets.php:155
+msgid "See more..."
 msgstr ""
 
-#: ../../include/features.php:60
-msgid "Navigation Channel Select"
+#: ../../include/widgets.php:175
+#, php-format
+msgid "You have %1$.0f of %2$.0f allowed connections."
 msgstr ""
 
-#: ../../include/features.php:60
-msgid "Change channels directly from within the navigation dropdown menu"
+#: ../../include/widgets.php:181
+msgid "Add New Connection"
 msgstr ""
 
-#: ../../include/features.php:61
-msgid "Photo Location"
+#: ../../include/widgets.php:182
+msgid "Enter channel address"
 msgstr ""
 
-#: ../../include/features.php:61
-msgid "If location data is available on uploaded photos, link this to a map."
+#: ../../include/widgets.php:183
+msgid "Examples: bob@example.com, https://example.com/barbara"
 msgstr ""
 
-#: ../../include/features.php:62
-msgid "Access Controlled Chatrooms"
+#: ../../include/widgets.php:199
+msgid "Notes"
 msgstr ""
 
-#: ../../include/features.php:62
-msgid "Provide chatrooms and chat services with access control."
+#: ../../include/widgets.php:273
+msgid "Remove term"
 msgstr ""
 
-#: ../../include/features.php:63
-msgid "Smart Birthdays"
+#: ../../include/widgets.php:281 ../../include/features.php:85
+msgid "Saved Searches"
 msgstr ""
 
-#: ../../include/features.php:63
-msgid ""
-"Make birthday events timezone aware in case your friends are scattered "
-"across the planet."
+#: ../../include/widgets.php:282 ../../include/group.php:316
+msgid "add"
 msgstr ""
 
-#: ../../include/features.php:64
-msgid "Expert Mode"
+#: ../../include/widgets.php:310 ../../include/features.php:99
+#: ../../include/contact_widgets.php:53
+msgid "Saved Folders"
 msgstr ""
 
-#: ../../include/features.php:64
-msgid "Enable Expert Mode to provide advanced configuration options"
+#: ../../include/widgets.php:313 ../../include/widgets.php:432
+#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94
+msgid "Everything"
 msgstr ""
 
-#: ../../include/features.php:65
-msgid "Premium Channel"
+#: ../../include/widgets.php:354
+msgid "Archives"
 msgstr ""
 
-#: ../../include/features.php:65
-msgid ""
-"Allows you to set restrictions and terms on those that connect with your "
-"channel"
+#: ../../include/widgets.php:516
+msgid "Refresh"
 msgstr ""
 
-#: ../../include/features.php:70
-msgid "Post Composition Features"
+#: ../../include/widgets.php:556
+msgid "Account settings"
 msgstr ""
 
-#: ../../include/features.php:73
-msgid "Large Photos"
+#: ../../include/widgets.php:562
+msgid "Channel settings"
 msgstr ""
 
-#: ../../include/features.php:73
+#: ../../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:631
+msgid "Premium Channel Settings"
+msgstr ""
+
+#: ../../include/widgets.php:660
+msgid "Private Mail Menu"
+msgstr ""
+
+#: ../../include/widgets.php:662
+msgid "Combined View"
+msgstr ""
+
+#: ../../include/widgets.php:667 ../../include/nav.php:200
+msgid "Inbox"
+msgstr ""
+
+#: ../../include/widgets.php:672 ../../include/nav.php:201
+msgid "Outbox"
+msgstr ""
+
+#: ../../include/widgets.php:677 ../../include/nav.php:202
+msgid "New Message"
+msgstr ""
+
+#: ../../include/widgets.php:694 ../../include/widgets.php:706
+msgid "Conversations"
+msgstr ""
+
+#: ../../include/widgets.php:698
+msgid "Received Messages"
+msgstr ""
+
+#: ../../include/widgets.php:702
+msgid "Sent Messages"
+msgstr ""
+
+#: ../../include/widgets.php:716
+msgid "No messages."
+msgstr ""
+
+#: ../../include/widgets.php:734
+msgid "Delete conversation"
+msgstr ""
+
+#: ../../include/widgets.php:760
+msgid "Events Tools"
+msgstr ""
+
+#: ../../include/widgets.php:761
+msgid "Export Calendar"
+msgstr ""
+
+#: ../../include/widgets.php:762
+msgid "Import Calendar"
+msgstr ""
+
+#: ../../include/widgets.php:850 ../../include/conversation.php:1695
+#: ../../include/conversation.php:1698
+msgid "Chatrooms"
+msgstr ""
+
+#: ../../include/widgets.php:854
+msgid "Overview"
+msgstr ""
+
+#: ../../include/widgets.php:861
+msgid "Chat Members"
+msgstr ""
+
+#: ../../include/widgets.php:883
+msgid "Wiki List"
+msgstr ""
+
+#: ../../include/widgets.php:921
+msgid "Wiki Pages"
+msgstr ""
+
+#: ../../include/widgets.php:956
+msgid "Bookmarked Chatrooms"
+msgstr ""
+
+#: ../../include/widgets.php:979
+msgid "Suggested Chatrooms"
+msgstr ""
+
+#: ../../include/widgets.php:1125 ../../include/widgets.php:1237
+msgid "photo/image"
+msgstr ""
+
+#: ../../include/widgets.php:1180
+msgid "Click to show more"
+msgstr ""
+
+#: ../../include/widgets.php:1331
+msgid "Rating Tools"
+msgstr ""
+
+#: ../../include/widgets.php:1335 ../../include/widgets.php:1337
+msgid "Rate Me"
+msgstr ""
+
+#: ../../include/widgets.php:1340
+msgid "View Ratings"
+msgstr ""
+
+#: ../../include/widgets.php:1424
+msgid "Forums"
+msgstr ""
+
+#: ../../include/widgets.php:1453
+msgid "Tasks"
+msgstr ""
+
+#: ../../include/widgets.php:1462
+msgid "Documentation"
+msgstr ""
+
+#: ../../include/widgets.php:1464
+msgid "Project/Site Information"
+msgstr ""
+
+#: ../../include/widgets.php:1465
+msgid "For Members"
+msgstr ""
+
+#: ../../include/widgets.php:1466
+msgid "For Administrators"
+msgstr ""
+
+#: ../../include/widgets.php:1467
+msgid "For Developers"
+msgstr ""
+
+#: ../../include/widgets.php:1491 ../../include/widgets.php:1529
+msgid "Member registrations waiting for confirmation"
+msgstr ""
+
+#: ../../include/widgets.php:1497
+msgid "Inspect queue"
+msgstr ""
+
+#: ../../include/widgets.php:1499
+msgid "DB updates"
+msgstr ""
+
+#: ../../include/widgets.php:1524 ../../include/nav.php:220
+msgid "Admin"
+msgstr ""
+
+#: ../../include/widgets.php:1525
+msgid "Plugin Features"
+msgstr ""
+
+#: ../../include/connections.php:95
+msgid "New window"
+msgstr ""
+
+#: ../../include/connections.php:96
+msgid "Open the selected location in a different window or browser tab"
+msgstr ""
+
+#: ../../include/connections.php:214
+#, php-format
+msgid "User '%s' deleted"
+msgstr ""
+
+#: ../../include/acl_selectors.php:169
+msgid "Who can see this?"
+msgstr ""
+
+#: ../../include/acl_selectors.php:170
+msgid "Custom selection"
+msgstr ""
+
+#: ../../include/acl_selectors.php:171
 msgid ""
-"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
-"(640px) photo thumbnails"
+"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit "
+"the scope of \"Show\"."
 msgstr ""
 
-#: ../../include/features.php:74
-msgid "Automatically import channel content from other channels or feeds"
+#: ../../include/acl_selectors.php:172
+msgid "Show"
 msgstr ""
 
-#: ../../include/features.php:75
-msgid "Even More Encryption"
+#: ../../include/acl_selectors.php:173
+msgid "Don't show"
 msgstr ""
 
-#: ../../include/features.php:75
+#: ../../include/acl_selectors.php:207
+#, php-format
 msgid ""
-"Allow optional encryption of content end-to-end with a shared secret key"
+"Post permissions %s cannot be changed %s after a post is shared.</br />These "
+"permissions set who is allowed to view the post."
 msgstr ""
 
-#: ../../include/features.php:76
-msgid "Enable Voting Tools"
+#: ../../include/api.php:1330
+msgid "Public Timeline"
 msgstr ""
 
-#: ../../include/features.php:76
-msgid "Provide a class of post which others can vote on"
+#: ../../include/channel.php:33
+msgid "Unable to obtain identity information from database"
 msgstr ""
 
-#: ../../include/features.php:77
-msgid "Disable Comments"
+#: ../../include/channel.php:67
+msgid "Empty name"
 msgstr ""
 
-#: ../../include/features.php:77
-msgid "Provide the option to disable comments for a post"
+#: ../../include/channel.php:70
+msgid "Name too long"
 msgstr ""
 
-#: ../../include/features.php:78
-msgid "Delayed Posting"
+#: ../../include/channel.php:181
+msgid "No account identifier"
 msgstr ""
 
-#: ../../include/features.php:78
-msgid "Allow posts to be published at a later date"
+#: ../../include/channel.php:193
+msgid "Nickname is required."
 msgstr ""
 
-#: ../../include/features.php:79
-msgid "Suppress Duplicate Posts/Comments"
+#: ../../include/channel.php:207
+msgid "Reserved nickname. Please choose another."
 msgstr ""
 
-#: ../../include/features.php:79
+#: ../../include/channel.php:212
 msgid ""
-"Prevent posts with identical content to be published with less than two "
-"minutes in between submissions."
+"Nickname has unsupported characters or is already being used on this site."
 msgstr ""
 
-#: ../../include/features.php:85
-msgid "Network and Stream Filtering"
+#: ../../include/channel.php:272
+msgid "Unable to retrieve created identity"
 msgstr ""
 
-#: ../../include/features.php:86
-msgid "Search by Date"
+#: ../../include/channel.php:341
+msgid "Default Profile"
 msgstr ""
 
-#: ../../include/features.php:86
-msgid "Ability to select posts by date ranges"
+#: ../../include/channel.php:813
+msgid "Requested channel is not available."
 msgstr ""
 
-#: ../../include/features.php:87 ../../include/group.php:311
-msgid "Privacy Groups"
+#: ../../include/channel.php:960
+msgid "Create New Profile"
 msgstr ""
 
-#: ../../include/features.php:87
-msgid "Enable management and selection of privacy groups"
+#: ../../include/channel.php:963 ../../include/nav.php:92
+msgid "Edit Profile"
 msgstr ""
 
-#: ../../include/features.php:88 ../../include/widgets.php:281
-msgid "Saved Searches"
+#: ../../include/channel.php:980
+msgid "Visible to everybody"
 msgstr ""
 
-#: ../../include/features.php:88
-msgid "Save search terms for re-use"
+#: ../../include/channel.php:1053 ../../include/channel.php:1166
+msgid "Gender:"
 msgstr ""
 
-#: ../../include/features.php:89
-msgid "Network Personal Tab"
+#: ../../include/channel.php:1054 ../../include/channel.php:1210
+msgid "Status:"
 msgstr ""
 
-#: ../../include/features.php:89
-msgid "Enable tab to display only Network posts that you've interacted on"
+#: ../../include/channel.php:1055 ../../include/channel.php:1221
+msgid "Homepage:"
 msgstr ""
 
-#: ../../include/features.php:90
-msgid "Network New Tab"
+#: ../../include/channel.php:1056
+msgid "Online Now"
 msgstr ""
 
-#: ../../include/features.php:90
-msgid "Enable tab to display all new Network activity"
+#: ../../include/channel.php:1171
+msgid "Like this channel"
 msgstr ""
 
-#: ../../include/features.php:91
-msgid "Affinity Tool"
+#: ../../include/channel.php:1195
+msgid "j F, Y"
 msgstr ""
 
-#: ../../include/features.php:91
-msgid "Filter stream activity by depth of relationships"
+#: ../../include/channel.php:1196
+msgid "j F"
 msgstr ""
 
-#: ../../include/features.php:92
-msgid "Connection Filtering"
+#: ../../include/channel.php:1203
+msgid "Birthday:"
 msgstr ""
 
-#: ../../include/features.php:92
-msgid "Filter incoming posts from connections based on keywords/content"
+#: ../../include/channel.php:1216
+#, php-format
+msgid "for %1$d %2$s"
 msgstr ""
 
-#: ../../include/features.php:93
-msgid "Show channel suggestions"
+#: ../../include/channel.php:1219
+msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../include/features.php:98
-msgid "Post/Comment Tools"
+#: ../../include/channel.php:1225
+msgid "Tags:"
 msgstr ""
 
-#: ../../include/features.php:99
-msgid "Community Tagging"
+#: ../../include/channel.php:1227
+msgid "Political Views:"
 msgstr ""
 
-#: ../../include/features.php:99
-msgid "Ability to tag existing posts"
+#: ../../include/channel.php:1229
+msgid "Religion:"
 msgstr ""
 
-#: ../../include/features.php:100
-msgid "Post Categories"
+#: ../../include/channel.php:1233
+msgid "Hobbies/Interests:"
 msgstr ""
 
-#: ../../include/features.php:100
-msgid "Add categories to your posts"
+#: ../../include/channel.php:1235
+msgid "Likes:"
 msgstr ""
 
-#: ../../include/features.php:101
-msgid "Emoji Reactions"
+#: ../../include/channel.php:1237
+msgid "Dislikes:"
 msgstr ""
 
-#: ../../include/features.php:101
-msgid "Add emoji reaction ability to posts"
+#: ../../include/channel.php:1239
+msgid "Contact information and Social Networks:"
 msgstr ""
 
-#: ../../include/features.php:102 ../../include/widgets.php:310
-#: ../../include/contact_widgets.php:53
-msgid "Saved Folders"
+#: ../../include/channel.php:1241
+msgid "My other channels:"
 msgstr ""
 
-#: ../../include/features.php:102
-msgid "Ability to file posts under folders"
+#: ../../include/channel.php:1243
+msgid "Musical interests:"
 msgstr ""
 
-#: ../../include/features.php:103
-msgid "Dislike Posts"
+#: ../../include/channel.php:1245
+msgid "Books, literature:"
 msgstr ""
 
-#: ../../include/features.php:103
-msgid "Ability to dislike posts/comments"
+#: ../../include/channel.php:1247
+msgid "Television:"
 msgstr ""
 
-#: ../../include/features.php:104
-msgid "Star Posts"
+#: ../../include/channel.php:1249
+msgid "Film/dance/culture/entertainment:"
 msgstr ""
 
-#: ../../include/features.php:104
-msgid "Ability to mark special posts with a star indicator"
+#: ../../include/channel.php:1251
+msgid "Love/Romance:"
 msgstr ""
 
-#: ../../include/features.php:105
-msgid "Tag Cloud"
+#: ../../include/channel.php:1253
+msgid "Work/employment:"
 msgstr ""
 
-#: ../../include/features.php:105
-msgid "Provide a personal tag cloud on your channel page"
+#: ../../include/channel.php:1255
+msgid "School/education:"
+msgstr ""
+
+#: ../../include/channel.php:1276
+msgid "Like this thing"
 msgstr ""
 
 #: ../../include/datetime.php:135
@@ -7758,7 +8025,7 @@ msgstr ""
 msgid "YYYY-MM-DD or MM-DD"
 msgstr ""
 
-#: ../../include/datetime.php:272 ../../boot.php:2552
+#: ../../include/datetime.php:272 ../../boot.php:2577
 msgid "never"
 msgstr ""
 
@@ -7831,33 +8098,6 @@ msgstr ""
 msgid "Happy Birthday %1$s"
 msgstr ""
 
-#: ../../include/photos.php:114
-#, php-format
-msgid "Image exceeds website size limit of %lu bytes"
-msgstr ""
-
-#: ../../include/photos.php:121
-msgid "Image file is empty."
-msgstr ""
-
-#: ../../include/photos.php:259
-msgid "Photo storage failed."
-msgstr ""
-
-#: ../../include/photos.php:299
-msgid "a new photo"
-msgstr ""
-
-#: ../../include/photos.php:303
-#, php-format
-msgctxt "photo_upload"
-msgid "%1$s posted %2$s to %3$s"
-msgstr ""
-
-#: ../../include/photos.php:510
-msgid "Upload New Photos"
-msgstr ""
-
 #: ../../include/selectors.php:30
 msgid "Frequently"
 msgstr ""
@@ -8106,375 +8346,424 @@ msgstr ""
 msgid "Ask me"
 msgstr ""
 
-#: ../../include/permissions.php:29
-msgid "Can view my normal stream and posts"
+#: ../../include/photos.php:114
+#, php-format
+msgid "Image exceeds website size limit of %lu bytes"
 msgstr ""
 
-#: ../../include/permissions.php:33
-msgid "Can view my webpages"
+#: ../../include/photos.php:121
+msgid "Image file is empty."
 msgstr ""
 
-#: ../../include/permissions.php:37
-msgid "Can post on my channel page (\"wall\")"
+#: ../../include/photos.php:259
+msgid "Photo storage failed."
 msgstr ""
 
-#: ../../include/permissions.php:40
-msgid "Can like/dislike stuff"
+#: ../../include/photos.php:299
+msgid "a new photo"
 msgstr ""
 
-#: ../../include/permissions.php:40
-msgid "Profiles and things other than posts/comments"
+#: ../../include/photos.php:303
+#, php-format
+msgctxt "photo_upload"
+msgid "%1$s posted %2$s to %3$s"
 msgstr ""
 
-#: ../../include/permissions.php:42
-msgid "Can forward to all my channel contacts via post @mentions"
+#: ../../include/photos.php:506 ../../include/conversation.php:1668
+msgid "Photo Albums"
 msgstr ""
 
-#: ../../include/permissions.php:42
-msgid "Advanced - useful for creating group forum channels"
+#: ../../include/photos.php:510
+msgid "Upload New Photos"
 msgstr ""
 
-#: ../../include/permissions.php:43
-msgid "Can chat with me (when available)"
+#: ../../include/security.php:109
+msgid "guest:"
 msgstr ""
 
-#: ../../include/permissions.php:44
-msgid "Can write to my file storage and photos"
+#: ../../include/security.php:527
+msgid ""
+"The form security token was not correct. This probably happened because the "
+"form has been opened for too long (>3 hours) before submitting it."
 msgstr ""
 
-#: ../../include/permissions.php:45
-msgid "Can edit my webpages"
+#: ../../include/conversation.php:204
+#, php-format
+msgid "%1$s is now connected with %2$s"
 msgstr ""
 
-#: ../../include/permissions.php:47
-msgid "Somewhat advanced - very useful in open communities"
+#: ../../include/conversation.php:239
+#, php-format
+msgid "%1$s poked %2$s"
 msgstr ""
 
-#: ../../include/permissions.php:49
-msgid "Can administer my channel resources"
+#: ../../include/conversation.php:694
+#, php-format
+msgid "View %s's profile @ %s"
 msgstr ""
 
-#: ../../include/permissions.php:49
-msgid "Extremely advanced. Leave this alone unless you know what you are doing"
+#: ../../include/conversation.php:713
+msgid "Categories:"
 msgstr ""
 
-#: ../../include/security.php:109
-msgid "guest:"
+#: ../../include/conversation.php:714
+msgid "Filed under:"
 msgstr ""
 
-#: ../../include/security.php:527
-msgid ""
-"The form security token was not correct. This probably happened because the "
-"form has been opened for too long (>3 hours) before submitting it."
+#: ../../include/conversation.php:741
+msgid "View in context"
 msgstr ""
 
-#: ../../include/bookmarks.php:35
-#, php-format
-msgid "%1$s's bookmarks"
+#: ../../include/conversation.php:851
+msgid "remove"
 msgstr ""
 
-#: ../../include/group.php:26
-msgid ""
-"A deleted group with this name was revived. Existing item permissions "
-"<strong>may</strong> apply to this group and any future members. If this is "
-"not what you intended, please create another group with a different name."
+#: ../../include/conversation.php:855 ../../include/nav.php:251
+msgid "Loading..."
 msgstr ""
 
-#: ../../include/group.php:248
-msgid "Add new connections to this privacy group"
+#: ../../include/conversation.php:856
+msgid "Delete Selected Items"
 msgstr ""
 
-#: ../../include/group.php:289
-msgid "edit"
+#: ../../include/conversation.php:949
+msgid "View Source"
 msgstr ""
 
-#: ../../include/group.php:312
-msgid "Edit group"
+#: ../../include/conversation.php:950
+msgid "Follow Thread"
 msgstr ""
 
-#: ../../include/group.php:313
-msgid "Add privacy group"
+#: ../../include/conversation.php:951
+msgid "Unfollow Thread"
 msgstr ""
 
-#: ../../include/group.php:314
-msgid "Channels not in any privacy group"
+#: ../../include/conversation.php:956
+msgid "Activity/Posts"
 msgstr ""
 
-#: ../../include/group.php:316 ../../include/widgets.php:282
-msgid "add"
+#: ../../include/conversation.php:958
+msgid "Edit Connection"
 msgstr ""
 
-#: ../../include/page_widgets.php:7
-msgid "New Page"
+#: ../../include/conversation.php:959
+msgid "Message"
 msgstr ""
 
-#: ../../include/page_widgets.php:46
-msgid "Title"
+#: ../../include/conversation.php:1076
+#, php-format
+msgid "%s likes this."
 msgstr ""
 
-#: ../../include/widgets.php:46 ../../include/widgets.php:429
-#: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270
-#: ../../include/contact_widgets.php:91
-msgid "Categories"
+#: ../../include/conversation.php:1076
+#, php-format
+msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/widgets.php:103
-msgid "System"
-msgstr ""
+#: ../../include/conversation.php:1080
+#, 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/widgets.php:106
-msgid "New App"
-msgstr ""
+#: ../../include/conversation.php:1082
+#, 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/widgets.php:154
-msgid "Suggestions"
+#: ../../include/conversation.php:1088
+msgid "and"
 msgstr ""
 
-#: ../../include/widgets.php:155
-msgid "See more..."
+#: ../../include/conversation.php:1091
+#, php-format
+msgid ", and %d other people"
+msgid_plural ", and %d other people"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1092
+#, php-format
+msgid "%s like this."
 msgstr ""
 
-#: ../../include/widgets.php:175
+#: ../../include/conversation.php:1092
 #, php-format
-msgid "You have %1$.0f of %2$.0f allowed connections."
+msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/widgets.php:181
-msgid "Add New Connection"
+#: ../../include/conversation.php:1135
+msgid "Set your location"
 msgstr ""
 
-#: ../../include/widgets.php:182
-msgid "Enter channel address"
+#: ../../include/conversation.php:1136
+msgid "Clear browser location"
 msgstr ""
 
-#: ../../include/widgets.php:183
-msgid "Examples: bob@example.com, https://example.com/barbara"
+#: ../../include/conversation.php:1184
+msgid "Tag term:"
 msgstr ""
 
-#: ../../include/widgets.php:199
-msgid "Notes"
+#: ../../include/conversation.php:1185
+msgid "Where are you right now?"
 msgstr ""
 
-#: ../../include/widgets.php:273
-msgid "Remove term"
+#: ../../include/conversation.php:1194
+msgid "Comments enabled"
 msgstr ""
 
-#: ../../include/widgets.php:313 ../../include/widgets.php:432
-#: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94
-msgid "Everything"
+#: ../../include/conversation.php:1195
+msgid "Comments disabled"
 msgstr ""
 
-#: ../../include/widgets.php:354
-msgid "Archives"
+#: ../../include/conversation.php:1229
+msgid "Page link name"
 msgstr ""
 
-#: ../../include/widgets.php:516
-msgid "Refresh"
+#: ../../include/conversation.php:1232
+msgid "Post as"
 msgstr ""
 
-#: ../../include/widgets.php:556
-msgid "Account settings"
+#: ../../include/conversation.php:1246
+msgid "Toggle voting"
 msgstr ""
 
-#: ../../include/widgets.php:562
-msgid "Channel settings"
+#: ../../include/conversation.php:1249
+msgid "Disable comments"
 msgstr ""
 
-#: ../../include/widgets.php:571
-msgid "Additional features"
+#: ../../include/conversation.php:1250
+msgid "Toggle comments"
 msgstr ""
 
-#: ../../include/widgets.php:578
-msgid "Feature/Addon settings"
+#: ../../include/conversation.php:1258
+msgid "Categories (optional, comma-separated list)"
 msgstr ""
 
-#: ../../include/widgets.php:584
-msgid "Display settings"
+#: ../../include/conversation.php:1281
+msgid "Other networks and post services"
 msgstr ""
 
-#: ../../include/widgets.php:591
-msgid "Manage locations"
+#: ../../include/conversation.php:1287
+msgid "Set publish date"
 msgstr ""
 
-#: ../../include/widgets.php:600
-msgid "Export channel"
+#: ../../include/conversation.php:1536
+msgid "Discover"
 msgstr ""
 
-#: ../../include/widgets.php:607
-msgid "Connected apps"
+#: ../../include/conversation.php:1539
+msgid "Imported public streams"
 msgstr ""
 
-#: ../../include/widgets.php:631
-msgid "Premium Channel Settings"
+#: ../../include/conversation.php:1544
+msgid "Commented Order"
 msgstr ""
 
-#: ../../include/widgets.php:660
-msgid "Private Mail Menu"
+#: ../../include/conversation.php:1547
+msgid "Sort by Comment Date"
 msgstr ""
 
-#: ../../include/widgets.php:662
-msgid "Combined View"
+#: ../../include/conversation.php:1551
+msgid "Posted Order"
 msgstr ""
 
-#: ../../include/widgets.php:667 ../../include/nav.php:200
-msgid "Inbox"
+#: ../../include/conversation.php:1554
+msgid "Sort by Post Date"
 msgstr ""
 
-#: ../../include/widgets.php:672 ../../include/nav.php:201
-msgid "Outbox"
+#: ../../include/conversation.php:1562
+msgid "Posts that mention or involve you"
 msgstr ""
 
-#: ../../include/widgets.php:677 ../../include/nav.php:202
-msgid "New Message"
+#: ../../include/conversation.php:1571
+msgid "Activity Stream - by date"
 msgstr ""
 
-#: ../../include/widgets.php:694 ../../include/widgets.php:706
-msgid "Conversations"
+#: ../../include/conversation.php:1577
+msgid "Starred"
 msgstr ""
 
-#: ../../include/widgets.php:698
-msgid "Received Messages"
+#: ../../include/conversation.php:1580
+msgid "Favourite Posts"
 msgstr ""
 
-#: ../../include/widgets.php:702
-msgid "Sent Messages"
+#: ../../include/conversation.php:1587
+msgid "Spam"
 msgstr ""
 
-#: ../../include/widgets.php:716
-msgid "No messages."
+#: ../../include/conversation.php:1590
+msgid "Posts flagged as SPAM"
 msgstr ""
 
-#: ../../include/widgets.php:734
-msgid "Delete conversation"
+#: ../../include/conversation.php:1647
+msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../include/widgets.php:760
-msgid "Events Tools"
+#: ../../include/conversation.php:1656
+msgid "About"
 msgstr ""
 
-#: ../../include/widgets.php:761
-msgid "Export Calendar"
+#: ../../include/conversation.php:1659
+msgid "Profile Details"
 msgstr ""
 
-#: ../../include/widgets.php:762
-msgid "Import Calendar"
+#: ../../include/conversation.php:1675
+msgid "Files and Storage"
 msgstr ""
 
-#: ../../include/widgets.php:854
-msgid "Overview"
+#: ../../include/conversation.php:1708 ../../include/nav.php:104
+msgid "Bookmarks"
 msgstr ""
 
-#: ../../include/widgets.php:861
-msgid "Chat Members"
+#: ../../include/conversation.php:1711
+msgid "Saved Bookmarks"
 msgstr ""
 
-#: ../../include/widgets.php:883
-msgid "Wiki List"
+#: ../../include/conversation.php:1721
+msgid "Manage Webpages"
 msgstr ""
 
-#: ../../include/widgets.php:921
-msgid "Wiki Pages"
+#: ../../include/conversation.php:1786
+msgctxt "noun"
+msgid "Attending"
+msgid_plural "Attending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1789
+msgctxt "noun"
+msgid "Not Attending"
+msgid_plural "Not Attending"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1792
+msgctxt "noun"
+msgid "Undecided"
+msgid_plural "Undecided"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1795
+msgctxt "noun"
+msgid "Agree"
+msgid_plural "Agrees"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1798
+msgctxt "noun"
+msgid "Disagree"
+msgid_plural "Disagrees"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/conversation.php:1801
+msgctxt "noun"
+msgid "Abstain"
+msgid_plural "Abstains"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../include/bookmarks.php:35
+#, php-format
+msgid "%1$s's bookmarks"
 msgstr ""
 
-#: ../../include/widgets.php:956
-msgid "Bookmarked Chatrooms"
+#: ../../include/group.php:26
+msgid ""
+"A deleted group with this name was revived. Existing item permissions "
+"<strong>may</strong> apply to this group and any future members. If this is "
+"not what you intended, please create another group with a different name."
 msgstr ""
 
-#: ../../include/widgets.php:979
-msgid "Suggested Chatrooms"
+#: ../../include/group.php:248
+msgid "Add new connections to this privacy group"
 msgstr ""
 
-#: ../../include/widgets.php:1125 ../../include/widgets.php:1237
-msgid "photo/image"
+#: ../../include/group.php:289
+msgid "edit"
 msgstr ""
 
-#: ../../include/widgets.php:1180
-msgid "Click to show more"
+#: ../../include/group.php:311 ../../include/features.php:84
+msgid "Privacy Groups"
 msgstr ""
 
-#: ../../include/widgets.php:1331
-msgid "Rating Tools"
+#: ../../include/group.php:312
+msgid "Edit group"
 msgstr ""
 
-#: ../../include/widgets.php:1335 ../../include/widgets.php:1337
-msgid "Rate Me"
+#: ../../include/group.php:313
+msgid "Add privacy group"
 msgstr ""
 
-#: ../../include/widgets.php:1340
-msgid "View Ratings"
+#: ../../include/group.php:314
+msgid "Channels not in any privacy group"
 msgstr ""
 
-#: ../../include/widgets.php:1424
-msgid "Forums"
+#: ../../include/page_widgets.php:7
+msgid "New Page"
 msgstr ""
 
-#: ../../include/widgets.php:1453
-msgid "Tasks"
+#: ../../include/page_widgets.php:46
+msgid "Title"
 msgstr ""
 
-#: ../../include/widgets.php:1462
-msgid "Documentation"
+#: ../../include/wiki.php:525 ../../include/bbcode.php:619
+msgid "Different viewers will see this text differently"
 msgstr ""
 
-#: ../../include/widgets.php:1464
-msgid "Project/Site Information"
+#: ../../include/event.php:22 ../../include/event.php:69
+#: ../../include/bb2diaspora.php:485
+msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
-#: ../../include/widgets.php:1465
-msgid "For Members"
+#: ../../include/event.php:30 ../../include/event.php:73
+#: ../../include/bb2diaspora.php:491
+msgid "Starts:"
 msgstr ""
 
-#: ../../include/widgets.php:1466
-msgid "For Administrators"
+#: ../../include/event.php:40 ../../include/event.php:77
+#: ../../include/bb2diaspora.php:499
+msgid "Finishes:"
 msgstr ""
 
-#: ../../include/widgets.php:1467
-msgid "For Developers"
+#: ../../include/event.php:821
+msgid "This event has been added to your calendar."
 msgstr ""
 
-#: ../../include/widgets.php:1491 ../../include/widgets.php:1529
-msgid "Member registrations waiting for confirmation"
+#: ../../include/event.php:1021
+msgid "Not specified"
 msgstr ""
 
-#: ../../include/widgets.php:1497
-msgid "Inspect queue"
+#: ../../include/event.php:1022
+msgid "Needs Action"
 msgstr ""
 
-#: ../../include/widgets.php:1499
-msgid "DB updates"
+#: ../../include/event.php:1023
+msgid "Completed"
 msgstr ""
 
-#: ../../include/widgets.php:1524 ../../include/nav.php:220
-msgid "Admin"
+#: ../../include/event.php:1024
+msgid "In Process"
 msgstr ""
 
-#: ../../include/widgets.php:1525
-msgid "Plugin Features"
+#: ../../include/event.php:1025
+msgid "Cancelled"
 msgstr ""
 
 #: ../../include/bb2diaspora.php:398
 msgid "Attachments:"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:485 ../../include/event.php:22
-#: ../../include/event.php:69
-msgid "l F d, Y \\@ g:i A"
-msgstr ""
-
 #: ../../include/bb2diaspora.php:487
 msgid "$Projectname event notification:"
 msgstr ""
 
-#: ../../include/bb2diaspora.php:491 ../../include/event.php:30
-#: ../../include/event.php:73
-msgid "Starts:"
-msgstr ""
-
-#: ../../include/bb2diaspora.php:499 ../../include/event.php:40
-#: ../../include/event.php:77
-msgid "Finishes:"
-msgstr ""
-
 #: ../../include/js_strings.php:5
 msgid "Delete this item?"
 msgstr ""
@@ -8615,55 +8904,11 @@ msgstr ""
 msgid "timeago.numbers"
 msgstr ""
 
-#: ../../include/js_strings.php:45 ../../include/text.php:1243
-msgid "January"
-msgstr ""
-
-#: ../../include/js_strings.php:46 ../../include/text.php:1243
-msgid "February"
-msgstr ""
-
-#: ../../include/js_strings.php:47 ../../include/text.php:1243
-msgid "March"
-msgstr ""
-
-#: ../../include/js_strings.php:48 ../../include/text.php:1243
-msgid "April"
-msgstr ""
-
 #: ../../include/js_strings.php:49
 msgctxt "long"
 msgid "May"
 msgstr ""
 
-#: ../../include/js_strings.php:50 ../../include/text.php:1243
-msgid "June"
-msgstr ""
-
-#: ../../include/js_strings.php:51 ../../include/text.php:1243
-msgid "July"
-msgstr ""
-
-#: ../../include/js_strings.php:52 ../../include/text.php:1243
-msgid "August"
-msgstr ""
-
-#: ../../include/js_strings.php:53 ../../include/text.php:1243
-msgid "September"
-msgstr ""
-
-#: ../../include/js_strings.php:54 ../../include/text.php:1243
-msgid "October"
-msgstr ""
-
-#: ../../include/js_strings.php:55 ../../include/text.php:1243
-msgid "November"
-msgstr ""
-
-#: ../../include/js_strings.php:56 ../../include/text.php:1243
-msgid "December"
-msgstr ""
-
 #: ../../include/js_strings.php:57
 msgid "Jan"
 msgstr ""
@@ -8713,34 +8958,6 @@ msgstr ""
 msgid "Dec"
 msgstr ""
 
-#: ../../include/js_strings.php:69 ../../include/text.php:1239
-msgid "Sunday"
-msgstr ""
-
-#: ../../include/js_strings.php:70 ../../include/text.php:1239
-msgid "Monday"
-msgstr ""
-
-#: ../../include/js_strings.php:71 ../../include/text.php:1239
-msgid "Tuesday"
-msgstr ""
-
-#: ../../include/js_strings.php:72 ../../include/text.php:1239
-msgid "Wednesday"
-msgstr ""
-
-#: ../../include/js_strings.php:73 ../../include/text.php:1239
-msgid "Thursday"
-msgstr ""
-
-#: ../../include/js_strings.php:74 ../../include/text.php:1239
-msgid "Friday"
-msgstr ""
-
-#: ../../include/js_strings.php:75 ../../include/text.php:1239
-msgid "Saturday"
-msgstr ""
-
 #: ../../include/js_strings.php:76
 msgid "Sun"
 msgstr ""
@@ -8794,656 +9011,427 @@ msgctxt "calendar"
 msgid "All day"
 msgstr ""
 
-#: ../../include/nav.php:84 ../../include/nav.php:117 ../../boot.php:1712
-msgid "Logout"
-msgstr ""
-
-#: ../../include/nav.php:84 ../../include/nav.php:117
-msgid "End this session"
-msgstr ""
-
-#: ../../include/nav.php:87 ../../include/nav.php:148
-msgid "Home"
-msgstr ""
-
-#: ../../include/nav.php:87
-msgid "Your posts and conversations"
-msgstr ""
-
-#: ../../include/nav.php:88
-msgid "Your profile page"
+#: ../../include/follow.php:27
+msgid "Channel is blocked on this site."
 msgstr ""
 
-#: ../../include/nav.php:90
-msgid "Manage/Edit profiles"
+#: ../../include/follow.php:32
+msgid "Channel location missing."
 msgstr ""
 
-#: ../../include/nav.php:92 ../../include/channel.php:963
-msgid "Edit Profile"
+#: ../../include/follow.php:80
+msgid "Response from remote channel was incomplete."
 msgstr ""
 
-#: ../../include/nav.php:92
-msgid "Edit your profile"
+#: ../../include/follow.php:97
+msgid "Channel was deleted and no longer exists."
 msgstr ""
 
-#: ../../include/nav.php:94
-msgid "Your photos"
+#: ../../include/follow.php:147 ../../include/follow.php:183
+msgid "Protocol disabled."
 msgstr ""
 
-#: ../../include/nav.php:95
-msgid "Your files"
+#: ../../include/follow.php:171
+msgid "Channel discovery failed."
 msgstr ""
 
-#: ../../include/nav.php:98
-msgid "Your chatrooms"
+#: ../../include/follow.php:210
+msgid "Cannot connect to yourself."
 msgstr ""
 
-#: ../../include/nav.php:104
-msgid "Your bookmarks"
+#: ../../include/attach.php:248 ../../include/attach.php:334
+msgid "Item was not found."
 msgstr ""
 
-#: ../../include/nav.php:108
-msgid "Your webpages"
+#: ../../include/attach.php:500
+msgid "No source file."
 msgstr ""
 
-#: ../../include/nav.php:110
-msgid "Your wiki"
+#: ../../include/attach.php:522
+msgid "Cannot locate file to replace"
 msgstr ""
 
-#: ../../include/nav.php:114
-msgid "Sign in"
+#: ../../include/attach.php:540
+msgid "Cannot locate file to revise/update"
 msgstr ""
 
-#: ../../include/nav.php:131
+#: ../../include/attach.php:675
 #, php-format
-msgid "%s - click to logout"
-msgstr ""
-
-#: ../../include/nav.php:134
-msgid "Remote authentication"
-msgstr ""
-
-#: ../../include/nav.php:134
-msgid "Click to authenticate to your home hub"
-msgstr ""
-
-#: ../../include/nav.php:148
-msgid "Home Page"
-msgstr ""
-
-#: ../../include/nav.php:151
-msgid "Create an account"
-msgstr ""
-
-#: ../../include/nav.php:163
-msgid "Help and documentation"
-msgstr ""
-
-#: ../../include/nav.php:167
-msgid "Applications, utilities, links, games"
-msgstr ""
-
-#: ../../include/nav.php:169
-msgid "Search site @name, #tag, ?docs, content"
-msgstr ""
-
-#: ../../include/nav.php:171
-msgid "Channel Directory"
-msgstr ""
-
-#: ../../include/nav.php:183
-msgid "Your grid"
-msgstr ""
-
-#: ../../include/nav.php:184
-msgid "Mark all grid notifications seen"
-msgstr ""
-
-#: ../../include/nav.php:186
-msgid "Channel home"
-msgstr ""
-
-#: ../../include/nav.php:187
-msgid "Mark all channel notifications seen"
-msgstr ""
-
-#: ../../include/nav.php:193
-msgid "Notices"
-msgstr ""
-
-#: ../../include/nav.php:193
-msgid "Notifications"
-msgstr ""
-
-#: ../../include/nav.php:194
-msgid "See all notifications"
-msgstr ""
-
-#: ../../include/nav.php:197
-msgid "Private mail"
-msgstr ""
-
-#: ../../include/nav.php:198
-msgid "See all private messages"
-msgstr ""
-
-#: ../../include/nav.php:199
-msgid "Mark all private messages seen"
-msgstr ""
-
-#: ../../include/nav.php:205
-msgid "Event Calendar"
-msgstr ""
-
-#: ../../include/nav.php:206
-msgid "See all events"
-msgstr ""
-
-#: ../../include/nav.php:207
-msgid "Mark all events seen"
-msgstr ""
-
-#: ../../include/nav.php:210
-msgid "Manage Your Channels"
-msgstr ""
-
-#: ../../include/nav.php:212
-msgid "Account/Channel Settings"
-msgstr ""
-
-#: ../../include/nav.php:220
-msgid "Site Setup and Configuration"
-msgstr ""
-
-#: ../../include/nav.php:256
-msgid "@name, #tag, ?doc, content"
-msgstr ""
-
-#: ../../include/nav.php:257
-msgid "Please wait..."
-msgstr ""
-
-#: ../../include/network.php:704
-msgid "view full size"
-msgstr ""
-
-#: ../../include/network.php:1935 ../../include/account.php:317
-#: ../../include/account.php:344 ../../include/account.php:404
-msgid "Administrator"
-msgstr ""
-
-#: ../../include/network.php:1949
-msgid "No Subject"
-msgstr ""
-
-#: ../../include/network.php:2203 ../../include/network.php:2204
-msgid "Friendica"
-msgstr ""
-
-#: ../../include/network.php:2205
-msgid "OStatus"
+msgid "File exceeds size limit of %d"
 msgstr ""
 
-#: ../../include/network.php:2206
-msgid "GNU-Social"
+#: ../../include/attach.php:689
+#, php-format
+msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
 msgstr ""
 
-#: ../../include/network.php:2207
-msgid "RSS/Atom"
+#: ../../include/attach.php:847
+msgid "File upload failed. Possible system limit or action terminated."
 msgstr ""
 
-#: ../../include/network.php:2209
-msgid "Diaspora"
+#: ../../include/attach.php:860
+msgid "Stored file could not be verified. Upload failed."
 msgstr ""
 
-#: ../../include/network.php:2210
-msgid "Facebook"
+#: ../../include/attach.php:916 ../../include/attach.php:932
+msgid "Path not available."
 msgstr ""
 
-#: ../../include/network.php:2211
-msgid "Zot"
+#: ../../include/attach.php:978 ../../include/attach.php:1130
+msgid "Empty pathname"
 msgstr ""
 
-#: ../../include/network.php:2212
-msgid "LinkedIn"
+#: ../../include/attach.php:1004
+msgid "duplicate filename or path"
 msgstr ""
 
-#: ../../include/network.php:2213
-msgid "XMPP/IM"
+#: ../../include/attach.php:1026
+msgid "Path not found."
 msgstr ""
 
-#: ../../include/network.php:2214
-msgid "MySpace"
+#: ../../include/attach.php:1084
+msgid "mkdir failed."
 msgstr ""
 
-#: ../../include/import.php:30
-msgid ""
-"Cannot create a duplicate channel identifier on this system. Import failed."
+#: ../../include/attach.php:1088
+msgid "database storage failed."
 msgstr ""
 
-#: ../../include/import.php:97
-msgid "Channel clone failed. Import failed."
+#: ../../include/attach.php:1136
+msgid "Empty path"
 msgstr ""
 
-#: ../../include/items.php:899 ../../include/items.php:944
-msgid "(Unknown)"
+#: ../../include/auth.php:148
+msgid "Logged out."
 msgstr ""
 
-#: ../../include/items.php:1143
-msgid "Visible to anybody on the internet."
+#: ../../include/auth.php:275
+msgid "Failed authentication"
 msgstr ""
 
-#: ../../include/items.php:1145
-msgid "Visible to you only."
+#: ../../include/auth.php:286
+msgid "Login failed."
 msgstr ""
 
-#: ../../include/items.php:1147
-msgid "Visible to anybody in this network."
+#: ../../include/activities.php:41
+msgid " and "
 msgstr ""
 
-#: ../../include/items.php:1149
-msgid "Visible to anybody authenticated."
+#: ../../include/activities.php:49
+msgid "public profile"
 msgstr ""
 
-#: ../../include/items.php:1151
+#: ../../include/activities.php:58
 #, php-format
-msgid "Visible to anybody on %s."
-msgstr ""
-
-#: ../../include/items.php:1153
-msgid "Visible to all connections."
-msgstr ""
-
-#: ../../include/items.php:1155
-msgid "Visible to approved connections."
-msgstr ""
-
-#: ../../include/items.php:1157
-msgid "Visible to specific connections."
-msgstr ""
-
-#: ../../include/items.php:3920
-msgid "Privacy group is empty."
+msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
 msgstr ""
 
-#: ../../include/items.php:3927
+#: ../../include/activities.php:59
 #, php-format
-msgid "Privacy group: %s"
-msgstr ""
-
-#: ../../include/items.php:3939
-msgid "Connection not found."
-msgstr ""
-
-#: ../../include/items.php:4292
-msgid "profile photo"
-msgstr ""
-
-#: ../../include/text.php:404
-msgid "prev"
-msgstr ""
-
-#: ../../include/text.php:406
-msgid "first"
-msgstr ""
-
-#: ../../include/text.php:435
-msgid "last"
-msgstr ""
-
-#: ../../include/text.php:438
-msgid "next"
-msgstr ""
-
-#: ../../include/text.php:448
-msgid "older"
-msgstr ""
-
-#: ../../include/text.php:450
-msgid "newer"
-msgstr ""
-
-#: ../../include/text.php:843
-msgid "No connections"
+msgid "Visit %1$s's %2$s"
 msgstr ""
 
-#: ../../include/text.php:868
+#: ../../include/activities.php:62
 #, php-format
-msgid "View all %s connections"
-msgstr ""
-
-#: ../../include/text.php:1013 ../../include/text.php:1018
-msgid "poke"
-msgstr ""
-
-#: ../../include/text.php:1019
-msgid "ping"
-msgstr ""
-
-#: ../../include/text.php:1019
-msgid "pinged"
-msgstr ""
-
-#: ../../include/text.php:1020
-msgid "prod"
-msgstr ""
-
-#: ../../include/text.php:1020
-msgid "prodded"
-msgstr ""
-
-#: ../../include/text.php:1021
-msgid "slap"
-msgstr ""
-
-#: ../../include/text.php:1021
-msgid "slapped"
-msgstr ""
-
-#: ../../include/text.php:1022
-msgid "finger"
-msgstr ""
-
-#: ../../include/text.php:1022
-msgid "fingered"
+msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: ../../include/text.php:1023
-msgid "rebuff"
+#: ../../include/zot.php:700
+msgid "Invalid data packet"
 msgstr ""
 
-#: ../../include/text.php:1023
-msgid "rebuffed"
+#: ../../include/zot.php:716
+msgid "Unable to verify channel signature"
 msgstr ""
 
-#: ../../include/text.php:1035
-msgid "happy"
+#: ../../include/zot.php:2329
+#, php-format
+msgid "Unable to verify site signature for %s"
 msgstr ""
 
-#: ../../include/text.php:1036
-msgid "sad"
+#: ../../include/zot.php:3706
+msgid "invalid target signature"
 msgstr ""
 
-#: ../../include/text.php:1037
-msgid "mellow"
+#: ../../include/features.php:50
+msgid "General Features"
 msgstr ""
 
-#: ../../include/text.php:1038
-msgid "tired"
+#: ../../include/features.php:52
+msgid "Content Expiration"
 msgstr ""
 
-#: ../../include/text.php:1039
-msgid "perky"
+#: ../../include/features.php:52
+msgid "Remove posts/comments and/or private messages at a future time"
 msgstr ""
 
-#: ../../include/text.php:1040
-msgid "angry"
+#: ../../include/features.php:53
+msgid "Multiple Profiles"
 msgstr ""
 
-#: ../../include/text.php:1041
-msgid "stupefied"
+#: ../../include/features.php:53
+msgid "Ability to create multiple profiles"
 msgstr ""
 
-#: ../../include/text.php:1042
-msgid "puzzled"
+#: ../../include/features.php:54
+msgid "Advanced Profiles"
 msgstr ""
 
-#: ../../include/text.php:1043
-msgid "interested"
+#: ../../include/features.php:54
+msgid "Additional profile sections and selections"
 msgstr ""
 
-#: ../../include/text.php:1044
-msgid "bitter"
+#: ../../include/features.php:55
+msgid "Profile Import/Export"
 msgstr ""
 
-#: ../../include/text.php:1045
-msgid "cheerful"
+#: ../../include/features.php:55
+msgid "Save and load profile details across sites/channels"
 msgstr ""
 
-#: ../../include/text.php:1046
-msgid "alive"
+#: ../../include/features.php:56
+msgid "Web Pages"
 msgstr ""
 
-#: ../../include/text.php:1047
-msgid "annoyed"
+#: ../../include/features.php:56
+msgid "Provide managed web pages on your channel"
 msgstr ""
 
-#: ../../include/text.php:1048
-msgid "anxious"
+#: ../../include/features.php:57
+msgid "Provide a wiki for your channel"
 msgstr ""
 
-#: ../../include/text.php:1049
-msgid "cranky"
+#: ../../include/features.php:59
+msgid "Private Notes"
 msgstr ""
 
-#: ../../include/text.php:1050
-msgid "disturbed"
+#: ../../include/features.php:59
+msgid "Enables a tool to store notes and reminders (note: not encrypted)"
 msgstr ""
 
-#: ../../include/text.php:1051
-msgid "frustrated"
+#: ../../include/features.php:60
+msgid "Navigation Channel Select"
 msgstr ""
 
-#: ../../include/text.php:1052
-msgid "depressed"
+#: ../../include/features.php:60
+msgid "Change channels directly from within the navigation dropdown menu"
 msgstr ""
 
-#: ../../include/text.php:1053
-msgid "motivated"
+#: ../../include/features.php:61
+msgid "Photo Location"
 msgstr ""
 
-#: ../../include/text.php:1054
-msgid "relaxed"
+#: ../../include/features.php:61
+msgid "If location data is available on uploaded photos, link this to a map."
 msgstr ""
 
-#: ../../include/text.php:1055
-msgid "surprised"
+#: ../../include/features.php:62
+msgid "Access Controlled Chatrooms"
 msgstr ""
 
-#: ../../include/text.php:1243
-msgid "May"
+#: ../../include/features.php:62
+msgid "Provide chatrooms and chat services with access control."
 msgstr ""
 
-#: ../../include/text.php:1320 ../../include/text.php:1324
-msgid "Unknown Attachment"
+#: ../../include/features.php:63
+msgid "Smart Birthdays"
 msgstr ""
 
-#: ../../include/text.php:1326
-msgid "unknown"
+#: ../../include/features.php:63
+msgid ""
+"Make birthday events timezone aware in case your friends are scattered "
+"across the planet."
 msgstr ""
 
-#: ../../include/text.php:1362
-msgid "remove category"
+#: ../../include/features.php:64
+msgid "Expert Mode"
 msgstr ""
 
-#: ../../include/text.php:1439
-msgid "remove from file"
+#: ../../include/features.php:64
+msgid "Enable Expert Mode to provide advanced configuration options"
 msgstr ""
 
-#: ../../include/text.php:1738 ../../include/text.php:1809
-msgid "default"
+#: ../../include/features.php:69
+msgid "Post Composition Features"
 msgstr ""
 
-#: ../../include/text.php:1746
-msgid "Page layout"
+#: ../../include/features.php:70
+msgid "Large Photos"
 msgstr ""
 
-#: ../../include/text.php:1746
-msgid "You can create your own with the layouts tool"
+#: ../../include/features.php:70
+msgid ""
+"Include large (1024px) photo thumbnails in posts. If not enabled, use small "
+"(640px) photo thumbnails"
 msgstr ""
 
-#: ../../include/text.php:1788
-msgid "Page content type"
+#: ../../include/features.php:71
+msgid "Automatically import channel content from other channels or feeds"
 msgstr ""
 
-#: ../../include/text.php:1821
-msgid "Select an alternate language"
+#: ../../include/features.php:72
+msgid "Even More Encryption"
 msgstr ""
 
-#: ../../include/text.php:1958
-msgid "activity"
+#: ../../include/features.php:72
+msgid ""
+"Allow optional encryption of content end-to-end with a shared secret key"
 msgstr ""
 
-#: ../../include/text.php:2259
-msgid "Design Tools"
+#: ../../include/features.php:73
+msgid "Enable Voting Tools"
 msgstr ""
 
-#: ../../include/text.php:2265
-msgid "Pages"
+#: ../../include/features.php:73
+msgid "Provide a class of post which others can vote on"
 msgstr ""
 
-#: ../../include/text.php:2287
-msgid "Import website..."
+#: ../../include/features.php:74
+msgid "Disable Comments"
 msgstr ""
 
-#: ../../include/text.php:2288
-msgid "Select folder to import"
+#: ../../include/features.php:74
+msgid "Provide the option to disable comments for a post"
 msgstr ""
 
-#: ../../include/text.php:2289
-msgid "Import from a zipped folder:"
+#: ../../include/features.php:75
+msgid "Delayed Posting"
 msgstr ""
 
-#: ../../include/text.php:2290
-msgid "Import from cloud files:"
+#: ../../include/features.php:75
+msgid "Allow posts to be published at a later date"
 msgstr ""
 
-#: ../../include/text.php:2291
-msgid "/cloud/channel/path/to/folder"
+#: ../../include/features.php:76
+msgid "Suppress Duplicate Posts/Comments"
 msgstr ""
 
-#: ../../include/text.php:2292
-msgid "Enter path to website files"
+#: ../../include/features.php:76
+msgid ""
+"Prevent posts with identical content to be published with less than two "
+"minutes in between submissions."
 msgstr ""
 
-#: ../../include/text.php:2293
-msgid "Select folder"
+#: ../../include/features.php:82
+msgid "Network and Stream Filtering"
 msgstr ""
 
-#: ../../include/acl_selectors.php:174
-msgid "Who can see this?"
+#: ../../include/features.php:83
+msgid "Search by Date"
 msgstr ""
 
-#: ../../include/acl_selectors.php:175
-msgid "Custom selection"
+#: ../../include/features.php:83
+msgid "Ability to select posts by date ranges"
 msgstr ""
 
-#: ../../include/acl_selectors.php:176
-msgid ""
-"Select \"Show\" to allow viewing. \"Don't show\" lets you override and limit "
-"the scope of \"Show\"."
+#: ../../include/features.php:84
+msgid "Enable management and selection of privacy groups"
 msgstr ""
 
-#: ../../include/acl_selectors.php:177
-msgid "Show"
+#: ../../include/features.php:85
+msgid "Save search terms for re-use"
 msgstr ""
 
-#: ../../include/acl_selectors.php:178
-msgid "Don't show"
+#: ../../include/features.php:86
+msgid "Network Personal Tab"
 msgstr ""
 
-#: ../../include/acl_selectors.php:184
-msgid "Other networks and post services"
+#: ../../include/features.php:86
+msgid "Enable tab to display only Network posts that you've interacted on"
 msgstr ""
 
-#: ../../include/acl_selectors.php:214
-#, 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/features.php:87
+msgid "Network New Tab"
 msgstr ""
 
-#: ../../include/oembed.php:340
-msgid "Embedded content"
+#: ../../include/features.php:87
+msgid "Enable tab to display all new Network activity"
 msgstr ""
 
-#: ../../include/oembed.php:349
-msgid "Embedding disabled"
+#: ../../include/features.php:88
+msgid "Affinity Tool"
 msgstr ""
 
-#: ../../include/activities.php:41
-msgid " and "
+#: ../../include/features.php:88
+msgid "Filter stream activity by depth of relationships"
 msgstr ""
 
-#: ../../include/activities.php:49
-msgid "public profile"
+#: ../../include/features.php:89
+msgid "Connection Filtering"
 msgstr ""
 
-#: ../../include/activities.php:58
-#, php-format
-msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
+#: ../../include/features.php:89
+msgid "Filter incoming posts from connections based on keywords/content"
 msgstr ""
 
-#: ../../include/activities.php:59
-#, php-format
-msgid "Visit %1$s's %2$s"
+#: ../../include/features.php:90
+msgid "Show channel suggestions"
 msgstr ""
 
-#: ../../include/activities.php:62
-#, php-format
-msgid "%1$s has an updated %2$s, changing %3$s."
+#: ../../include/features.php:95
+msgid "Post/Comment Tools"
 msgstr ""
 
-#: ../../include/attach.php:248 ../../include/attach.php:334
-msgid "Item was not found."
+#: ../../include/features.php:96
+msgid "Community Tagging"
 msgstr ""
 
-#: ../../include/attach.php:500
-msgid "No source file."
+#: ../../include/features.php:96
+msgid "Ability to tag existing posts"
 msgstr ""
 
-#: ../../include/attach.php:522
-msgid "Cannot locate file to replace"
+#: ../../include/features.php:97
+msgid "Post Categories"
 msgstr ""
 
-#: ../../include/attach.php:540
-msgid "Cannot locate file to revise/update"
+#: ../../include/features.php:97
+msgid "Add categories to your posts"
 msgstr ""
 
-#: ../../include/attach.php:675
-#, php-format
-msgid "File exceeds size limit of %d"
+#: ../../include/features.php:98
+msgid "Emoji Reactions"
 msgstr ""
 
-#: ../../include/attach.php:689
-#, php-format
-msgid "You have reached your limit of %1$.0f Mbytes attachment storage."
+#: ../../include/features.php:98
+msgid "Add emoji reaction ability to posts"
 msgstr ""
 
-#: ../../include/attach.php:847
-msgid "File upload failed. Possible system limit or action terminated."
+#: ../../include/features.php:99
+msgid "Ability to file posts under folders"
 msgstr ""
 
-#: ../../include/attach.php:860
-msgid "Stored file could not be verified. Upload failed."
+#: ../../include/features.php:100
+msgid "Dislike Posts"
 msgstr ""
 
-#: ../../include/attach.php:916 ../../include/attach.php:932
-msgid "Path not available."
+#: ../../include/features.php:100
+msgid "Ability to dislike posts/comments"
 msgstr ""
 
-#: ../../include/attach.php:978 ../../include/attach.php:1130
-msgid "Empty pathname"
+#: ../../include/features.php:101
+msgid "Star Posts"
 msgstr ""
 
-#: ../../include/attach.php:1004
-msgid "duplicate filename or path"
+#: ../../include/features.php:101
+msgid "Ability to mark special posts with a star indicator"
 msgstr ""
 
-#: ../../include/attach.php:1026
-msgid "Path not found."
+#: ../../include/features.php:102
+msgid "Tag Cloud"
 msgstr ""
 
-#: ../../include/attach.php:1084
-msgid "mkdir failed."
+#: ../../include/features.php:102
+msgid "Provide a personal tag cloud on your channel page"
 msgstr ""
 
-#: ../../include/attach.php:1088
-msgid "database storage failed."
+#: ../../include/features.php:111
+msgid "Premium Channel"
 msgstr ""
 
-#: ../../include/attach.php:1136
-msgid "Empty path"
+#: ../../include/features.php:112
+msgid ""
+"Allows you to set restrictions and terms on those that connect with your "
+"channel"
 msgstr ""
 
 #: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249
@@ -9478,358 +9466,367 @@ msgstr ""
 msgid "dislikes"
 msgstr ""
 
-#: ../../include/zot.php:700
-msgid "Invalid data packet"
+#: ../../include/account.php:28
+msgid "Not a valid email address"
 msgstr ""
 
-#: ../../include/zot.php:716
-msgid "Unable to verify channel signature"
+#: ../../include/account.php:30
+msgid "Your email domain is not among those allowed on this site"
 msgstr ""
 
-#: ../../include/zot.php:2329
-#, php-format
-msgid "Unable to verify site signature for %s"
+#: ../../include/account.php:36
+msgid "Your email address is already registered at this site."
 msgstr ""
 
-#: ../../include/zot.php:3706
-msgid "invalid target signature"
+#: ../../include/account.php:68
+msgid "An invitation is required."
 msgstr ""
 
-#: ../../include/channel.php:33
-msgid "Unable to obtain identity information from database"
+#: ../../include/account.php:72
+msgid "Invitation could not be verified."
 msgstr ""
 
-#: ../../include/channel.php:67
-msgid "Empty name"
+#: ../../include/account.php:122
+msgid "Please enter the required information."
 msgstr ""
 
-#: ../../include/channel.php:70
-msgid "Name too long"
+#: ../../include/account.php:189
+msgid "Failed to store account information."
 msgstr ""
 
-#: ../../include/channel.php:181
-msgid "No account identifier"
+#: ../../include/account.php:249
+#, php-format
+msgid "Registration confirmation for %s"
 msgstr ""
 
-#: ../../include/channel.php:193
-msgid "Nickname is required."
+#: ../../include/account.php:315
+#, php-format
+msgid "Registration request at %s"
 msgstr ""
 
-#: ../../include/channel.php:207
-msgid "Reserved nickname. Please choose another."
+#: ../../include/account.php:339
+msgid "your registration password"
 msgstr ""
 
-#: ../../include/channel.php:212
-msgid ""
-"Nickname has unsupported characters or is already being used on this site."
+#: ../../include/account.php:342 ../../include/account.php:402
+#, php-format
+msgid "Registration details for %s"
 msgstr ""
 
-#: ../../include/channel.php:272
-msgid "Unable to retrieve created identity"
+#: ../../include/account.php:414
+msgid "Account approved."
 msgstr ""
 
-#: ../../include/channel.php:341
-msgid "Default Profile"
+#: ../../include/account.php:454
+#, php-format
+msgid "Registration revoked for %s"
 msgstr ""
 
-#: ../../include/channel.php:813
-msgid "Requested channel is not available."
+#: ../../include/account.php:739 ../../include/account.php:741
+msgid "Click here to upgrade."
 msgstr ""
 
-#: ../../include/channel.php:960
-msgid "Create New Profile"
+#: ../../include/account.php:747
+msgid "This action exceeds the limits set by your subscription plan."
 msgstr ""
 
-#: ../../include/channel.php:980
-msgid "Visible to everybody"
+#: ../../include/account.php:752
+msgid "This action is not available under your subscription plan."
 msgstr ""
 
-#: ../../include/channel.php:1053 ../../include/channel.php:1166
-msgid "Gender:"
+#: ../../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/channel.php:1054 ../../include/channel.php:1210
-msgid "Status:"
+#: ../../include/bbcode.php:162 ../../include/bbcode.php:928
+msgid "Encrypted content"
 msgstr ""
 
-#: ../../include/channel.php:1055 ../../include/channel.php:1221
-msgid "Homepage:"
+#: ../../include/bbcode.php:178
+#, php-format
+msgid "Install %s element: "
 msgstr ""
 
-#: ../../include/channel.php:1056
-msgid "Online Now"
+#: ../../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/channel.php:1171
-msgid "Like this channel"
+#: ../../include/bbcode.php:261
+#, php-format
+msgid "%1$s wrote the following %2$s %3$s"
 msgstr ""
 
-#: ../../include/channel.php:1195
-msgid "j F, Y"
+#: ../../include/bbcode.php:338 ../../include/bbcode.php:346
+msgid "Click to open/close"
 msgstr ""
 
-#: ../../include/channel.php:1196
-msgid "j F"
+#: ../../include/bbcode.php:346
+msgid "spoiler"
 msgstr ""
 
-#: ../../include/channel.php:1203
-msgid "Birthday:"
+#: ../../include/bbcode.php:866
+msgid "$1 wrote:"
 msgstr ""
 
-#: ../../include/channel.php:1216
+#: ../../include/contact_widgets.php:11
 #, php-format
-msgid "for %1$d %2$s"
-msgstr ""
+msgid "%d invitation available"
+msgid_plural "%d invitations available"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/channel.php:1219
-msgid "Sexual Preference:"
+#: ../../include/contact_widgets.php:19
+msgid "Find Channels"
 msgstr ""
 
-#: ../../include/channel.php:1225
-msgid "Tags:"
+#: ../../include/contact_widgets.php:20
+msgid "Enter name or interest"
 msgstr ""
 
-#: ../../include/channel.php:1227
-msgid "Political Views:"
+#: ../../include/contact_widgets.php:21
+msgid "Connect/Follow"
 msgstr ""
 
-#: ../../include/channel.php:1229
-msgid "Religion:"
+#: ../../include/contact_widgets.php:22
+msgid "Examples: Robert Morgenstein, Fishing"
 msgstr ""
 
-#: ../../include/channel.php:1233
-msgid "Hobbies/Interests:"
+#: ../../include/contact_widgets.php:26
+msgid "Random Profile"
 msgstr ""
 
-#: ../../include/channel.php:1235
-msgid "Likes:"
+#: ../../include/contact_widgets.php:27
+msgid "Invite Friends"
 msgstr ""
 
-#: ../../include/channel.php:1237
-msgid "Dislikes:"
+#: ../../include/contact_widgets.php:29
+msgid "Advanced example: name=fred and country=iceland"
 msgstr ""
 
-#: ../../include/channel.php:1239
-msgid "Contact information and Social Networks:"
-msgstr ""
+#: ../../include/contact_widgets.php:122
+#, php-format
+msgid "%d connection in common"
+msgid_plural "%d connections in common"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/channel.php:1241
-msgid "My other channels:"
+#: ../../include/contact_widgets.php:127
+msgid "show more"
 msgstr ""
 
-#: ../../include/channel.php:1243
-msgid "Musical interests:"
+#: ../../include/dir_fns.php:141
+msgid "Directory Options"
 msgstr ""
 
-#: ../../include/channel.php:1245
-msgid "Books, literature:"
+#: ../../include/dir_fns.php:143
+msgid "Safe Mode"
 msgstr ""
 
-#: ../../include/channel.php:1247
-msgid "Television:"
+#: ../../include/dir_fns.php:144
+msgid "Public Forums Only"
 msgstr ""
 
-#: ../../include/channel.php:1249
-msgid "Film/dance/culture/entertainment:"
+#: ../../include/dir_fns.php:145
+msgid "This Website Only"
 msgstr ""
 
-#: ../../include/channel.php:1251
-msgid "Love/Romance:"
+#: ../../include/message.php:20
+msgid "No recipient provided."
 msgstr ""
 
-#: ../../include/channel.php:1253
-msgid "Work/employment:"
+#: ../../include/message.php:25
+msgid "[no subject]"
 msgstr ""
 
-#: ../../include/channel.php:1255
-msgid "School/education:"
+#: ../../include/message.php:45
+msgid "Unable to determine sender."
 msgstr ""
 
-#: ../../include/channel.php:1276
-msgid "Like this thing"
+#: ../../include/message.php:222
+msgid "Stored post could not be verified."
 msgstr ""
 
-#: ../../include/connections.php:95
-msgid "New window"
+#: ../../include/import.php:30
+msgid ""
+"Cannot create a duplicate channel identifier on this system. Import failed."
 msgstr ""
 
-#: ../../include/connections.php:96
-msgid "Open the selected location in a different window or browser tab"
+#: ../../include/import.php:97
+msgid "Channel clone failed. Import failed."
 msgstr ""
 
-#: ../../include/connections.php:214
-#, php-format
-msgid "User '%s' deleted"
+#: ../../include/nav.php:84 ../../include/nav.php:117 ../../boot.php:1737
+msgid "Logout"
 msgstr ""
 
-#: ../../include/event.php:821
-msgid "This event has been added to your calendar."
+#: ../../include/nav.php:84 ../../include/nav.php:117
+msgid "End this session"
 msgstr ""
 
-#: ../../include/event.php:1021
-msgid "Not specified"
+#: ../../include/nav.php:87 ../../include/nav.php:148
+msgid "Home"
 msgstr ""
 
-#: ../../include/event.php:1022
-msgid "Needs Action"
+#: ../../include/nav.php:87
+msgid "Your posts and conversations"
 msgstr ""
 
-#: ../../include/event.php:1023
-msgid "Completed"
+#: ../../include/nav.php:88
+msgid "Your profile page"
 msgstr ""
 
-#: ../../include/event.php:1024
-msgid "In Process"
+#: ../../include/nav.php:90
+msgid "Manage/Edit profiles"
 msgstr ""
 
-#: ../../include/event.php:1025
-msgid "Cancelled"
+#: ../../include/nav.php:92
+msgid "Edit your profile"
 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:94
+msgid "Your photos"
 msgstr ""
 
-#: ../../include/contact_widgets.php:20
-msgid "Enter name or interest"
+#: ../../include/nav.php:95
+msgid "Your files"
 msgstr ""
 
-#: ../../include/contact_widgets.php:21
-msgid "Connect/Follow"
+#: ../../include/nav.php:98
+msgid "Your chatrooms"
 msgstr ""
 
-#: ../../include/contact_widgets.php:22
-msgid "Examples: Robert Morgenstein, Fishing"
+#: ../../include/nav.php:104
+msgid "Your bookmarks"
 msgstr ""
 
-#: ../../include/contact_widgets.php:26
-msgid "Random Profile"
+#: ../../include/nav.php:108
+msgid "Your webpages"
 msgstr ""
 
-#: ../../include/contact_widgets.php:27
-msgid "Invite Friends"
+#: ../../include/nav.php:110
+msgid "Your wiki"
 msgstr ""
 
-#: ../../include/contact_widgets.php:29
-msgid "Advanced example: name=fred and country=iceland"
+#: ../../include/nav.php:114
+msgid "Sign in"
 msgstr ""
 
-#: ../../include/contact_widgets.php:122
+#: ../../include/nav.php:131
 #, php-format
-msgid "%d connection in common"
-msgid_plural "%d connections in common"
-msgstr[0] ""
-msgstr[1] ""
+msgid "%s - click to logout"
+msgstr ""
 
-#: ../../include/contact_widgets.php:127
-msgid "show more"
+#: ../../include/nav.php:134
+msgid "Remote authentication"
 msgstr ""
 
-#: ../../include/dir_fns.php:141
-msgid "Directory Options"
+#: ../../include/nav.php:134
+msgid "Click to authenticate to your home hub"
 msgstr ""
 
-#: ../../include/dir_fns.php:143
-msgid "Safe Mode"
+#: ../../include/nav.php:148
+msgid "Home Page"
 msgstr ""
 
-#: ../../include/dir_fns.php:144
-msgid "Public Forums Only"
+#: ../../include/nav.php:151
+msgid "Create an account"
 msgstr ""
 
-#: ../../include/dir_fns.php:145
-msgid "This Website Only"
+#: ../../include/nav.php:163
+msgid "Help and documentation"
 msgstr ""
 
-#: ../../include/message.php:20
-msgid "No recipient provided."
+#: ../../include/nav.php:167
+msgid "Applications, utilities, links, games"
 msgstr ""
 
-#: ../../include/message.php:25
-msgid "[no subject]"
+#: ../../include/nav.php:169
+msgid "Search site @name, #tag, ?docs, content"
 msgstr ""
 
-#: ../../include/message.php:45
-msgid "Unable to determine sender."
+#: ../../include/nav.php:171
+msgid "Channel Directory"
 msgstr ""
 
-#: ../../include/message.php:222
-msgid "Stored post could not be verified."
+#: ../../include/nav.php:183
+msgid "Your grid"
 msgstr ""
 
-#: ../../include/account.php:28
-msgid "Not a valid email address"
+#: ../../include/nav.php:184
+msgid "Mark all grid notifications seen"
 msgstr ""
 
-#: ../../include/account.php:30
-msgid "Your email domain is not among those allowed on this site"
+#: ../../include/nav.php:186
+msgid "Channel home"
 msgstr ""
 
-#: ../../include/account.php:36
-msgid "Your email address is already registered at this site."
+#: ../../include/nav.php:187
+msgid "Mark all channel notifications seen"
 msgstr ""
 
-#: ../../include/account.php:68
-msgid "An invitation is required."
+#: ../../include/nav.php:193
+msgid "Notices"
 msgstr ""
 
-#: ../../include/account.php:72
-msgid "Invitation could not be verified."
+#: ../../include/nav.php:193
+msgid "Notifications"
 msgstr ""
 
-#: ../../include/account.php:122
-msgid "Please enter the required information."
+#: ../../include/nav.php:194
+msgid "See all notifications"
 msgstr ""
 
-#: ../../include/account.php:189
-msgid "Failed to store account information."
+#: ../../include/nav.php:197
+msgid "Private mail"
 msgstr ""
 
-#: ../../include/account.php:249
-#, php-format
-msgid "Registration confirmation for %s"
+#: ../../include/nav.php:198
+msgid "See all private messages"
 msgstr ""
 
-#: ../../include/account.php:315
-#, php-format
-msgid "Registration request at %s"
+#: ../../include/nav.php:199
+msgid "Mark all private messages seen"
 msgstr ""
 
-#: ../../include/account.php:339
-msgid "your registration password"
+#: ../../include/nav.php:205
+msgid "Event Calendar"
 msgstr ""
 
-#: ../../include/account.php:342 ../../include/account.php:402
-#, php-format
-msgid "Registration details for %s"
+#: ../../include/nav.php:206
+msgid "See all events"
 msgstr ""
 
-#: ../../include/account.php:414
-msgid "Account approved."
+#: ../../include/nav.php:207
+msgid "Mark all events seen"
 msgstr ""
 
-#: ../../include/account.php:454
-#, php-format
-msgid "Registration revoked for %s"
+#: ../../include/nav.php:210
+msgid "Manage Your Channels"
 msgstr ""
 
-#: ../../include/account.php:739 ../../include/account.php:741
-msgid "Click here to upgrade."
+#: ../../include/nav.php:212
+msgid "Account/Channel Settings"
 msgstr ""
 
-#: ../../include/account.php:747
-msgid "This action exceeds the limits set by your subscription plan."
+#: ../../include/nav.php:220
+msgid "Site Setup and Configuration"
 msgstr ""
 
-#: ../../include/account.php:752
-msgid "This action is not available under your subscription plan."
+#: ../../include/nav.php:256
+msgid "@name, #tag, ?doc, content"
+msgstr ""
+
+#: ../../include/nav.php:257
+msgid "Please wait..."
 msgstr ""
 
 #: ../../view/theme/redbasic/php/config.php:6
@@ -9964,66 +9961,66 @@ msgstr ""
 msgid "Set size of followup author photos"
 msgstr ""
 
-#: ../../boot.php:1169
+#: ../../boot.php:1194
 #, php-format
 msgctxt "opensearch"
 msgid "Search %1$s (%2$s)"
 msgstr ""
 
-#: ../../boot.php:1169
+#: ../../boot.php:1194
 msgctxt "opensearch"
 msgid "$Projectname"
 msgstr ""
 
-#: ../../boot.php:1487
+#: ../../boot.php:1512
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:1490
+#: ../../boot.php:1515
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:1694
+#: ../../boot.php:1719
 msgid ""
 "Create an account to access services and applications within the Hubzilla"
 msgstr ""
 
-#: ../../boot.php:1715
+#: ../../boot.php:1740
 msgid "Login/Email"
 msgstr ""
 
-#: ../../boot.php:1716
+#: ../../boot.php:1741
 msgid "Password"
 msgstr ""
 
-#: ../../boot.php:1717
+#: ../../boot.php:1742
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:1720
+#: ../../boot.php:1745
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:2289
+#: ../../boot.php:2314
 msgid "toggle mobile"
 msgstr ""
 
-#: ../../boot.php:2444
+#: ../../boot.php:2469
 msgid "Website SSL certificate is not valid. Please correct."
 msgstr ""
 
-#: ../../boot.php:2447
+#: ../../boot.php:2472
 #, php-format
 msgid "[hubzilla] Website SSL error for %s"
 msgstr ""
 
-#: ../../boot.php:2551
+#: ../../boot.php:2576
 msgid "Cron/Scheduled tasks not running."
 msgstr ""
 
-#: ../../boot.php:2555
+#: ../../boot.php:2580
 #, php-format
 msgid "[hubzilla] Cron tasks not running on %s"
 msgstr ""
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 6b8729ee6..d810e69f7 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -41,6 +41,7 @@
     <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
 	{{include file="field_input.tpl" field=$sitename}}
+	{{include file="field_select.tpl" field=$server_role}}
 	{{include file="field_textarea.tpl" field=$banner}}
 	{{include file="field_textarea.tpl" field=$admininfo}}
 	{{include file="field_select.tpl" field=$language}}
diff --git a/view/tpl/contact_block.tpl b/view/tpl/contact_block.tpl
index 6a29abaef..580a8a41c 100755
--- a/view/tpl/contact_block.tpl
+++ b/view/tpl/contact_block.tpl
@@ -1,13 +1,14 @@
 <div id="contact-block" class="widget">
-<h3>{{$contacts}}</h3>
-{{if $micropro}}
-		{{if $viewconnections}}
-		<a class="allcontact-link" href="viewconnections/{{$nickname}}">{{$viewconnections}}</a>
-		{{/if}}
-		<div class='contact-block-content'>
-		{{foreach $micropro as $m}}
-			{{$m}}
-		{{/foreach}}
-		</div>
-{{/if}}
+	<h3>{{$contacts}}</h3>
+	{{if $micropro}}
+	{{if $viewconnections}}
+	<a class="allcontact-link" href="viewconnections/{{$nickname}}">{{$viewconnections}}</a>
+	{{/if}}
+	<div class='contact-block-content'>
+	{{foreach $micropro as $m}}
+		{{$m}}
+	{{/foreach}}
+	</div>
+	{{/if}}
 </div>
+<div class="clear"></div>
diff --git a/view/tpl/cover_photo_widget.tpl b/view/tpl/cover_photo_widget.tpl
index 4e210a300..2b47270c9 100755
--- a/view/tpl/cover_photo_widget.tpl
+++ b/view/tpl/cover_photo_widget.tpl
@@ -1,22 +1,28 @@
 <script>
 	var aside_padding_top;
 	var section_padding_top;
+	var coverSlid = false;
 
 	$(document).ready(function() {
 
 		aside_padding_top = parseInt($('aside').css('padding-top'));
 		section_padding_top = parseInt($('section').css('padding-top'));
 
+		$(document).on('click', slideUpCover);
+
 		if($('#cover-photo').length && $(window).width() > 755) {
-			$('.navbar-fixed-top').css('position', 'relative');
-			$('main').css('margin-top', - $('nav').outerHeight(true) + 'px');
-			$('aside').css('padding-top', aside_padding_top - $('nav').outerHeight() + 'px');
-			$('section').css('padding-top', section_padding_top  - $('nav').outerHeight() + 'px');
-			$('main').css('opacity', 0);
-			$('header').hide();
+			if($(window).scrollTop() < $('#cover-photo').height()) {
+				$('main').css('margin-top', - $('nav').outerHeight(true) + 'px');
+				$('aside').css('padding-top', aside_padding_top - $('nav').outerHeight() + 'px');
+				$('section').css('padding-top', section_padding_top  - $('nav').outerHeight() + 'px');
+				$('.navbar-fixed-top').css('position', 'relative');
+				$('main').css('opacity', 0);
+				$('header').hide();
+			}
 		}
 		else {
 			$('#cover-photo').remove();
+			coverSlid = true;
 		}
 	});
 
@@ -26,10 +32,26 @@
 			$('main').css('opacity', 1);
 			$('aside').css('padding-top', aside_padding_top + 'px');
 			$('section').css('padding-top', section_padding_top + 'px');
-			$(window).scrollTop($(window).scrollTop() - $('#cover-photo').height())
-			$('.navbar-fixed-top').css('position', 'fixed');
+			$('.navbar-fixed-top').css('position', '');
 			$('main').css('margin-top', '');
-			$('#cover-photo').remove();
+			coverSlid = true;
+		}
+		else if ($('#cover-photo').length && $(window).width() > 755 && $(window).scrollTop() < $('#cover-photo').height()){
+			if(coverSlid) {
+				$(window).scrollTop(Math.ceil($('#cover-photo').height()));
+				setTimeout(function(){ coverSlid = false; }, 1000);
+			}
+			else {
+				if($(window).scrollTop() < $('#cover-photo').height()) {
+					$('main').css('margin-top', - $('nav').outerHeight(true) + 'px');
+					$('aside').css('padding-top', aside_padding_top - $('nav').outerHeight() + 'px');
+					$('section').css('padding-top', section_padding_top  - $('nav').outerHeight() + 'px');
+
+					$('.navbar-fixed-top').css('position', 'relative');
+					$('main').css('opacity', 0);
+					$('header').hide();
+				}
+			}
 		}
 		if($('#cover-photo').length) {
 			$('main').css('opacity', ($(window).scrollTop()/$('#cover-photo').height()).toFixed(1));
@@ -38,21 +60,26 @@
 
 	$(window).resize(function () {
 		if($('#cover-photo').length && $(window).width() < 755) {
+			$('#cover-photo').remove();
 			$('main').css('opacity', 1);
 			$('aside').css('padding-top', aside_padding_top + 'px');
 			$('section').css('padding-top', section_padding_top + 'px');
-			$('.navbar-fixed-top').css('position', 'fixed');
-			$('#cover-photo').remove();
+			$('.navbar-fixed-top').css('position', '');
+			coverSlid = true;
 		}
 
 	});
 
 	function slideUpCover() {
+		if(coverSlid) {
+			return;
+		}
 		$('html, body').animate({scrollTop: Math.ceil($('#cover-photo').height()) + 'px' });
+		return;
 	}
 </script>
 
-<div id="cover-photo" onclick="slideUpCover();" title="{{$hovertitle}}">
+<div id="cover-photo" title="{{$hovertitle}}">
 	{{$photo_html}}
 	<div id="cover-photo-caption">
 		<div class="cover-photo-title">
diff --git a/view/tpl/install_settings.tpl b/view/tpl/install_settings.tpl
index 5ecd3243b..f7a0108a8 100755
--- a/view/tpl/install_settings.tpl
+++ b/view/tpl/install_settings.tpl
@@ -19,7 +19,7 @@
 
 {{include file="field_input.tpl" field=$adminmail}}
 {{include file="field_input.tpl" field=$siteurl}}
-{{include file="field_checkbox.tpl" field=$advanced}}
+{{include file="field_select.tpl" field=$server_role}}
 
 {{include file="field_select_grouped.tpl" field=$timezone}}
author	Andrew Manning <tamanning@zoho.com>	2016-08-27 06:52:01 -0400
committer	Andrew Manning <tamanning@zoho.com>	2016-08-27 06:52:01 -0400
commit	ddfc5209d3a8a4b10f66b0ae0497a269ff2bdde1 (patch)
tree	80936d2335aca91c1a3b828c234ae736c811d22b
parent	420aa4bc44a2fdf707b3964582258809f978ea2d (diff)
parent	aea2fa1629692cc29f1070a66fbde9fb9ae837a6 (diff)
download	volse-hubzilla-ddfc5209d3a8a4b10f66b0ae0497a269ff2bdde1.tar.gz volse-hubzilla-ddfc5209d3a8a4b10f66b0ae0497a269ff2bdde1.tar.bz2 volse-hubzilla-ddfc5209d3a8a4b10f66b0ae0497a269ff2bdde1.zip